[MediaWiki-commits] [Gerrit] mediawiki.searchSuggest: Use formatversion=2 for API requests - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: mediawiki.searchSuggest: Use formatversion=2 for API requests
..


mediawiki.searchSuggest: Use formatversion=2 for API requests

With formatversion=2 the response uses UTF-8 instead of escape sequences
with hex for encoding of non-ASCII characters (e.g. "\u00e4" for "ä").

The other syntax changes of formatversion=2 have no effect here.

Change-Id: Ib01497e8a2340d329482b5131a125b1f92e87116
---
M resources/src/mediawiki/mediawiki.searchSuggest.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js 
b/resources/src/mediawiki/mediawiki.searchSuggest.js
index ada4924..0fcd22c 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -6,6 +6,7 @@
// queries the wiki and calls response with the result
request: function ( api, query, response, maxRows ) {
return api.get( {
+   formatversion: 2,
action: 'opensearch',
search: query,
namespace: 0,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01497e8a2340d329482b5131a125b1f92e87116
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ExtJS Runtime errors due to missing/late css - change (mediawiki...BlueSpiceFoundation)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: ExtJS Runtime errors due to missing/late css
..


ExtJS Runtime errors due to missing/late css

Wait for the CSS dependencies to be loaded or ExtJS wont have important 
dimensions for calculating. mw.loader ignores CSS dependencies.
* See: https://phabricator.wikimedia.org/T63852

PachSet 2:
* Overriding jenkins "API help message" tests which will be part of a later 
commit

Change-Id: I9b5191e53f1204df47899fb00a9b93dcf284bd0a
(cherry picked from commit 94fc5b5949d3f3b777c9b9017048cc307b435906)
---
M resources/bluespice.extjs/bluespice.extjs.fixes.css
M resources/bluespice.extjs/bluespice.extjs.js
2 files changed, 32 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/bluespice.extjs/bluespice.extjs.fixes.css 
b/resources/bluespice.extjs/bluespice.extjs.fixes.css
index f69f67c..6c06004 100644
--- a/resources/bluespice.extjs/bluespice.extjs.fixes.css
+++ b/resources/bluespice.extjs/bluespice.extjs.fixes.css
@@ -100,4 +100,7 @@
 
 .x-boundlist-item {
font-size: 13px;
+}
+.bs-extjs-cssisready {
+   display: inline;
 }
\ No newline at end of file
diff --git a/resources/bluespice.extjs/bluespice.extjs.js 
b/resources/bluespice.extjs/bluespice.extjs.js
index 2ba4bbe..643be88 100755
--- a/resources/bluespice.extjs/bluespice.extjs.js
+++ b/resources/bluespice.extjs/bluespice.extjs.js
@@ -113,6 +113,34 @@
};
 
bs.extjs = extjs;
-   $(d).trigger( 'BSExtJSReady', [ bs.extjs ] );
+
+   //Wait for the CSS dependencies to be loaded or ExtJS wont have 
important
+   //dimensions for calculating. mw.loader ignores CSS dependencies. See:
+   //https://phabricator.wikimedia.org/T63852
+   mw.loader.state( 'ext.bluespice.extjs', 'loading' );
+
+   var deferred = $.Deferred();
+   $.when( deferred ).then( function () {
+   //CSS is loaded, ExtJS is ready
+   mw.loader.state( 'ext.bluespice.extjs', 'ready' );
+   $(d).trigger( 'BSExtJSReady', [ bs.extjs ] );
+   });
+
+   var bsextjsisCSSReady = function( deferred ) {
+   var $dummy = $( '' )
+   .appendTo( $( document.body ) );
+   //bluespice.extjs.fixes.css:bs-extjs-cssisready
+   if ( $dummy.css( 'display' ) === 'inline' ) {
+   $dummy.remove();
+   deferred.resolve();
+   return;
+   }
+   $dummy.remove();
+   setTimeout( function () {
+   bsextjsisCSSReady( deferred );
+   }, 100 );
+   };
+
+   bsextjsisCSSReady( deferred );
 
 }( mediaWiki, blueSpice, jQuery, document ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b5191e53f1204df47899fb00a9b93dcf284bd0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] Fix mw.TemplateData.SourceHandler.prototype.extractParameter... - change (mediawiki...TemplateData)

[jenkins-bot (Code Review)]

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

Change subject: Fix 
mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode 
return doc
..


Fix mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode 
return doc

Does not return a promise

Change-Id: I790fb92542abca9768d0e55cfe79906e22886c1d
---
M modules/ext.templateDataGenerator.sourceHandler.js
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.sourceHandler.js 
b/modules/ext.templateDataGenerator.sourceHandler.js
index 13db457..0f10149 100644
--- a/modules/ext.templateDataGenerator.sourceHandler.js
+++ b/modules/ext.templateDataGenerator.sourceHandler.js
@@ -160,8 +160,7 @@
  * Adapted from 
https://he.wikipedia.org/wiki/MediaWiki:Gadget-TemplateParamWizard.js
  *
  * @param {string} templateCode Source of the template.
- * @return {jQuery.Promise} A promise that resolves into an
- *  array of parameters that appear in the template code
+ * @return {string[]} An array of parameters that appear in the template code
  */
 mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode = 
function ( templateCode ) {
var matches,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I790fb92542abca9768d0e55cfe79906e22886c1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] admin: Replace my prod yubikey SSH key (take 2) - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: admin: Replace my prod yubikey SSH key (take 2)
..


admin: Replace my prod yubikey SSH key (take 2)

Previous key does not appear to be working.

Have signed this commit and uploaded the new public key to:
bast1001:/home/krenair/new_yubikey_prod.pub

Change-Id: I7bf7314a2b3ad1a89825febc54c36e13c72a08b6
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ac28943..b5e05fb 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1434,7 +1434,7 @@
 realname: Alex Monk
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC3fwEjFgGqoTgucR2/co8DuWJfztYEzBULOmsOzkuRHVd7lHwyFmTVU9b2KRmHAEWTLQK1XOf0IxsN2OwU1Rx8awciGcQIaIRT2OBR/qcBFaq7HiECLQS8cQamVTnyERYJl06NKeh1PKtegxgnDS5nt1GrsHQqCS24CZ4Vhk0nWDNzQNKPugXJzckr7yPkU+9hoVMwG0zEZVH/vvPRdkrHXClXoieaP5QNbcFEADGrFVwgrcPUT3qM1xfHYVG8mBy+KSg9eVTsT/tG5x/Sb6S3h8Vk1OZu+JFIULW/zu52WzCQyMssbjA3CeTxAnNK1Y1n25PaZnqWljfYmrGtEZH7
 krenair prod
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDlvmBjFvN1hoi68/GOupMHP4+ry59sOf0er1SwEgYODcPgshoc1aUu7yxqsFd3oXAtyPAAG2v/NDRQsf5ZVHj+6EMxyVJC1XG7dWlys8CtsXt3JPLJvkJNygJzQ305ka51jaS8+CmnR164FOqNd6458UfMsf4KUO91ZjVU8UuohETm9rmUSdrgJq8HwK6nLtqMpBytoMD5Nw8eVjPQWz8EE9f1Ls8S2ov2SYlfPMHxKFIMmEbcx0gqGRXHDtYrhgvo7wUrLgl26f1EKHXRrNFp7iYD81yzbctw0Y8Ss6tptnAArohe3+YfRg6qU7WgLmDlO/AVFD93/GBBwja183X1
 krenair@yubikey prod
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCjyQjatHRgTqYDmKtdneyNM8ujhXx2eso3U2oFIqTsyBCH6Svn7BU/xAGfXjgWSh75h7SjwsUmXWE9eyE/BF1rypsOVC5Tjy56i7anul6f0ffGKgnMWN8gKlIdiQY4WTCi+3UQiv5vLXKsFAPLvPOQIrcWZKHARJzjx0M5lcHxC95TXn8e85S9ZCXdBNSgQfPQU2/0oVH0E2IsHbxcA/WJBxCUc1YNGxFUNk3O4JbBZX4QXFa8K9HMxoGMuhVHmiF/RHu06JJdaPt0bvHLfYoSvnvEoW6zM16wLQpVeS46ZH7ED+dgKC/DZ1Y9uL2Q6BkYeWI4hu8ojh1VpVOTihLl
 krenair@yubikey prod
 uid: 2170
   tbayer:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bf7314a2b3ad1a89825febc54c36e13c72a08b6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add upgrade hook to remove duplicate 'Refunded' contribution... - change (wikimedia...crm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Add upgrade hook to remove duplicate 'Refunded' contribution 
status
..

Add upgrade hook to remove duplicate 'Refunded' contribution status

Financial transactions with this status are deleted because (per the Phab) the 
evidence is that they are duplicates of the required ones.

The contributions are updated to have the new value.

Bug: T116317
Change-Id: Ib9633d84b67ef4c2e97e79c339bc6e82887f7f33

l

Change-Id: I03224017d44f0c8450f27b6a922d5135713a054d
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 43 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/69/266469/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 07f7494..07710fc 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -543,7 +543,6 @@
 wmf_civicrm_create_option_values('contribution_status', array(
 'Settled',
 'Paid',
-'Refunded',
 ));
 
 $api = wmf_civicrm_bootstrap_civi();
@@ -1584,3 +1583,46 @@
   require_once('update_7070.php');
   _wmf_civicrm_update_7070_fill_refund_transaction_data();
 }
+
+ /**
+ * Remove any duplication of the 'Refunded' Contribution status.
+ *
+ * This status was added to WMF & then added to core - resulting in
+ * 2 on WMF. The retained one should be set to reserved.
+ *
+ * NB I didn't add this to the install as I don't think it should be relevant 
there.
+ *
+ * T116317
+ *
+ * @throws \CiviCRM_API3_Exception
+ */
+function wmf_civicrm_update_7075() {
+  civicrm_initialize();
+  if ((civicrm_api3('OptionValue', 'getcount', array('name' => 'Refunded', 
'option_group_id' => 'contribution_status'))) == 1) {
+// Nothing to do here, move along.
+return;
+  }
+  $options = civicrm_api3('OptionValue', 'get', array(
+'name' => 'Refunded',
+'option_group_id' =>
+'contribution_status',
+'sequential' => 1,
+'options' => array('sort' => 'id ASC'),
+  ));
+
+  if ($options['count'] != 2) {
+throw new Exception(ts('This is an unexpected state - we are only 
expecting to handle the situation where there is one wmf added & one core 
added. Please wave a wand'));
+  }
+
+  $expectedRedundantType = $options['values'][1];
+  $refundValueToKeep = $options['values'][0]['value'];
+
+  if (civicrm_api3('Contribution', 'getcount', array('contribution_status_id' 
=> $expectedRedundantType['value']))) {
+  CRM_Core_DAO::executeQuery("DELETE FROM civicrm_financial_trxn WHERE 
status_id = %1", array(1 => array($expectedRedundantType['value'], 'Integer')));
+  CRM_Core_DAO::executeQuery("UPDATE civicrm_contribution SET 
contribution_status_id = %1 WHERE contribution_status_id = %2", array(
+  1 => array($refundValueToKeep, 'Integer'),
+  2 => array($expectedRedundantType['value'], 'Integer'),
+  ));
+  }
+  civicrm_api3('OptionValue', 'delete', array('id' => 
$expectedRedundantType['id']));
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03224017d44f0c8450f27b6a922d5135713a054d
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] Update upgraded contributions of Refunded status to have fin... - change (wikimedia...crm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Update upgraded contributions of Refunded status to have 
financial data.
..

Update upgraded contributions of Refunded status to have financial data.

When we did the upgrade contributions with a (then) non core status of Refunded 
were not upgrades. This commit adds the upgrade script for them. It will hurt 
your brain. Pre-caffeinate.

Bug: T123346 T122946
Change-Id: I4756ce57b7a5299b40027a358ac9334655a69bd4
---
A sites/all/modules/wmf_civicrm/update_7070.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
2 files changed, 420 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/68/266468/1

diff --git a/sites/all/modules/wmf_civicrm/update_7070.php 
b/sites/all/modules/wmf_civicrm/update_7070.php
new file mode 100644
index 000..264c365
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/update_7070.php
@@ -0,0 +1,396 @@
+http://wiki.civicrm.org/confluence/display/CRM/Financial+Items
+ *   My understanding of the financial item table (which is rarely accessed) 
is that it does
+ *   not contain any original information but holds information that would be 
otherwise hard
+ *   to get in an sql statement in order to do aggregate reports around 
different financial
+ *   accounts. Potentially WMF could use it to try to improve reporting about 
the money
+ *   received from a particular payment processor but I have doubts we would 
ever go that way.
+ *   I have doubts as to whether the financial_items are recorded 100% of the 
time when they should be.
+ *
+ *   In the case of the upgrade we need a row per line item in this table.
+ *
+ * Then IF there is a fee against the record we ALSO need
+ *  1) a financial_trxn record for the fee_amount. The double-entry 
book-keeping fields
+ *   (from_financial_account_id & to_financial_account_id) record this as a 
negative entry against the
+ *   income account for the financial type and a positive entry against the 
expense account
+ * 2) civicrm_entity_financial_trxn - to link the above financial_trxn record 
to the contribution.
+ * 3) civicrm_financial_item - adds a row to show the fee recorded against the 
financial_item expense.
+ *
+ */
+function _wmf_civicrm_update_7070_fill_refund_transaction_data() {
+  civicrm_initialize();
+  $paymentInstrumentMapping = 
_wmf_civicrm_update_7070_helper_get_payment_instrument_mapping();
+  $financialAccountId = 
_wmf_civicrm_update_7070_helper_get_default_financial_account_id();
+  $paidStatus = _wmf_civicrm_update_7070_helper_get_paid_status();
+  $refundStatus = _wmf_civicrm_update_7070_helper_get_refund_status();
+  $completedStatus = _wmf_civicrm_update_7070_helper_get_completed_status();
+  $domainContact_id = _wmf_civicrm_update_7070_helper_get_domain_contact();
+  $incomeAccountMapping = 
_wmf_civicrm_update_7070_helper_get_account_mappings('Income');
+  $expenseAccountMapping = 
_wmf_civicrm_update_7070_helper_get_account_mappings('Expense');
+
+  // 16381 rows in set (17.41 sec)
+  $result = CRM_Core_DAO::executeQuery(
+"SELECT cont.id as contribution_id,
+  cont.payment_instrument_id,
+  cont.currency,
+  cont.total_amount,
+  cont.net_amount,
+  cont.fee_amount,
+  cont.trxn_id,
+  cont.check_number,
+  cont.receive_date,
+  cont.contact_id,
+  cont.financial_type_id
+FROM civicrm_contribution cont
+LEFT JOIN civicrm_entity_financial_trxn efa
+  ON  efa.entity_id = cont.id AND efa.entity_table = 'civicrm_contribution'
+WHEREcont.contribution_status_id = $refundStatus
+  AND efa.id IS NULL
+"
+  );
+
+  // Warning: continuing to read beyond this line may cause permanent brain 
injury.
+  // Standard faustian conditions apply.
+
+  while ($result->fetch()) {
+// We will fully handle & commit each row & if we need to restart we can.
+// For each contribution we need a financial_txn record, an 
entity_financial_transaction
+// record linking it to the contribution and a financial_item record 
linking it to the line_item
+// (this latter is probably unused for most CiviCRM installs including wmf)
+$transaction = new CRM_Core_Transaction();
+
+try {
+  $trxn_date = CRM_Utils_Date::isoToMysql($result->receive_date);
+  if (!$result->fee_amount) {
+$result->fee_amount = 0;
+  }
+  if (!$result->net_amount) {
+$result->net_amount = $result->total_amount - $result->fee_amount;
+  }
+
+  $sql = "
+INSERT INTO civicrm_financial_trxn (
+  payment_instrument_id,
+  currency,
+  total_amount,
+  net_amount,
+  fee_amount,
+  trxn_id,
+  status_id,
+  check_number,
+  to_financial_account_id,
+  from_financial_account_id,
+  trxn_date
+)
+   SELECT

[MediaWiki-commits] [Gerrit] Ensure all contributions have a payment instrument set. - change (wikimedia...crm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Ensure all contributions have a payment instrument set.
..

Ensure all contributions have a payment instrument set.

From 4.3 all contributions should have a payment instrument per 
http://wiki.civicrm.org/confluence/display/CRMDOC/Fixing+Transactions+Missing+a+Payment+Instrument+-+4.4.3+Upgrades

Change-Id: I089ad3493baed5dcebc48acbed15ae2ce92cc322
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 42 insertions(+), 0 deletions(-)


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

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 2b38f36..03f026b 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -1518,3 +1518,45 @@
 wmf_civicrm_fill_missing_appeal_data('2015-10-01');
 }
 
+/**
+ * Ensure all payments have a payment instrument id.
+ *
+ * Per 
http://wiki.civicrm.org/confluence/display/CRMDOC/Fixing+Transactions+Missing+a+Payment+Instrument+-+4.4.3+Upgrades
+ * there is a payment instrument id set for all contributions.
+ *
+ * The code there basically just figures out a default & sets the empty ones 
to that.
+ *
+ * If we look at the first million contributions just setting the it to 
'Gateway' seems a reasonable
+ * choice of default.
+ *
+ * SELECT  payment_instrument_id, count(*) FROM (SELECT * FROM 
civicrm_contribution LIMIT 100) as t GROUP BY payment_instrument_id;
+ * +---+--+
+ * | payment_instrument_id | count(*) |
+ * +---+--+
+ * |  NULL |   33 |
+ * | 1 |3 |
+ * | 3 |   30 |
+ * | 4 |14162 |
+ * | 5 |  119 |
+ * | 6 |   982954 |
+ * | 7 | 1451 |
+ * | 8 | 1246 |
+ * |44 |1 |
+ * |   186 |1 |
+ */
+function wmf_civicrm_update_7065() {
+  $paymentInstruments = civicrm_api3('Contribution', 'getoptions', 
array('field' => 'payment_instrument_id'));
+  $defaultPaymentInstrument = array_search('Gateway', $paymentInstruments);
+  CRM_Core_DAO::executeQuery(
+"UPDATE civicrm_contribution SET payment_instrument_id = 
$defaultPaymentInstrument WHERE payment_instrument_id IS NULL"
+  );
+  CRM_Core_DAO::executeQuery(
+"UPDATE civicrm_financial_trxn cft
+LEFT JOIN civicrm_entity_financial_trxn ceft ON ceft.financial_trxn_id = cft.id
+LEFT JOIN civicrm_contribution cc  ON ceft.entity_id = cc.id
+SET cc.payment_instrument_id =
+  cft.payment_instrument_id = $defaultPaymentInstrument 
IFNULL(cc.payment_instrument_id, $defaultPaymentInstrument)
+WHERE ceft.entity_table = 'civicrm_contribution' AND cft.payment_instrument_id 
IS NULL;"
+  );
+}
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I089ad3493baed5dcebc48acbed15ae2ce92cc322
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] Add GENDER support to $3 in logentry-rights-rights - change (mediawiki/core)

[PranavK (Code Review)]

PranavK has uploaded a new change for review.

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

Change subject: Add GENDER support to $3 in logentry-rights-rights
..

Add GENDER support to $3 in logentry-rights-rights

Bug: T52583
Change-Id: I23756db584cd15652caf42ed0c5e7a0aaea13836
---
M languages/i18n/en.json
M languages/i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/266473/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index f50dcca..54c6cbd 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3653,7 +3653,7 @@
"logentry-protect-protect-cascade": "$1 {{GENDER:$2|protected}} $3 $4 
[cascading]",
"logentry-protect-modify": "$1 {{GENDER:$2|changed}} protection level 
for $3 $4",
"logentry-protect-modify-cascade": "$1 {{GENDER:$2|changed}} protection 
level for $3 $4 [cascading]",
-   "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership 
for $3 from $4 to $5",
+   "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership 
for {{GENDER:$3|$3}} from $4 to $5",
"logentry-rights-rights-legacy": "$1 {{GENDER:$2|changed}} group 
membership for $3",
"logentry-rights-autopromote": "$1 was automatically 
{{GENDER:$2|promoted}} from $4 to $5",
"logentry-upload-upload": "$1 {{GENDER:$2|uploaded}} $3",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e0ea568..2ec7a84 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -3828,7 +3828,7 @@
"logentry-protect-protect-cascade": 
"{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with 
{{msg-mw|protect-summary-desc}}, multiple possible)\nFor word \"cascading\" see 
{{msg-mw|protect-summary-cascade}}",
"logentry-protect-modify": "{{Logentry|[[Special:Log/protect]]}}\n\n* 
$4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple 
possible)",
"logentry-protect-modify-cascade": 
"{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with 
{{msg-mw|protect-summary-desc}}, multiple possible)\nFor word \"cascading\" see 
{{msg-mw|protect-summary-cascade}}",
-   "logentry-rights-rights": "* $1 - username\n* $2 - (see below)\n* $3 - 
username\n* $4 - list of user groups or {{msg-mw|Rightsnone}}\n* $5 - list of 
user groups or 
{{msg-mw|Rightsnone}}\n\n{{Logentry|[[Special:Log/rights]]}}",
+   "logentry-rights-rights": "* $1 - username\n* $2 - (see below)\n* $3 - 
username, also used for GENDER support\n* $4 - list of user groups or 
{{msg-mw|Rightsnone}}\n* $5 - list of user groups or 
{{msg-mw|Rightsnone}}\n\n{{Logentry|[[Special:Log/rights]]}}",
"logentry-rights-rights-legacy": "* $1 - username\n* $2 - (see 
below)\n* $3 - username\n\n{{Logentry|[[Special:Log/rights]]}}",
"logentry-rights-autopromote": "* $1 - username\n* $2 - (see below)\n* 
$3 - (see below)\n* $4 - comma separated list of old user groups or 
{{msg-mw|Rightsnone}}\n* $5 - comma separated list of new user 
groups\n\n{{Logentry|[[Special:Log/rights]]}}",
"logentry-upload-upload": "{{Logentry|[[Special:Log/upload]]}}",

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

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

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

[MediaWiki-commits] [Gerrit] doc: Fix incorrect @return documentation for getRelativePath() - change (RelPath)

[jenkins-bot (Code Review)]

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

Change subject: doc: Fix incorrect @return documentation for getRelativePath()
..


doc: Fix incorrect @return documentation for getRelativePath()

Follows-up 8b0feae80d.

Change-Id: I779b988edae82db6e60c10c8fbab04e461662343
---
M src/RelPath.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/RelPath.php b/src/RelPath.php
index 055f468..7d61d1a 100644
--- a/src/RelPath.php
+++ b/src/RelPath.php
@@ -69,7 +69,7 @@
  * @param string $path File path.
  * @param string $start Start directory. Optional; if not specified, the 
current
  *  working directory will be used.
- * @return array|bool Array of path components or false if file does not exist.
+ * @return string|bool Relative path, or false if input was invalid.
  */
 function getRelativePath( $path, $start = null ) {
if ( $start === null ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I779b988edae82db6e60c10c8fbab04e461662343
Gerrit-PatchSet: 1
Gerrit-Project: RelPath
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] admin: Replace my prod yubikey SSH key (take 2) - change (operations/puppet)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: admin: Replace my prod yubikey SSH key (take 2)
..

admin: Replace my prod yubikey SSH key (take 2)

Previous key does not appear to be working.

Have signed this commit and uploaded the new public key to:
bast1001:/home/krenair/new_yubikey_prod.pub

Change-Id: I7bf7314a2b3ad1a89825febc54c36e13c72a08b6
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/266465/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 0e92ff8..365c4ec 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1433,7 +1433,7 @@
 realname: Alex Monk
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC3fwEjFgGqoTgucR2/co8DuWJfztYEzBULOmsOzkuRHVd7lHwyFmTVU9b2KRmHAEWTLQK1XOf0IxsN2OwU1Rx8awciGcQIaIRT2OBR/qcBFaq7HiECLQS8cQamVTnyERYJl06NKeh1PKtegxgnDS5nt1GrsHQqCS24CZ4Vhk0nWDNzQNKPugXJzckr7yPkU+9hoVMwG0zEZVH/vvPRdkrHXClXoieaP5QNbcFEADGrFVwgrcPUT3qM1xfHYVG8mBy+KSg9eVTsT/tG5x/Sb6S3h8Vk1OZu+JFIULW/zu52WzCQyMssbjA3CeTxAnNK1Y1n25PaZnqWljfYmrGtEZH7
 krenair prod
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDlvmBjFvN1hoi68/GOupMHP4+ry59sOf0er1SwEgYODcPgshoc1aUu7yxqsFd3oXAtyPAAG2v/NDRQsf5ZVHj+6EMxyVJC1XG7dWlys8CtsXt3JPLJvkJNygJzQ305ka51jaS8+CmnR164FOqNd6458UfMsf4KUO91ZjVU8UuohETm9rmUSdrgJq8HwK6nLtqMpBytoMD5Nw8eVjPQWz8EE9f1Ls8S2ov2SYlfPMHxKFIMmEbcx0gqGRXHDtYrhgvo7wUrLgl26f1EKHXRrNFp7iYD81yzbctw0Y8Ss6tptnAArohe3+YfRg6qU7WgLmDlO/AVFD93/GBBwja183X1
 krenair@yubikey prod
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCjyQjatHRgTqYDmKtdneyNM8ujhXx2eso3U2oFIqTsyBCH6Svn7BU/xAGfXjgWSh75h7SjwsUmXWE9eyE/BF1rypsOVC5Tjy56i7anul6f0ffGKgnMWN8gKlIdiQY4WTCi+3UQiv5vLXKsFAPLvPOQIrcWZKHARJzjx0M5lcHxC95TXn8e85S9ZCXdBNSgQfPQU2/0oVH0E2IsHbxcA/WJBxCUc1YNGxFUNk3O4JbBZX4QXFa8K9HMxoGMuhVHmiF/RHu06JJdaPt0bvHLfYoSvnvEoW6zM16wLQpVeS46ZH7ED+dgKC/DZ1Y9uL2Q6BkYeWI4hu8ojh1VpVOTihLl
 krenair@yubikey prod
 uid: 2170
   tbayer:
 ensure: present

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

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

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

[MediaWiki-commits] [Gerrit] Stop toploading javascript - change (labs/toollabs)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Stop toploading javascript
..

Stop toploading javascript

Move the javascript used for sorting tables to the bottom of the page to
improve time to page render.

Change-Id: Iccc3c2451e849aa9bbcab521233b2a11101530b0
---
M www/index.php
1 file changed, 17 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/66/266466/1

diff --git a/www/index.php b/www/index.php
index d0529aa..f79857d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -123,23 +123,6 @@
 
 
 
-
-
-
-$(document).ready(function() {
-   $(".tablesorter").tablesorter({
-   sortList: [[0,0]],
-   // initialize zebra striping of the table
-   widgets: ["zebra"],
-   // change the default striping class names
-   // updated in v2.1 to use widgetOptions.zebra = ["even", "odd"]
-   // widgetZebra: { css: [ "normal-row", "alt-row" ] } still works
-   widgetOptions : {
-   zebra : [ "normal-row", "alt-row" ]
-   }
-   });
-);
-
 
 
 
@@ -160,5 +143,22 @@
 
 
 
+
+
+
+$(document).ready(function() {
+   $(".tablesorter").tablesorter({
+   sortList: [[0,0]],
+   // initialize zebra striping of the table
+   widgets: ["zebra"],
+   // change the default striping class names
+   // updated in v2.1 to use widgetOptions.zebra = ["even", "odd"]
+   // widgetZebra: { css: [ "normal-row", "alt-row" ] } still works
+   widgetOptions : {
+   zebra : [ "normal-row", "alt-row" ]
+   }
+   });
+);
+
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccc3c2451e849aa9bbcab521233b2a11101530b0
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] Added "SFWikiPage" classes, intended for creation of page text - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Added "SFWikiPage" classes, intended for creation of page text
..


Added "SFWikiPage" classes, intended for creation of page text

Also slightly modified the relevant SF tests
Change-Id: Ia643c7ee0c8692bc18f0200de270b4c317eb2603
---
M SemanticForms.php
M extension.json
M includes/SF_FormPrinter.php
M includes/SF_FormUtils.php
M includes/SF_PageSection.php
M includes/SF_TemplateInForm.php
A includes/wikipage/SF_WikiPage.php
A includes/wikipage/SF_WikiPageFreeText.php
A includes/wikipage/SF_WikiPageSection.php
A includes/wikipage/SF_WikiPageTemplate.php
A includes/wikipage/SF_WikiPageTemplateParam.php
M tests/phpunit/includes/SF_FormPrinterTest.php
12 files changed, 423 insertions(+), 165 deletions(-)

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



diff --git a/SemanticForms.php b/SemanticForms.php
index fd6a444..3e2b6a5 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -226,6 +226,11 @@
 $GLOBALS['wgAutoloadClasses']['SFTokensInput'] = __DIR__ . 
'/includes/forminputs/SF_TokensInput.php';
 $GLOBALS['wgAutoloadClasses']['SFGoogleMapsInput'] = __DIR__ . 
'/includes/forminputs/SF_GoogleMapsInput.php';
 $GLOBALS['wgAutoloadClasses']['SFOpenLayersInput'] = __DIR__ . 
'/includes/forminputs/SF_OpenLayersInput.php';
+$GLOBALS['wgAutoloadClasses']['SFWikiPage'] = __DIR__ . 
'/includes/wikipage/SF_WikiPage.php';
+$GLOBALS['wgAutoloadClasses']['SFWikiPageTemplate'] = __DIR__ . 
'/includes/wikipage/SF_WikiPageTemplate.php';
+$GLOBALS['wgAutoloadClasses']['SFWikiPageTemplateParam'] = __DIR__ . 
'/includes/wikipage/SF_WikiPageTemplateParam.php';
+$GLOBALS['wgAutoloadClasses']['SFWikiPageSection'] = __DIR__ . 
'/includes/wikipage/SF_WikiPageSection.php';
+$GLOBALS['wgAutoloadClasses']['SFWikiPageFreeText'] = __DIR__ . 
'/includes/wikipage/SF_WikiPageFreeText.php';
 
 $GLOBALS['wgJobClasses']['createPage'] = 'SFCreatePageJob';
 $GLOBALS['wgAutoloadClasses']['SFCreatePageJob'] = __DIR__ . 
'/includes/SF_CreatePageJob.php';
diff --git a/extension.json b/extension.json
index 5c797ed..4266314 100644
--- a/extension.json
+++ b/extension.json
@@ -114,6 +114,11 @@
"SFTokensInput": "includes/forminputs/SF_TokensInput.php",
"SFGoogleMapsInput": 
"includes/forminputs/SF_GoogleMapsInput.php",
"SFOpenLayersInput": 
"includes/forminputs/SF_OpenLayersInput.php",
+   "SFWikiPage": "includes/wikipage/SF_WikiPage.php",
+   "SFWikiPageTemplate": 
"includes/wikipage/SF_WikiPageTemplate.php",
+   "SFWikiPageTemplateParam": 
"includes/wikipage/SF_WikiPageTemplateParam.php",
+   "SFWikiPageSection": "includes/wikipage/SF_WikiPageSection.php",
+   "SFWikiPageFreeText": 
"includes/wikipage/SF_WikiPageFreeText.php",
"SFCreatePageJob": "includes/SF_CreatePageJob.php",
"SF_Language": "languages/SF_Language.php"
},
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index bcef713..10ec236 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -272,10 +272,6 @@
return $templateName . '___' . $fieldName;
}
 
-   static function makePlaceholderInWikiText( $str ) {
-   return '@replace_' . $str . '@';
-   }
-
static function makePlaceholderInFormHTML( $str ) {
return '@insertHTML_' . $str . '@';
}
@@ -544,6 +540,7 @@
global $sfgFieldNum; // used for setting various HTML IDs
 
// initialize some variables
+   $wiki_page = new SFWikiPage();
$sfgTabIndex = 1;
$sfgFieldNum = 1;
$source_page_matches_this_form = false;
@@ -556,8 +553,6 @@
// the parsing, so we have to assume that it will become a 
possibility
$form_is_partial = false;
$new_text = "";
-   // flag for placing "" tags in form output
-   $onlyinclude_free_text = false;
 
// If we have existing content and we're not in an active 
replacement
// situation, preserve the original content. We do this because 
we want
@@ -693,14 +688,12 @@
// existing article as well, finding template and field
// declarations and replacing them with form elements, either
// blank or pre-populated, as appropriate.
-   $data_text = "";
$tif = null;
// This array will keep track of all the replaced @@ 
strings
$placeholderFields = array();
 
for ( $section_num = 0; $section_num < count( 
$form_def_sections ); $section_num++ ) {
$start_position = 0;
-   $template_text = "";
// the append is 

[MediaWiki-commits] [Gerrit] TextInputWidget: Don't fail if 'validate' function returns null - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: TextInputWidget: Don't fail if 'validate' function returns null
..


TextInputWidget: Don't fail if 'validate' function returns null

If the 'validate' function we're given fails to cast its return value
to boolean true/false, it could be null, which would cause exceptions
when trying to access `result.promise` here. Check that `result` is
truthy first.

Change-Id: Ic50b7d09546bdb246045ab198533eba5c29dbfec
---
M src/widgets/TextInputWidget.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index 92495e6..e8c49c8 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -686,7 +686,7 @@
 
if ( this.validate instanceof Function ) {
result = this.validate( this.getValue() );
-   if ( $.isFunction( result.promise ) ) {
+   if ( result && $.isFunction( result.promise ) ) {
return result.promise();
} else {
return $.Deferred().resolve( !!result ).promise();
@@ -718,7 +718,7 @@
if ( this.validate instanceof Function ) {
result = this.validate( this.getValue() );
 
-   if ( $.isFunction( result.promise ) ) {
+   if ( result && $.isFunction( result.promise ) ) {
promise = $.Deferred();
 
result.then( function ( valid ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic50b7d09546bdb246045ab198533eba5c29dbfec
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Get rid of $wg = $wmg for BetaFeatures - change (operations/mediawiki-config)

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Get rid of $wg = $wmg for BetaFeatures
..

Get rid of $wg = $wmg for BetaFeatures

Bug: T119117
Change-Id: I1cb7d96e0585c40cf33b816d2633498267456813
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7574b43..4889209 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1871,9 +1871,6 @@
 
 if ( $wmgUseBetaFeatures ) {
wfLoadExtension( 'BetaFeatures' );
-   if ( $wmgBetaFeaturesWhitelist ) {
-   $wgBetaFeaturesWhitelist = $wmgBetaFeaturesWhitelist;
-   }
 }
 
 if ( $wmgUseCommonsMetadata ) {

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

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

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

[MediaWiki-commits] [Gerrit] MimeMagic: Set mime-type for .js to application/javascript - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: MimeMagic: Set mime-type for .js to application/javascript
..


MimeMagic: Set mime-type for .js to application/javascript

The previous "application/x-javascript" was non-standard. It was used as
unregistered mime type by various vendors after stakeholders agreed it
shouldn't be text/javascript anymore, but "application/javascript" was
still pending approval. That was settled in 2006 with RFC 4329.
http://www.iana.org/assignments/media-types/media-types.xhtml
https://tools.ietf.org/html/rfc4329

It also previously inconsistently returned "application/x-javascript" or
"text/javascript" depending on whether you call MimeMagic with or without
the flag that asks for "improved" mime magic (in the latter mode, it picks
the first one from the mime-info list as override).

This makes MimeMagic match the behaviour of HHVM-static server, NGINX,
and Apache 2.4; with regards to Content-Type for .js files.

Change-Id: Idfe0a80c60c548fe28283c62ee9803bff7bdb2d6
---
M includes/MimeMagic.php
M includes/mime.info
M includes/mime.types
M tests/phpunit/includes/MimeMagicTest.php
4 files changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 8ab92b4..d619f2d 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -59,7 +59,7 @@
 application/vnd.oasis.opendocument.text-master otm
 application/vnd.oasis.opendocument.text-template ott
 application/vnd.oasis.opendocument.text-web oth
-application/x-javascript js
+application/javascript js
 application/x-shockwave-flash swf
 audio/midi mid midi kar
 audio/mpeg mpga mpa mp2 mp3
@@ -110,7 +110,7 @@
 application/vnd.oasis.opendocument.text-template [OFFICE]
 application/vnd.oasis.opendocument.text-master [OFFICE]
 application/vnd.oasis.opendocument.text-web [OFFICE]
-text/javascript application/x-javascript [EXECUTABLE]
+application/javascript text/javascript application/x-javascript [EXECUTABLE]
 application/x-shockwave-flash [MULTIMEDIA]
 audio/midi [AUDIO]
 audio/x-aiff [AUDIO]
diff --git a/includes/mime.info b/includes/mime.info
index 999be92..b04d3c6 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -78,7 +78,7 @@
 application/x-opc+zip  [ARCHIVE]
 application/x-7z-compressed [ARCHIVE]
 
-text/javascript application/x-javascript application/x-ecmascript 
text/ecmascript  [EXECUTABLE]
+application/javascript text/javascript application/x-javascript 
application/x-ecmascript text/ecmascript   [EXECUTABLE]
 application/x-bash [EXECUTABLE]
 application/x-sh   [EXECUTABLE]
 application/x-csh  [EXECUTABLE]
diff --git a/includes/mime.types b/includes/mime.types
index c3b5190..89c8847 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -36,7 +36,7 @@
 application/x-gzip gz
 application/x-hdf hdf
 application/x-jar jar
-application/x-javascript js
+application/javascript js
 application/json json
 application/x-koan skp skd skt skm
 application/x-latex latex
diff --git a/tests/phpunit/includes/MimeMagicTest.php 
b/tests/phpunit/includes/MimeMagicTest.php
index 3c45f30..fabc5c6 100644
--- a/tests/phpunit/includes/MimeMagicTest.php
+++ b/tests/phpunit/includes/MimeMagicTest.php
@@ -28,6 +28,8 @@
array( 'txt', 'text/plain', 'text/plain' ),
array( 'csv', 'text/plain', 'text/csv' ),
array( 'tsv', 'text/plain', 'text/tab-separated-values' 
),
+   array( 'js', 'text/javascript', 
'application/javascript' ),
+   array( 'js', 'application/x-javascript', 
'application/javascript' ),
array( 'json', 'text/plain', 'application/json' ),
array( 'foo', 'application/x-opc+zip', 
'application/zip' ),
array( 'docx', 'application/x-opc+zip',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe0a80c60c548fe28283c62ee9803bff7bdb2d6
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: RobLa 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] role::deployment::salt_masters: correct a hiera lookup - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: role::deployment::salt_masters: correct a hiera lookup
..

role::deployment::salt_masters: correct a hiera lookup

Change-Id: I03ac55c0ad598d1f24cf467c39c239d6f3c7659b
---
M modules/role/manifests/deployment/salt_masters.pp
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/266216/1

diff --git a/modules/role/manifests/deployment/salt_masters.pp 
b/modules/role/manifests/deployment/salt_masters.pp
index dcebd63..4b22c0f 100644
--- a/modules/role/manifests/deployment/salt_masters.pp
+++ b/modules/role/manifests/deployment/salt_masters.pp
@@ -1,17 +1,21 @@
 # === Class role::deployment::salt_masters
 # Installs deployment-related data to the salt master
 class role::deployment::salt_masters(
-$deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet'),
-) {
+$deployment_server = undef
+) {
 
+$deployment_host = $deployment_server ? {
+undef   => hiera('deployment_server', 'tin.eqiad.wmnet'),
+default => $deployment_server
+}
 $deployment_config = {
 'parent_dir' => '/srv/deployment',
 'servers'=> {
-'eqiad'  => $deployment_server,
-'codfw'  => $deployment_server,
+'eqiad'  => $deployment_host,
+'codfw'  => $deployment_host,
 },
 'redis'  => {
-'host'   => $deployment_server,
+'host'   => $deployment_host,
 'port'   => '6379',
 'db' => '0',
 'socket_connect_timeout' => '5',

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Temporarily disable eventlogging mysql consumers and... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Revert "Temporarily disable eventlogging mysql consumers and 
burrow monitoring for them"
..


Revert "Temporarily disable eventlogging mysql consumers and burrow monitoring 
for them"

Jaime is done with the TokuDB conversion.

Bug: T120187

This reverts commit 2d950c97ce26b8e29017af647b19c80cf015b309.

Change-Id: Id56f48d28e0fae63da7d172821a70685cc630a55
---
M hieradata/role/common/analytics/burrow.yaml
M manifests/role/eventlogging.pp
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/hieradata/role/common/analytics/burrow.yaml 
b/hieradata/role/common/analytics/burrow.yaml
index d06c051..52b60b5 100644
--- a/hieradata/role/common/analytics/burrow.yaml
+++ b/hieradata/role/common/analytics/burrow.yaml
@@ -1,7 +1,5 @@
 burrow::httpserver_port: 8000
 burrow::consumer_groups:
   - eventlogging-00
-  # Temporarily stop monitoring this consumer group
-  # https://phabricator.wikimedia.org/T120187
-  # - mysql-m4-master
+  - mysql-m4-master
   - eventlogging-files-00
\ No newline at end of file
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index f51fc92..62c9f53 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -223,9 +223,6 @@
 
 # Kafka consumer group for this consumer is mysql-m4-master
 eventlogging::service::consumer { $mysql_consumers:
-# Temporarily ensuring absent while Jaime does TokuDB conversion:
-# https://phabricator.wikimedia.org/T120187
-ensure => 'absent',
 input  => 
"${kafka_mixed_uri}_connect=${kafka_zookeeper_url}&${kafka_consumer_args}",
 output => 
"mysql://${mysql_user}:${mysql_pass}@${mysql_db}?charset=utf8_host=${statsd_host}=True",
 sid=> $kafka_consumer_group,

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

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

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

[MediaWiki-commits] [Gerrit] Register ext.uls.eventlogger conditionally - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Register ext.uls.eventlogger conditionally
..


Register ext.uls.eventlogger conditionally

The ext.uls.eventlogger module is now registered depending on
the configuration variable $wgULSEventLogging. This will prevent
the Structuretest Resourcetest to fail, if EventLogging isn't
installed on the test system (like on my jenkins environment :P).

Change-Id: I1e2545492ec04fb043638765ac42f09da89813e9
---
M UniversalLanguageSelector.hooks.php
M extension.json
2 files changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index c5e2f30..8080748 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -404,7 +404,7 @@
 * @return boolean true
 */
public static function onResourceLoaderRegisterModules( ResourceLoader 
&$resourceLoader ) {
-   global $wgResourceModules;
+   global $wgResourceModules, $wgULSEventLogging;
 
if (
(
@@ -452,6 +452,20 @@
) );
}
 
+   if ( $wgULSEventLogging ) {
+   $resourceLoader->register( array(
+   'ext.uls.eventlogger' => array(
+   'scripts' => 
'js/ext.uls.eventlogger.js',
+   'dependencies' => array(
+   'mediawiki.user',
+   
'schema.UniversalLanguageSelector',
+   ),
+   'localBasePath' => __DIR__ . 
'/resources',
+   'remoteExtPath' => 
'UniversalLanguageSelector/resources',
+   ),
+   ) );
+   }
+
return true;
}
 }
diff --git a/extension.json b/extension.json
index c6dfd9b..a739c61 100644
--- a/extension.json
+++ b/extension.json
@@ -163,15 +163,6 @@
"localBasePath": "resources",
"remoteExtPath": "UniversalLanguageSelector/resources"
},
-   "ext.uls.eventlogger": {
-   "scripts": "js/ext.uls.eventlogger.js",
-   "dependencies": [
-   "mediawiki.user",
-   "schema.UniversalLanguageSelector"
-   ],
-   "localBasePath": "resources",
-   "remoteExtPath": "UniversalLanguageSelector/resources"
-   },
"ext.uls.i18n": {
"scripts": "js/ext.uls.i18n.js",
"dependencies": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e2545492ec04fb043638765ac42f09da89813e9
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make neodymium the debdeploy master - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Make neodymium the debdeploy master
..


Make neodymium the debdeploy master

The respective role will be removed from palladium in a subsequent commit
after some testing.

Change-Id: Ib535abbcd3e7c8b54f7de0c2e7711245d357a5fd
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 247ddbb..9864f0d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2118,7 +2118,7 @@
 # secondary salt master
 node 'neodymium.eqiad.wmnet' {
 #role salt::masters::production, deployment::salt_masters, 
debdeploy::master
-role salt::masters::production
+role salt::masters::production, debdeploy::master
 include standard
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Use a single date for Sys.Date()-1 - change (wikimedia...golden)

[OliverKeyes (Code Review)]

OliverKeyes has uploaded a new change for review.

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

Change subject: Use a single date for Sys.Date()-1
..

Use a single date for Sys.Date()-1

This passes Sys.Date()-1 into main() from run(). The idea
is very simple; at the moment we're launching the cron job
relatively late in the day to cover for the possibility
of EventLogging replication lag. Each main() function
calculates Sys.Date()-1 on its own. When combined, this
raises the improbable but possible scenario where some
of the code takes long enough to run that the Sys.Date changes,
and some scripts run for day N and others for N+1.

Instead, with this change we'll be passing N through consistently,
for all files, and still retain the ability to run the main()
functions as self-contained blocks. Everyone wins.

Change-Id: Ia4b98b72f115128c435ec7da6610527b869fc91e
---
M run.R
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/20/266220/1

diff --git a/run.R b/run.R
index 8bdeb2c..6174368 100644
--- a/run.R
+++ b/run.R
@@ -19,18 +19,19 @@
   
   # If the user has not provided dates, just run each file.
   if(!length(dates)){
-file_status <- unlist(lapply(source_files, function(x){
+date <- (Sys.Date() - 1)
+file_status <- unlist(lapply(source_files, function(x, date){
   tryCatch({
 source(x)
 check_dir(base_path)
-main()
+main(date)
   }, error = function(e){
 print(x)
 print(e$message)
 return(FALSE)
   })
   return(TRUE)
-}))
+}, date = date))
   } else {
 # If the user has provided dates, we need to do more clever stuff.
 data_files <- list.files(write_dirs, full.names = TRUE, pattern = 
"\\.tsv$")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4b98b72f115128c435ec7da6610527b869fc91e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: OliverKeyes 

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

[MediaWiki-commits] [Gerrit] Allow custom wikitext license in preferences - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

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

Change subject: Allow custom wikitext license in preferences
..


Allow custom wikitext license in preferences

Bug: T42647
Change-Id: I30d8a1324a061a6eebdf017da80898fb9e95fbbb
---
M UploadWizardHooks.php
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialUploadWizard.php
M resources/mw.UploadWizardLicenseInput.js
5 files changed, 39 insertions(+), 6 deletions(-)

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



diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index aa8792c..1514084 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -824,11 +824,15 @@
$licenses[$licenseKey] = 'ownwork-' . $license;
}
 
-   foreach ( UploadWizardConfig::getThirdPartyLicenses() 
as $license ) {
+   $thirdParty = 
UploadWizardConfig::getThirdPartyLicenses();
+   $hasCustom = false;
+   foreach ( $thirdParty as $license ) {
if ( $license !== 'custom' ) {
$licenseMessage = 
self::getLicenseMessage( $license, $licenseConfig );
$licenseKey = wfMessage( 
'mwe-upwiz-prefs-license-thirdparty', $licenseMessage )->text();
$licenses[$licenseKey] = 'thirdparty-' 
. $license;
+   } else {
+   $hasCustom = true;
}
}
 
@@ -839,6 +843,14 @@
$licenses
);
 
+   if ( $hasCustom ) {
+   // The "custom license" option must be last, 
otherwise the text referring to "following
+   // wikitext" and "last option above" makes no 
sense.
+   $licenseMessage = self::getLicenseMessage( 
'custom', $licenseConfig );
+   $licenseKey = wfMessage( 
'mwe-upwiz-prefs-license-thirdparty', $licenseMessage )->text();
+   $licenses[$licenseKey] = 'thirdparty-custom';
+   };
+
$preferences['upwiz_deflicense'] = array(
'type' => 'radio',
'label-message' => 
'mwe-upwiz-prefs-def-license',
@@ -846,6 +858,15 @@
'options' => $licenses
);
 
+   if ( $hasCustom ) {
+   $preferences['upwiz_deflicense_custom'] = array(
+   'type' => 'text',
+   'label-message' => 
'mwe-upwiz-prefs-def-license-custom',
+   'help-message' => 
'mwe-upwiz-prefs-def-license-custom-help',
+   'section' => 'uploads/upwiz-licensing',
+   );
+   }
+
if ( UploadWizardConfig::getSetting( 'enableChunked' ) 
=== 'opt-in' ) {
$preferences['upwiz-chunked'] = array(
'type' => 'check',
diff --git a/i18n/en.json b/i18n/en.json
index 23b5d39..c44f6f4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -322,6 +322,8 @@
"prefs-upwiz-interface": "User interface",
"mwe-upwiz-prefs-def-license": "Default license",
"mwe-upwiz-prefs-def-license-def": "Use whatever the default is",
+   "mwe-upwiz-prefs-def-license-custom": "Custom default license",
+   "mwe-upwiz-prefs-def-license-custom-help": "This field is only used if 
you choose the last option above.",
"mwe-upwiz-prefs-license-own": "Own work - $1",
"mwe-upwiz-prefs-license-thirdparty": "Someone else's work - $1",
"mwe-upwiz-prefs-chunked": "Chunked uploads for files over $1 in Upload 
Wizard - Increases maximum file upload size from $2 to $3",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4d3609d..4d0689b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -344,8 +344,10 @@
"prefs-upwiz-licensing": "{{Identical|Licensing}}",
"prefs-upwiz-experimental": "Used in [[Special:Preferences]].",
"prefs-upwiz-interface": "Preferences section heading for preferences 
related to the Upload Wizard user interface",
-   "mwe-upwiz-prefs-def-license": "Form input label",
+   "mwe-upwiz-prefs-def-license": "Label of preference used to choose 
which license which is selected by default when uploading files.",
"mwe-upwiz-prefs-def-license-def": "Radio button option",
+   "mwe-upwiz-prefs-def-license-custom": "Label of preference used to 
input wikitext for custom license, if selected.",
+   

[MediaWiki-commits] [Gerrit] Revert "Temporarily disable eventlogging mysql consumers and... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Revert "Temporarily disable eventlogging mysql consumers and 
burrow monitoring for them"
..

Revert "Temporarily disable eventlogging mysql consumers and burrow monitoring 
for them"

Jaime is done with the TokuDB conversion.

Bug: T120187

This reverts commit 2d950c97ce26b8e29017af647b19c80cf015b309.

Change-Id: Id56f48d28e0fae63da7d172821a70685cc630a55
---
M hieradata/role/common/analytics/burrow.yaml
M manifests/role/eventlogging.pp
2 files changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/hieradata/role/common/analytics/burrow.yaml 
b/hieradata/role/common/analytics/burrow.yaml
index d06c051..52b60b5 100644
--- a/hieradata/role/common/analytics/burrow.yaml
+++ b/hieradata/role/common/analytics/burrow.yaml
@@ -1,7 +1,5 @@
 burrow::httpserver_port: 8000
 burrow::consumer_groups:
   - eventlogging-00
-  # Temporarily stop monitoring this consumer group
-  # https://phabricator.wikimedia.org/T120187
-  # - mysql-m4-master
+  - mysql-m4-master
   - eventlogging-files-00
\ No newline at end of file
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index f51fc92..62c9f53 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -223,9 +223,6 @@
 
 # Kafka consumer group for this consumer is mysql-m4-master
 eventlogging::service::consumer { $mysql_consumers:
-# Temporarily ensuring absent while Jaime does TokuDB conversion:
-# https://phabricator.wikimedia.org/T120187
-ensure => 'absent',
 input  => 
"${kafka_mixed_uri}_connect=${kafka_zookeeper_url}&${kafka_consumer_args}",
 output => 
"mysql://${mysql_user}:${mysql_pass}@${mysql_db}?charset=utf8_host=${statsd_host}=True",
 sid=> $kafka_consumer_group,

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

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

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

[MediaWiki-commits] [Gerrit] Tighten dependency - change (operations...linux-meta)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Tighten dependency
..

Tighten dependency

Also commit some changes which we previously only on copper.

Change-Id: If40d643c104cb54d2690f7fe8bafb3cbec7bf3a9
---
M debian/changelog
M debian/control
M debian/linux-meta.postinst
3 files changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux-meta 
refs/changes/27/266227/1

diff --git a/debian/changelog b/debian/changelog
index fc26492..3a9bcba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+linux-meta (1.6) jessie-wikimedia; urgency=medium
+
+  * Tighten dependency for latest 3.19 update
+
+ -- Moritz Muehlenhoff   Mon, 25 Jan 2016 14:42:42 +0100
+
+linux-meta (1.5) jessie-wikimedia; urgency=medium
+
+  * Fix execution of update-grub
+
+ -- Moritz Muehlenhoff   Tue, 19 Jan 2016 20:01:51 +
+
+linux-meta (1.4) jessie-wikimedia; urgency=medium
+
+  * Bump for 3.19.3-10
+
+ -- Moritz Muehlenhoff   Tue, 19 Jan 2016 20:49:37 
+0100
+
 linux-meta (1.3) jessie-wikimedia; urgency=medium
 
   * Bump to kernel ABI 3.19.0-2 / version 3.19.3-9
diff --git a/debian/control b/debian/control
index 876dbdd..e5a3393 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@
 
 Package: linux-meta
 Architecture: any
-Depends: linux-image-3.19.0-2-amd64 [amd64], initramfs-tools, grub2-common, 
firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
+Depends: linux-image-3.19.0-2-amd64 [amd64] (>= 3.19.3-10), initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
 Description: Meta package for kernel images
  This package depends on the latest Linux kernel used in the WMF environment.
  It can also serve to depend on firmware packages not part of the stock Linux
diff --git a/debian/linux-meta.postinst b/debian/linux-meta.postinst
index 89a6fdd..506bc94 100644
--- a/debian/linux-meta.postinst
+++ b/debian/linux-meta.postinst
@@ -6,8 +6,8 @@
 
 if [ ! -e /boot/initrd.img-$KVERSION ] ; then
 update-initramfs -c -k $KVERSION
-update-grub
 fi
+update-grub
 
 #DEBHELPER#
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If40d643c104cb54d2690f7fe8bafb3cbec7bf3a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux-meta
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Improve wording and tense in some "page language" strings - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Improve wording and tense in some "page language" strings
..


Improve wording and tense in some "page language" strings

The titles of "action" special pages are normally expressed as actions
("Move page", "Reset password", "Upload file"), and the names of
log types are normally nouns ("Deletion log", "Content model change log").

In any case, "Change language log" and "$1 changed page language for $3"
are not good English.

Log entries also do not end in full stops.

Change-Id: I1d2fed64549ce584418bb3b72d33bf5657c2681f
---
M languages/i18n/en.json
M tests/phpunit/includes/logging/PageLangLogFormatterTest.php
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index b436f90..7742352f 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3850,7 +3850,7 @@
"expand_templates_preview_fail_html": "Because {{SITENAME}} has raw 
HTML enabled and there was a loss of session data, the preview is hidden as a 
precaution against JavaScript attacks.\n\nIf this is a legitimate 
preview attempt, please try again.\nIf it still does not work, try 
[[Special:UserLogout|logging out]] and logging back in.",
"expand_templates_preview_fail_html_anon": "Because {{SITENAME}} 
has raw HTML enabled and you are not logged in, the preview is hidden as a 
precaution against JavaScript attacks.\n\nIf this is a legitimate 
preview attempt, please [[Special:UserLogin|log in]] and try again.",
"expand_templates_input_missing": "You need to provide at least some 
input text.",
-   "pagelanguage": "Page language selector",
+   "pagelanguage": "Change page language",
"pagelang-name": "Page",
"pagelang-language": "Language",
"pagelang-use-default": "Use default language",
@@ -3858,9 +3858,9 @@
"pagelang-submit": "Submit",
"right-pagelang": "Change page language",
"action-pagelang": "change the page language",
-   "log-name-pagelang": "Change language log",
+   "log-name-pagelang": "Language change log",
"log-description-pagelang": "This is a log of changes in page 
languages.",
-   "logentry-pagelang-pagelang": "$1 {{GENDER:$2|changed}} page language 
for $3 from $4 to $5.",
+   "logentry-pagelang-pagelang": "$1 {{GENDER:$2|changed}} the language of 
$3 from $4 to $5",
"default-skin-not-found": "Whoops! The default skin for your wiki, 
defined in $wgDefaultSkin as $1, is not 
available.\n\nYour installation seems to include the following 
{{PLURAL:$4|skin|skins}}. See 
[https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin 
configuration] for information how to enable {{PLURAL:$4|it|them and choose the 
default}}.\n\n$2\n\n; If you have just installed MediaWiki:\n: You probably 
installed from git, or directly from the source code using some other method. 
This is expected. Try installing some skins from 
[https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor 
mediawiki.org].\n:* 
[https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins
 Using Git to download skins].\n: Doing this should not interfere with your git 
repository if you're a MediaWiki developer.\n\n; If you have just upgraded 
MediaWiki:\n: MediaWiki 1.24 and newer no longer automatically enables 
installed skins (see [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery 
Manual: Skin autodiscovery]). You can paste the following 
{{PLURAL:$5|line|lines}} into LocalSettings.php to enable 
{{PLURAL:$5|the|all}} installed {{PLURAL:$5|skin|skins}}:\n\n$3\n\n; If you have just modified 
LocalSettings.php:\n: Double-check the skin names for typos.",
"default-skin-not-found-no-skins": "Whoops! The default skin for your 
wiki, defined in $wgDefaultSkin as $1, is not 
available.\n\nYou have no installed skins.\n\n; If you have just installed or 
upgraded MediaWiki:\n: You probably installed from git, or directly from the 
source code using some other method. This is expected. MediaWiki 1.24 and newer 
doesn't include any skins in the main repository. Try installing some skins 
from [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from 

[MediaWiki-commits] [Gerrit] Resize math dialog input to fit the available space - change (mediawiki...Math)

[jenkins-bot (Code Review)]

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

Change subject: Resize math dialog input to fit the available space
..


Resize math dialog input to fit the available space

Every time the math dialog is resized, calculate the
vertical space available to the input and resize the
input to fill this space.

Bug: T123891
Depends-On: Ia2e094071f385628449f1935f0250cbeb75196f0
Change-Id: I3f3c915469f282a6e0459a7e4d10e19bee68b8db
---
M modules/ve-math/ve.ui.MWMathDialog.js
1 file changed, 27 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve-math/ve.ui.MWMathDialog.js 
b/modules/ve-math/ve.ui.MWMathDialog.js
index d9a87d2..4a3ea23 100644
--- a/modules/ve-math/ve.ui.MWMathDialog.js
+++ b/modules/ve-math/ve.ui.MWMathDialog.js
@@ -44,7 +44,7 @@
 /* static methods */
 
 /**
- * Set the symbols property
+ * Set the symbols property
  *
  * @param {Object} symbols The math symbols and their group names
  */
@@ -101,8 +101,7 @@
 
this.input = new ve.ui.MWAceEditorWidget( {
multiline: true,
-   autosize: true,
-   maxRows: 7,
+   rows: 1, // This will be recalculated later in 
onWindowManagerResize
autocomplete: 'live'
} ).setLanguage( 'latex' );
 
@@ -230,6 +229,8 @@
.next( function () {
// Resize the input once the dialog has been appended
this.input.adjustSize( true ).focus().moveCursorToEnd();
+   this.getManager().connect( this, { resize: 
'onWindowManagerResize' } );
+   this.onWindowManagerResize();
}, this );
 };
 
@@ -242,13 +243,14 @@
this.input.off( 'change', this.onChangeHandler );
this.displaySelect.off( 'choose', this.onChangeHandler 
);
this.idInput.off( 'change', this.onChangeHandler );
+   this.getManager().disconnect( this );
}, this );
 };
 
 /**
  * @inheritdoc
  */
- ve.ui.MWMathDialog.prototype.updateMwData = function ( mwData ) {
+ve.ui.MWMathDialog.prototype.updateMwData = function ( mwData ) {
var display, id;
 
// Parent method
@@ -261,7 +263,7 @@
// Update attributes
mwData.attrs.display = display !== 'default' ? display : undefined;
mwData.attrs.id = id || undefined;
- };
+};
 
 /**
  * @inheritdoc
@@ -271,6 +273,26 @@
 };
 
 /**
+ * Handle the window resize event
+ */
+ve.ui.MWMathDialog.prototype.onWindowManagerResize = function () {
+   var dialog = this;
+   this.input.loadingPromise.done( function () {
+   // Wait for the window resize transition to finish
+   setTimeout( function () {
+   var availableSpace, maxInputHeight, singleLineHeight, 
minRows,
+   border = 1,
+   padding = 3;
+   availableSpace = dialog.menuLayout.$content.height() - 
dialog.input.$element.position().top;
+   singleLineHeight = 19;
+   maxInputHeight = availableSpace - 2 * ( border + 
padding );
+   minRows = Math.floor( maxInputHeight / singleLineHeight 
);
+   dialog.input.setMinRows( minRows );
+   }, 250 );
+   } );
+};
+
+/**
  * Handle the click event on the list
  *
  * @param {jQuery.Event} e Mouse click event

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f3c915469f282a6e0459a7e4d10e19bee68b8db
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] deployment: allow fixing the git remote repository - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: deployment: allow fixing the git remote repository
..

deployment: allow fixing the git remote repository

Change-Id: Ied4bcde607cb1b86f9fed555e2b179daedda858c
---
M modules/deployment/files/modules/deploy.py
1 file changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/266231/1

diff --git a/modules/deployment/files/modules/deploy.py 
b/modules/deployment/files/modules/deploy.py
index b0cfeae..d6a96cc 100644
--- a/modules/deployment/files/modules/deploy.py
+++ b/modules/deployment/files/modules/deploy.py
@@ -770,3 +770,27 @@
 return {'status': status, 'repo': repo, 'dependencies': depstats}
 else:
 return {}
+
+
+def _fix_remote(repo, repo_config, server):
+cmd = '/usr/bin/git remote set-url origin {0}/.git'.format(
+repo_config['url'])
+status = __salt__['cmd.retcode'](cmd, cwd=config['location'])
+if status != 0:
+return status
+
+
+def fixurl(git_server):
+"""
+Allows to recursively fix all the remotes in git repositories on a target.
+"""
+repo_config = __pillar__.get('repo_config')
+deployment_target = __grains__.get('deployment_target')
+for repo in repo_config:
+if repo not in deployment_target:
+continue
+conf = get_config(repo)
+# If it has not been checked out, there is no reason to fix the url
+if not __salt__['file.directory_exists'](conf['location']):
+continue
+_fix_remote(repo, conf, git_server)

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

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

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

[MediaWiki-commits] [Gerrit] ulsfo: add text nodes to mobile cluster - change (operations/puppet)

[Ema (Code Review)]

Ema has submitted this change and it was merged.

Change subject: ulsfo: add text nodes to mobile cluster
..


ulsfo: add text nodes to mobile cluster

This patchset adds all text nodes in ulsfo to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: I0f5ba5287902c73503fb2b41f4a2f07993fbe986
---
M conftool-data/nodes/ulsfo.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 0ccdfd1..13407f8 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -3,6 +3,12 @@
   cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp4008.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4009.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4010.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4016.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4017.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4018.ulsfo.wmnet: [varnish-fe, nginx]
 cache_text:
   cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

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

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

[MediaWiki-commits] [Gerrit] neodymium: add role::deployment::salt_masters - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: neodymium: add role::deployment::salt_masters
..

neodymium: add role::deployment::salt_masters

This should be enabled in general, as it's just pillars configurations.

Change-Id: If91ddd147be32a13af27c29c7fdf99153c8a8da7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/266218/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 9864f0d..c9c2f41 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2118,7 +2118,7 @@
 # secondary salt master
 node 'neodymium.eqiad.wmnet' {
 #role salt::masters::production, deployment::salt_masters, 
debdeploy::master
-role salt::masters::production, debdeploy::master
+role salt::masters::production, debdeploy::master, deployment::salt_masters
 include standard
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] [Task] Expand in other languages box by default - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: [Task] Expand in other languages box by default
..


[Task] Expand in other languages box by default

Bug: T92387
Change-Id: I37aed5d58dc57ce174b145fe3e7c3394d8fa1afa
---
M repo/Wikibase.hooks.php
M view/src/EntityViewPlaceholderExpander.php
2 files changed, 14 insertions(+), 10 deletions(-)

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



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index eeb930d..44840c2 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -356,6 +356,7 @@
'label-message' => 
'wikibase-setting-entitytermsview-showEntitytermslistview',
'help-message' => 
'wikibase-setting-entitytermsview-showEntitytermslistview-help',
'section' => 'rendering/advancedrendering',
+   'default' => '1',
);
} elseif ( $user->getBoolOption( 
'wikibase-entitytermsview-showEntitytermslistview' ) ) {
// Clear setting after uninstalling Babel extension.
diff --git a/view/src/EntityViewPlaceholderExpander.php 
b/view/src/EntityViewPlaceholderExpander.php
index 1c49f1c..dc679ef 100644
--- a/view/src/EntityViewPlaceholderExpander.php
+++ b/view/src/EntityViewPlaceholderExpander.php
@@ -211,16 +211,7 @@
isset( $args[1] ) ? (int)$args[1] : 0
);
case 
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class':
-   return
-   !$this->user->isAnon()
-   && $this->user->getBoolOption(
-   
'wikibase-entitytermsview-showEntitytermslistview'
-   )
-   || $this->user->isAnon()
-   && isset( 
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] )
-   && 
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] === 'true'
-   ? '' : 'wikibase-initially-collapsed';
-
+   return $this->isInitiallyCollapsed() ? 
'wikibase-initially-collapsed' : '';
default:
wfWarn( "Unknown placeholder: $name" );
return '(((' . htmlspecialchars( $name ) . 
')))';
@@ -228,6 +219,18 @@
}
 
/**
+* @return bool If the terms list should be initially collapsed for the 
current user.
+*/
+private function isInitiallyCollapsed() {
+   if ( $this->user->isAnon() ) {
+   return isset( 
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] )
+   && 
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] === 'false';
+   } else {
+   return !$this->user->getBoolOption( 
'wikibase-entitytermsview-showEntitytermslistview' );
+   }
+}
+
+   /**
 * Generates HTML of the term box, to be injected into the entity page.
 *
 * @param EntityId $entityId

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37aed5d58dc57ce174b145fe3e7c3394d8fa1afa
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Adrian Lang 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Replace pc1001 with pc1004, new pooled parsercache - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Replace pc1001 with pc1004, new pooled parsercache
..

Replace pc1001 with pc1004, new pooled parsercache

Bug: T121888
Change-Id: I60a714a2eb20d2fa2b8f5f71e7c92b4de9a645e9
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1d57a9f..c9d83e2 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -8,7 +8,7 @@
 #$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, 
please try again soon.";
 
 $wmgParserCacheDBs = array(
-#  '10.64.16.156',  # pc1001 under maintenance
+   '10.64.0.12',# pc1004
'10.64.16.157',  # pc1002
'10.64.16.158',  # pc1003
 );

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

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

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

[MediaWiki-commits] [Gerrit] Dialog: Don't set overflow:hidden; on .oo-ui-window-body ele... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Dialog: Don't set overflow:hidden; on .oo-ui-window-body 
elements
..


Dialog: Don't set overflow:hidden; on .oo-ui-window-body elements

Set overflow:auto; instead.

Bug: T123775
Change-Id: I214c2f3b07f99d2fc923d4da4984b39717776857
---
M src/styles/Dialog.less
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/styles/Dialog.less b/src/styles/Dialog.less
index c550fc2..253d058 100644
--- a/src/styles/Dialog.less
+++ b/src/styles/Dialog.less
@@ -9,22 +9,24 @@
position: absolute;
left: 0;
right: 0;
-   overflow: hidden;
.oo-ui-box-sizing( border-box );
}
 
&-head {
+   overflow: hidden;
z-index: 1;
top: 0;
}
 
&-body {
+   overflow: auto;
z-index: 2;
top: 0;
bottom: 0;
}
 
&-foot {
+   overflow: hidden;
z-index: 1;
bottom: 0;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I214c2f3b07f99d2fc923d4da4984b39717776857
Gerrit-PatchSet: 6
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix syntax - change (operations...linux-meta)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Fix syntax
..

Fix syntax

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux-meta 
refs/changes/29/266229/1

diff --git a/debian/control b/debian/control
index e5a3393..732b4a6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@
 
 Package: linux-meta
 Architecture: any
-Depends: linux-image-3.19.0-2-amd64 [amd64] (>= 3.19.3-10), initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
+Depends: linux-image-3.19.0-2-amd64 (>= 3.19.3-10) [amd64], initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
 Description: Meta package for kernel images
  This package depends on the latest Linux kernel used in the WMF environment.
  It can also serve to depend on firmware packages not part of the stock Linux

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53df81ceb0c069b06b813dacd46958e2ac5c770f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux-meta
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Fix cross-wiki upload script - change (analytics/limn-multimedia-data)

[MarkTraceur (Code Review)]

MarkTraceur has uploaded a new change for review.

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

Change subject: Fix cross-wiki upload script
..

Fix cross-wiki upload script

The recentchanges table only goes back 30 days, which is why we didn't
have any useful historical data. MatmaRex set me straight, and pointed
me to the change_tag table, which is less stupid than tag_summary.

Change-Id: Ic6fe5ef178094c934621b84c498e120b08918bfb
---
M multimedia/cross-wiki-uploads.sql
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-multimedia-data 
refs/changes/24/266224/1

diff --git a/multimedia/cross-wiki-uploads.sql 
b/multimedia/cross-wiki-uploads.sql
index e30ce96..9fc49dd 100644
--- a/multimedia/cross-wiki-uploads.sql
+++ b/multimedia/cross-wiki-uploads.sql
@@ -1,8 +1,9 @@
 select date('{from_timestamp}') as date,
count(*) as {wiki_db}
-   from {wiki_db}.tag_summary
-   join {wiki_db}.recentchanges on
-   ts_rc_id = rc_id
-   where ts_tags="cross-wiki-upload" and
-   rc_timestamp >= '{from_timestamp}' and
-   rc_timestamp < '{to_timestamp}';
+   from {wiki_db}.change_tag
+   join {wiki_db}.logging on
+   ct_log_id = log_id
+   where ct_tag = "cross-wiki-upload" and
+   log_type = "upload" and
+   log_timestamp >= '{from_timestamp}' and
+   log_timestamp < '{to_timestamp}';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6fe5ef178094c934621b84c498e120b08918bfb
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-multimedia-data
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] MediaWiki theme: Add invert variant to 'accessibility' icon ... - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: MediaWiki theme: Add invert variant to 'accessibility' icon 
pack icons
..

MediaWiki theme: Add invert variant to 'accessibility' icon pack icons

Follow-up to 0f239114458a4f27f13121828412bd71ae2e29ee
and 6c85704931ca18190dd6690f6061587ab14111bc.

Change-Id: I21284de7629917ce16fe0d0a218acde402ac9549
---
M src/themes/mediawiki/icons-accessibility.json
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/32/266232/1

diff --git a/src/themes/mediawiki/icons-accessibility.json 
b/src/themes/mediawiki/icons-accessibility.json
index ee1d0a5..ef539bd 100644
--- a/src/themes/mediawiki/icons-accessibility.json
+++ b/src/themes/mediawiki/icons-accessibility.json
@@ -1,6 +1,12 @@
 {
"prefix": "oo-ui-icon",
"intro": "@import '../../../../src/styles/common';",
+   "variants": {
+   "invert": {
+   "color": "#FF",
+   "global": true
+   }
+   },
"images": {
"bright": { "file": "images/icons/bright.svg" },
"halfBright": { "file": "images/icons/halfBright.svg" },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21284de7629917ce16fe0d0a218acde402ac9549
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] move git-deploy to neodymium (primary salt master) - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: move git-deploy to neodymium (primary salt master)
..


move git-deploy to neodymium (primary salt master)

Change-Id: Idc3a51d753978725118c8cbf11f1337c7f60b67c
---
M manifests/site.pp
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 9864f0d..932b4ab 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2117,8 +2117,7 @@
 
 # secondary salt master
 node 'neodymium.eqiad.wmnet' {
-#role salt::masters::production, deployment::salt_masters, 
debdeploy::master
-role salt::masters::production, debdeploy::master
+role salt::masters::production, deployment::salt_masters, debdeploy::master
 include standard
 }
 
@@ -2191,7 +2190,7 @@
 
 # primary puppet master
 node 'palladium.eqiad.wmnet' {
-role ipmi, salt::masters::production, deployment::salt_masters, 
access_new_install, puppetmaster::frontend, pybal_config, debdeploy::master
+role ipmi, salt::masters::production, access_new_install, 
puppetmaster::frontend, pybal_config, debdeploy::master
 include standard
 include role::conftool::master
 }

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

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

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

[MediaWiki-commits] [Gerrit] Remove debdeploy::master from palladium - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Remove debdeploy::master from palladium
..

Remove debdeploy::master from palladium

Now running on neodymium

Change-Id: I0865185b545e33fbf2a54438df0f2eb78a60f91d
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/266219/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 932b4ab..a974357 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2190,7 +2190,7 @@
 
 # primary puppet master
 node 'palladium.eqiad.wmnet' {
-role ipmi, salt::masters::production, access_new_install, 
puppetmaster::frontend, pybal_config, debdeploy::master
+role ipmi, salt::masters::production, access_new_install, 
puppetmaster::frontend, pybal_config
 include standard
 include role::conftool::master
 }

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

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

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

[MediaWiki-commits] [Gerrit] Remove multiple unused messages and make some grepable - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Remove multiple unused messages and make some grepable
..

Remove multiple unused messages and make some grepable

Change-Id: Ib18160290cab7c311c93900fb659337c2ec879f2
---
M Translate.php
M TranslateHooks.php
M i18n/core/en.json
M i18n/pagetranslation/en.json
M i18n/search/en.json
M specials/SpecialManageGroups.php
M specials/SpecialPageMigration.php
M specials/SpecialSupportedLanguages.php
M specials/SpecialTranslations.php
M tag/PageTranslationLogFormatter.php
M utils/TranslateSandbox.php
M utils/UserToggles.php
12 files changed, 44 insertions(+), 11 deletions(-)


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

diff --git a/Translate.php b/Translate.php
index 3d4f559..111ab65 100644
--- a/Translate.php
+++ b/Translate.php
@@ -182,21 +182,32 @@
 $wgHooks['DeleteAccount'][] = 'TranslateHooks::onDeleteAccount';
 
 // New rights
+// right-translate
 $wgAvailableRights[] = 'translate';
+// right-translate-import action-translate-import
 $wgAvailableRights[] = 'translate-import';
+// right-translate-manage action-translate-manage
 $wgAvailableRights[] = 'translate-manage';
+// right-translate-messagereview
 $wgAvailableRights[] = 'translate-messagereview';
+// right-translate-groupreview
 $wgAvailableRights[] = 'translate-groupreview';
+// right-translate-sandboxmanage action-translate-sandboxmanage
 $wgAvailableRights[] = 'translate-sandboxmanage';
 
 // Logs. More logs are defined in TranslateHooks::setupTranslate
+// log-name-translationreview log-descriptionmsg-translationreview
 $wgLogTypes[] = 'translationreview';
+// logentry-translationreview-message logentry-translationreview-group
 $wgLogActionsHandlers['translationreview/message'] = 'TranslateLogFormatter';
 $wgLogActionsHandlers['translationreview/group'] = 'TranslateLogFormatter';
 
+// log-name-translatorsandbox log-description-translatorsandbox
 $wgLogTypes[] = 'translatorsandbox';
+// logentry-translatorsandbox-promoted logentry-translatorsandbox-rejected
 $wgLogActionsHandlers['translatorsandbox/promoted'] = 'TranslateLogFormatter';
 $wgLogActionsHandlers['translatorsandbox/rejected'] = 'TranslateLogFormatter';
+// logentry-newusers-tsbpromoted
 $wgLogActionsHandlers['newusers/tsbpromoted'] = 'LogFormatter';
 
 // New jobs
diff --git a/TranslateHooks.php b/TranslateHooks.php
index fcc671a..a2d1a6c 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -68,12 +68,21 @@
$wgSpecialPages['PageTranslation'] = 
'SpecialPageTranslation';
$wgSpecialPages['PageTranslationDeletePage'] = 
'SpecialPageTranslationDeletePage';
 
+   // right-pagetranslation action-pagetranslation
$wgAvailableRights[] = 'pagetranslation';
 
$wgSpecialPages['PageMigration'] = 
'SpecialPageMigration';
$wgSpecialPages['PagePreparation'] = 
'SpecialPagePreparation';
 
global $wgLogActionsHandlers, $wgLogTypes;
+
+   // log-description-pagetranslation 
log-name-pagetranslation logentry-pagetranslation-mark
+   // logentry-pagetranslation-unmark 
logentry-pagetranslation-moveok
+   // logentry-pagetranslation-movenok 
logentry-pagetranslation-deletefok
+   // logentry-pagetranslation-deletefnok 
logentry-pagetranslation-deletelok
+   // logentry-pagetranslation-deletelnok 
logentry-pagetranslation-encourage
+   // logentry-pagetranslation-discourage 
logentry-pagetranslation-prioritylanguages
+   // logentry-pagetranslation-associate 
logentry-pagetranslation-dissociate
$wgLogTypes[] = 'pagetranslation';
$wgLogActionsHandlers['pagetranslation/mark'] = 
'PageTranslationLogFormatter';
$wgLogActionsHandlers['pagetranslation/unmark'] = 
'PageTranslationLogFormatter';
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 75f0b4e..2b67253 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -36,7 +36,6 @@
"translate-page-navigation-legend": "Navigation",
"translate-page-showing": "Showing messages from $1 to $2 of $3.",
"translate-page-showing-all": "Showing $1 
{{PLURAL:$1|message|messages}}.",
-   "translate-page-showing-none": "No messages to show.",
"translate-page-paging-links": "[ $1 ] [ $2 ]",
"translate-next": "Next page",
"translate-prev": "Previous page",
@@ -270,8 +269,6 @@
"translate-messagereview-no-fuzzy": "Fuzzy translations cannot be 
marked as reviewed.",
"translate-messagereview-no-own": "You cannot mark your own 
translations as reviewed.",
"translate-messagereview-doit": "Mark this 

[MediaWiki-commits] [Gerrit] Replace deprecated jQuery event aliases - change (mediawiki...FlaggedRevs)

[jenkins-bot (Code Review)]

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

Change subject: Replace deprecated jQuery event aliases
..


Replace deprecated jQuery event aliases

In jQuery 3.0 the deprecated event aliases .load, .unload and .error get 
removed.
They are deprecated since jQuery 1.8:
* https://api.jquery.com/load-event/
* https://api.jquery.com/unload/
* https://api.jquery.com/error/

See major changes of jQuery 3.0 beta:
* https://blog.jquery.com/2016/01/14/jquery-3-0-beta-released/

Change-Id: I38cfb1e887daf437809ace8afe9630b43b5433df
---
M frontend/modules/ext.flaggedRevs.review.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/frontend/modules/ext.flaggedRevs.review.js 
b/frontend/modules/ext.flaggedRevs.review.js
index 51693b7..f379401 100644
--- a/frontend/modules/ext.flaggedRevs.review.js
+++ b/frontend/modules/ext.flaggedRevs.review.js
@@ -40,7 +40,7 @@
fr.enableAjaxReviewActivity();
// "De-advertise" user as "no longer reviewing" on navigate-away
/*global window*/
-   $( window ).unload( function () {
+   $( window ).on( 'unload', function () {
if ( fr.isUserReviewing === 1 ) {
fr.deadvertiseReviewing();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38cfb1e887daf437809ace8afe9630b43b5433df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] BSUserMiniProfile: Replaced spaces in HTML output - change (mediawiki...BlueSpiceFoundation)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: BSUserMiniProfile: Replaced spaces in HTML output
..


BSUserMiniProfile: Replaced spaces in HTML output

* Parser replaces spaces with pre tags

Patch Set 2: bypass jenkins tests

Change-Id: I240697f0a4b76ed9c5e1aa1d64d08bb0dfaf1a3a
---
M includes/outputhandler/views/view.UserMiniProfile.php
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  Mglaser: Looks good to me, approved



diff --git a/includes/outputhandler/views/view.UserMiniProfile.php 
b/includes/outputhandler/views/view.UserMiniProfile.php
index e0c81c5..63be596 100644
--- a/includes/outputhandler/views/view.UserMiniProfile.php
+++ b/includes/outputhandler/views/view.UserMiniProfile.php
@@ -29,15 +29,15 @@
 
$aOut = array();
$aOut[] = '';
-   $aOut[] = empty( $this->mOptions['linktargethref'] ) ? '' :' ';
-   $aOut[] = '  mOptions['userimagesrc'].'"';
-   $aOut[] = '   width="'.$this->mOptions['width'].'"';
+   $aOut[] = empty( $this->mOptions['linktargethref'] ) ? '' :'';
+   $aOut[] =   'mOptions['userimagesrc'].'"';
+   $aOut[] ='width="'.$this->mOptions['width'].'"';
if ( BsConfig::get( 'MW::MiniProfileEnforceHeight' ) ) {
-   $aOut[] = '   
height="'.$this->mOptions['height'].'"';
+   $aOut[] =
'height="'.$this->mOptions['height'].'"';
}
-   $aOut[] = '  />';
-   $aOut[] = empty( $this->mOptions['linktargethref'] ) ? 
'' :' ';
+   $aOut[] =   '/>';
+   $aOut[] = empty( $this->mOptions['linktargethref'] ) ? 
'' : '';
$aOut[] = '';
 
$sOut = implode( "\n", $aOut );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I240697f0a4b76ed9c5e1aa1d64d08bb0dfaf1a3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Tighten dependency - change (operations...linux-meta)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Tighten dependency
..


Tighten dependency

Also commit some changes which we previously only on copper.

Change-Id: If40d643c104cb54d2690f7fe8bafb3cbec7bf3a9
---
M debian/changelog
M debian/control
M debian/linux-meta.postinst
3 files changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index fc26492..3a9bcba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+linux-meta (1.6) jessie-wikimedia; urgency=medium
+
+  * Tighten dependency for latest 3.19 update
+
+ -- Moritz Muehlenhoff   Mon, 25 Jan 2016 14:42:42 +0100
+
+linux-meta (1.5) jessie-wikimedia; urgency=medium
+
+  * Fix execution of update-grub
+
+ -- Moritz Muehlenhoff   Tue, 19 Jan 2016 20:01:51 +
+
+linux-meta (1.4) jessie-wikimedia; urgency=medium
+
+  * Bump for 3.19.3-10
+
+ -- Moritz Muehlenhoff   Tue, 19 Jan 2016 20:49:37 
+0100
+
 linux-meta (1.3) jessie-wikimedia; urgency=medium
 
   * Bump to kernel ABI 3.19.0-2 / version 3.19.3-9
diff --git a/debian/control b/debian/control
index 876dbdd..e5a3393 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@
 
 Package: linux-meta
 Architecture: any
-Depends: linux-image-3.19.0-2-amd64 [amd64], initramfs-tools, grub2-common, 
firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
+Depends: linux-image-3.19.0-2-amd64 [amd64] (>= 3.19.3-10), initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
 Description: Meta package for kernel images
  This package depends on the latest Linux kernel used in the WMF environment.
  It can also serve to depend on firmware packages not part of the stock Linux
diff --git a/debian/linux-meta.postinst b/debian/linux-meta.postinst
index 89a6fdd..506bc94 100644
--- a/debian/linux-meta.postinst
+++ b/debian/linux-meta.postinst
@@ -6,8 +6,8 @@
 
 if [ ! -e /boot/initrd.img-$KVERSION ] ; then
 update-initramfs -c -k $KVERSION
-update-grub
 fi
+update-grub
 
 #DEBHELPER#
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If40d643c104cb54d2690f7fe8bafb3cbec7bf3a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux-meta
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] MediaWiki theme: Make icon variants actually work for all icons - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: MediaWiki theme: Make icon variants actually work for all icons
..

MediaWiki theme: Make icon variants actually work for all icons

Follow-up to 0f239114458a4f27f13121828412bd71ae2e29ee. The simple
"prefix" configuration only works if there are no variants.

Bug: T124658
Change-Id: If2e4b788738ad3e8715a8a744781378920cd84cb
---
M src/themes/mediawiki/icons-accessibility.json
M src/themes/mediawiki/icons-alerts.json
M src/themes/mediawiki/icons-content.json
M src/themes/mediawiki/icons-editing-advanced.json
M src/themes/mediawiki/icons-editing-core.json
M src/themes/mediawiki/icons-editing-list.json
M src/themes/mediawiki/icons-editing-styling.json
M src/themes/mediawiki/icons-interactions.json
M src/themes/mediawiki/icons-layout.json
M src/themes/mediawiki/icons-location.json
M src/themes/mediawiki/icons-media.json
M src/themes/mediawiki/icons-moderation.json
M src/themes/mediawiki/icons-movement.json
M src/themes/mediawiki/icons-user.json
M src/themes/mediawiki/icons-wikimedia.json
15 files changed, 30 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/33/266233/1

diff --git a/src/themes/mediawiki/icons-accessibility.json 
b/src/themes/mediawiki/icons-accessibility.json
index ef539bd..c855f16 100644
--- a/src/themes/mediawiki/icons-accessibility.json
+++ b/src/themes/mediawiki/icons-accessibility.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-alerts.json 
b/src/themes/mediawiki/icons-alerts.json
index 701166a..04c5299 100644
--- a/src/themes/mediawiki/icons-alerts.json
+++ b/src/themes/mediawiki/icons-alerts.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-content.json 
b/src/themes/mediawiki/icons-content.json
index 73af2f1..f5b6693 100644
--- a/src/themes/mediawiki/icons-content.json
+++ b/src/themes/mediawiki/icons-content.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-advanced.json 
b/src/themes/mediawiki/icons-editing-advanced.json
index 27e3b0e..dbb3411 100644
--- a/src/themes/mediawiki/icons-editing-advanced.json
+++ b/src/themes/mediawiki/icons-editing-advanced.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-core.json 
b/src/themes/mediawiki/icons-editing-core.json
index 3bacb60..2a383df 100644
--- a/src/themes/mediawiki/icons-editing-core.json
+++ b/src/themes/mediawiki/icons-editing-core.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-list.json 
b/src/themes/mediawiki/icons-editing-list.json
index cfd4abc..a8ace26 100644
--- a/src/themes/mediawiki/icons-editing-list.json
+++ b/src/themes/mediawiki/icons-editing-list.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-styling.json 
b/src/themes/mediawiki/icons-editing-styling.json
index e070154..f7d63a1 100644
--- a/src/themes/mediawiki/icons-editing-styling.json
+++ b/src/themes/mediawiki/icons-editing-styling.json
@@ -1,5 +1,6 @@
 {
-   "prefix": "oo-ui-icon",
+   "selectorWithoutVariant": ".oo-ui-icon-{name}",
+   "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
 

[MediaWiki-commits] [Gerrit] Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc
..

Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/266217/1

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index f566518..50d40a6 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -292,6 +292,8 @@
 * ParserOutput::getSecondaryDataUpdates() was removed (deprecated since 1.25).
 * Gallery images with multiple caption pipes no longer concatenate them all
   together but instead pick the final one, similar to image syntax.
+* XML-like parser tags (such as ), when unclosed, will be left 
unparsed
+  rather than consume everything until the end of the page.
 
 == Compatibility ==
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23199a7e8c67e93e4313f80b2c2b2ba074d52b86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Fix syntax - change (operations...linux-meta)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Fix syntax
..


Fix syntax

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

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



diff --git a/debian/control b/debian/control
index e5a3393..732b4a6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@
 
 Package: linux-meta
 Architecture: any
-Depends: linux-image-3.19.0-2-amd64 [amd64] (>= 3.19.3-10), initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
+Depends: linux-image-3.19.0-2-amd64 (>= 3.19.3-10) [amd64], initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
 Description: Meta package for kernel images
  This package depends on the latest Linux kernel used in the WMF environment.
  It can also serve to depend on firmware packages not part of the stock Linux

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53df81ceb0c069b06b813dacd46958e2ac5c770f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux-meta
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] ulsfo: add text nodes to mobile cluster - change (operations/puppet)

[Ema (Code Review)]

Ema has uploaded a new change for review.

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

Change subject: ulsfo: add text nodes to mobile cluster
..

ulsfo: add text nodes to mobile cluster

This patchset adds all text nodes in ulsfo to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: I0f5ba5287902c73503fb2b41f4a2f07993fbe986
---
M conftool-data/nodes/ulsfo.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/266230/1

diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 0ccdfd1..13407f8 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -3,6 +3,12 @@
   cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp4008.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4009.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4010.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4016.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4017.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4018.ulsfo.wmnet: [varnish-fe, nginx]
 cache_text:
   cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

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

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

[MediaWiki-commits] [Gerrit] Add default styling to error pages - change (labs/toollabs)

[Tim Landscheidt (Code Review)]

Tim Landscheidt has submitted this change and it was merged.

Change subject: Add default styling to error pages
..


Add default styling to error pages

Add css and markup to error pages that matches the index page styling.

Change-Id: I542c760aff40d9995ff81618a9e03396f71ce8c4
---
M www/content/403.php
M www/content/404.php
M www/content/500.php
M www/content/503.php
M www/index.php
5 files changed, 77 insertions(+), 7 deletions(-)

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



diff --git a/www/content/403.php b/www/content/403.php
index 1961072..8b44a6e 100644
--- a/www/content/403.php
+++ b/www/content/403.php
@@ -4,8 +4,11 @@
 
 403 Forbidden
 
+
 
 
+
+
 Perhaps the webserver has temporarily lost its mind, or the link you've 
followed doesn't actually lead somewhere useful?
 If you're pretty sure this shouldn't be an error, you may wish to notify 
the project administrators about the error and how 
you ended up here.
 
+
+
+
+
+Tools
+Status
+Privacy policy
+
+Maintainers:
+
+Help
+Rules
+
+
+
 
 
diff --git a/www/content/404.php b/www/content/404.php
index 5f778b1..3e553bf 100644
--- a/www/content/404.php
+++ b/www/content/404.php
@@ -4,8 +4,11 @@
 
 404 Not Found
 
+
 
 
+
+
 Perhaps the webserver has temporarily lost its mind, or the link you've 
followed doesn't actually lead somewhere useful?
 You might want to looks at the list of tools to find 
what you were looking for, or one of the links on the sidebar to the left. If 
you're pretty sure this shouldn't be an error, you may wish to notify the project administrators about the error and how you 
ended up here.
 
+
+
+
+
+Tools
+Status
+Privacy policy
+
+Maintainers:
+
+Help
+Rules
+
+
+
 
 
diff --git a/www/content/500.php b/www/content/500.php
index 9e5c5b5..8b2dbcd 100644
--- a/www/content/500.php
+++ b/www/content/500.php
@@ -4,8 +4,11 @@
 
 500 Internal Server Error
 
+
 
 
+
+
 Perhaps the webserver has temporarily lost its mind, or the link you've 
followed doesn't actually lead somewhere useful?
 If you're pretty sure this shouldn't be an error, you may wish to notify 
the project administrators about the error and how 
you ended up here.
 
+
+
+
+
+Tools
+Status
+Privacy policy
+
+Maintainers:
+
+Help
+Rules
+
+
+
 
 
diff --git a/www/content/503.php b/www/content/503.php
index 86b70b6..08b63df 100644
--- a/www/content/503.php
+++ b/www/content/503.php
@@ -4,8 +4,11 @@
 
 503 Service Unavailable
 
+
 
 
+
+
 This URI is not currently part of any tool.
 If you're pretty sure this shouldn't be an error, you may wish to notify 
the project administrators about the error and how 
you ended up here.
 
+
+
+
+
+Tools
+Status
+Privacy policy
+
+Maintainers:
+
+Help
+Rules
+
+
+
 
 
diff --git a/www/index.php b/www/index.php
index 77b77cf..20409f8 100644
--- a/www/index.php
+++ b/www/index.php
@@ -124,11 +124,10 @@
 
 
 
-
-
-
-
-
+
+
+
+
 
 
 
@@ -142,7 +141,6 @@
 Rules
 
 
-
-
+
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I542c760aff40d9995ff81618a9e03396f71ce8c4
Gerrit-PatchSet: 2
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stop setting the form data to rawBody - change (mediawiki...cxserver)

[jenkins-bot (Code Review)]

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

Change subject: Stop setting the form data to rawBody
..


Stop setting the form data to rawBody

This was a hack to continue support Content Translation extension setting
the data to translate directly to form data.

That was changed in I32d27fb4c9e8c55948

Change-Id: Id80baf1581af38f5c157b21dd1f5cb63e173c831
---
M app.js
1 file changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/app.js b/app.js
index ebf1070..d9d2594 100644
--- a/app.js
+++ b/app.js
@@ -113,13 +113,7 @@
} ) );
// use the application/x-www-form-urlencoded parser
app.use( bodyParser.urlencoded( {
-   extended: true,
-   verify: function ( req, res, buf ) {
-   // Get the formdata buffer to rawBody.
-   // TODO: This is a hack. Remove this after CX MT tool 
start sending html
-   // in formdata than the whole html as form data.
-   req.rawBody = buf.toString();
-   }
+   extended: true
} ) );
// use the JSON body parser
app.use( bodyParser.json( {

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

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

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

[MediaWiki-commits] [Gerrit] Don't call log-command-invocation when testing jsub - change (labs/toollabs)

[Tim Landscheidt (Code Review)]

Tim Landscheidt has submitted this change and it was merged.

Change subject: Don't call log-command-invocation when testing jsub
..


Don't call log-command-invocation when testing jsub

Detect when jsub is being run under a test harness and skip calls to
log-command-invocation which is not provided by this package.

Bug: T124618
Change-Id: Ie5a4997c420741ce3ade3bfdbe51c54e92985093
---
M debian/changelog
M jobutils/bin/jsub
2 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index 171ba64..06f1bd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.9~dev) unstable; urgency=medium
+
+  * Don't call log-command-invocation when testing jsub. [Bryan Davis]
+
+ -- Tim Landscheidt   Mon, 25 Jan 2016 14:24:33 +
+
 toollabs (1.8.1) unstable; urgency=medium
 
   * Stop logging for `job` - too much noise
diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index 9102db2..317c2ed 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -23,7 +23,7 @@
 
 # Log this command invocation to EventLogging
 my $full_commandline = join " ", $0, @ARGV;
-system('/usr/local/bin/log-command-invocation', 'jsub', $full_commandline);
+system('/usr/local/bin/log-command-invocation', 'jsub', $full_commandline) 
unless (exists ($ENV {'JOBUTILS_QSUB'}));
 
 my %qsubargs = (
'-a' => 1, '-b' => 1, '-cwd' => 0, '-e' => 1, '-hard' => 0, '-i' => 1, 
'-j' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5a4997c420741ce3ade3bfdbe51c54e92985093
Gerrit-PatchSet: 3
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ExtJS Runtime errors due to missing/late css - change (mediawiki...BlueSpiceFoundation)

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review.

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

Change subject: ExtJS Runtime errors due to missing/late css
..

ExtJS Runtime errors due to missing/late css

Wait for the CSS dependencies to be loaded or ExtJS wont have important 
dimensions for calculating. mw.loader ignores CSS dependencies.
* See: https://phabricator.wikimedia.org/T63852

PachSet 2:
* Overriding jenkins "API help message" tests which will be part of a later 
commit

Change-Id: I9b5191e53f1204df47899fb00a9b93dcf284bd0a
(cherry picked from commit 94fc5b5949d3f3b777c9b9017048cc307b435906)
---
M resources/bluespice.extjs/bluespice.extjs.fixes.css
M resources/bluespice.extjs/bluespice.extjs.js
2 files changed, 32 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/26/266226/1

diff --git a/resources/bluespice.extjs/bluespice.extjs.fixes.css 
b/resources/bluespice.extjs/bluespice.extjs.fixes.css
index f69f67c..6c06004 100644
--- a/resources/bluespice.extjs/bluespice.extjs.fixes.css
+++ b/resources/bluespice.extjs/bluespice.extjs.fixes.css
@@ -100,4 +100,7 @@
 
 .x-boundlist-item {
font-size: 13px;
+}
+.bs-extjs-cssisready {
+   display: inline;
 }
\ No newline at end of file
diff --git a/resources/bluespice.extjs/bluespice.extjs.js 
b/resources/bluespice.extjs/bluespice.extjs.js
index 2ba4bbe..643be88 100755
--- a/resources/bluespice.extjs/bluespice.extjs.js
+++ b/resources/bluespice.extjs/bluespice.extjs.js
@@ -113,6 +113,34 @@
};
 
bs.extjs = extjs;
-   $(d).trigger( 'BSExtJSReady', [ bs.extjs ] );
+
+   //Wait for the CSS dependencies to be loaded or ExtJS wont have 
important
+   //dimensions for calculating. mw.loader ignores CSS dependencies. See:
+   //https://phabricator.wikimedia.org/T63852
+   mw.loader.state( 'ext.bluespice.extjs', 'loading' );
+
+   var deferred = $.Deferred();
+   $.when( deferred ).then( function () {
+   //CSS is loaded, ExtJS is ready
+   mw.loader.state( 'ext.bluespice.extjs', 'ready' );
+   $(d).trigger( 'BSExtJSReady', [ bs.extjs ] );
+   });
+
+   var bsextjsisCSSReady = function( deferred ) {
+   var $dummy = $( '' )
+   .appendTo( $( document.body ) );
+   //bluespice.extjs.fixes.css:bs-extjs-cssisready
+   if ( $dummy.css( 'display' ) === 'inline' ) {
+   $dummy.remove();
+   deferred.resolve();
+   return;
+   }
+   $dummy.remove();
+   setTimeout( function () {
+   bsextjsisCSSReady( deferred );
+   }, 100 );
+   };
+
+   bsextjsisCSSReady( deferred );
 
 }( mediaWiki, blueSpice, jQuery, document ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b5191e53f1204df47899fb00a9b93dcf284bd0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Pwirth 

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

[MediaWiki-commits] [Gerrit] Replace pc1001 with pc1004, new pooled parsercache - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Replace pc1001 with pc1004, new pooled parsercache
..


Replace pc1001 with pc1004, new pooled parsercache

Bug: T121888
Change-Id: I60a714a2eb20d2fa2b8f5f71e7c92b4de9a645e9
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1d57a9f..c875451 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -8,9 +8,9 @@
 #$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, 
please try again soon.";
 
 $wmgParserCacheDBs = array(
-#  '10.64.16.156',  # pc1001 under maintenance
-   '10.64.16.157',  # pc1002
-   '10.64.16.158',  # pc1003
+   '10.64.0.12',   # pc1004
+   '10.64.16.157', # pc1002
+   '10.64.16.158', # pc1003
 );
 
 $wmgOldExtTemplate = array(

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

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

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

[MediaWiki-commits] [Gerrit] Replace deprecated jQuery event aliases - change (mediawiki...FlaggedRevs)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Replace deprecated jQuery event aliases
..

Replace deprecated jQuery event aliases

In jQuery 3.0 the deprecated event aliases .load, .unload and .error get 
removed.
They are deprecated since jQuery 1.8:
* https://api.jquery.com/load-event/
* https://api.jquery.com/unload/
* https://api.jquery.com/error/

See major changes of jQuery 3.0 beta:
* https://blog.jquery.com/2016/01/14/jquery-3-0-beta-released/

Change-Id: I38cfb1e887daf437809ace8afe9630b43b5433df
---
M frontend/modules/ext.flaggedRevs.review.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/22/266222/1

diff --git a/frontend/modules/ext.flaggedRevs.review.js 
b/frontend/modules/ext.flaggedRevs.review.js
index 51693b7..f379401 100644
--- a/frontend/modules/ext.flaggedRevs.review.js
+++ b/frontend/modules/ext.flaggedRevs.review.js
@@ -40,7 +40,7 @@
fr.enableAjaxReviewActivity();
// "De-advertise" user as "no longer reviewing" on navigate-away
/*global window*/
-   $( window ).unload( function () {
+   $( window ).on( 'unload', function () {
if ( fr.isUserReviewing === 1 ) {
fr.deadvertiseReviewing();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38cfb1e887daf437809ace8afe9630b43b5433df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] MLEB 2016.01 - change (translatewiki)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: MLEB 2016.01
..

MLEB 2016.01

* All extensions at: master

Change-Id: I82f233a1a896fcfa3de46d67a080bcb5abe3c757
---
M melange/config.ini
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/23/266223/1

diff --git a/melange/config.ini b/melange/config.ini
index 1445ebd..80e40c4 100644
--- a/melange/config.ini
+++ b/melange/config.ini
@@ -2,8 +2,8 @@
 mediawikirepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/core.git
 extensionrepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/extensions/
 branches=origin/master origin/REL1_21 origin/REL1_20
-releasever=2015.10
-releasever-prev=2015.08
+releasever=2016.01
+releasever-prev=2015.10
 bundlename=MediaWiki language extension bundle
 downloadurl=https://translatewiki.net/mleb
 hasher=sha256sum

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82f233a1a896fcfa3de46d67a080bcb5abe3c757
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Remove getCustomPrinter from ULS extension - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Remove getCustomPrinter from ULS extension
..


Remove getCustomPrinter from ULS extension

Bug: T91457
Change-Id: I0cff2c687a40a4af3b0202255f59f4f37ea41788
---
M api/ApiLanguageSearch.php
M resources/js/ext.uls.mediawiki.js
2 files changed, 1 insertion(+), 5 deletions(-)

Approvals:
  Nikerabbit: Checked; Looks good to me, approved
  Florianschmidtwelzow: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/api/ApiLanguageSearch.php b/api/ApiLanguageSearch.php
index d1c4c97..d77aa26 100644
--- a/api/ApiLanguageSearch.php
+++ b/api/ApiLanguageSearch.php
@@ -23,10 +23,6 @@
  */
 class ApiLanguageSearch extends ApiBase {
 
-   public function getCustomPrinter() {
-   return $this->getMain()->createPrinterByName( 'json' );
-   }
-
public function execute() {
$params = $this->extractRequestParams();
$search = $params['search'];
diff --git a/resources/js/ext.uls.mediawiki.js 
b/resources/js/ext.uls.mediawiki.js
index 3bc0eea..4531041 100644
--- a/resources/js/ext.uls.mediawiki.js
+++ b/resources/js/ext.uls.mediawiki.js
@@ -22,7 +22,7 @@
// MediaWiki overrides for ULS defaults
$.fn.uls.defaults = $.extend( $.fn.uls.defaults, {
languages: mw.config.get( 'wgULSLanguages' ) || {},
-   searchAPI: mw.util.wikiScript( 'api' ) + 
'?action=languagesearch'
+   searchAPI: mw.util.wikiScript( 'api' ) + 
'?action=languagesearch=json'
} );
 
// No need of IME in the ULS language search bar

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cff2c687a40a4af3b0202255f59f4f37ea41788
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use $wgSecureCookie to decide whether to actually mark secur... - change (mediawiki...CentralAuth)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Use $wgSecureCookie to decide whether to actually mark secure 
cookies as 'secure'
..

Use $wgSecureCookie to decide whether to actually mark secure cookies as 
'secure'

The pre-SessionManager code did this, and the change in combination with
the API not honoring forceHTTPS led to T124252.

Bug: T124252
Change-Id: I49ae17ca7c2cf606f2db21f7ce200a06357b2a9b
---
M includes/session/CentralAuthSessionProvider.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/includes/session/CentralAuthSessionProvider.php 
b/includes/session/CentralAuthSessionProvider.php
index d78beb2..1350265 100644
--- a/includes/session/CentralAuthSessionProvider.php
+++ b/includes/session/CentralAuthSessionProvider.php
@@ -285,7 +285,10 @@
 
$options = $this->centralCookieOptions;
if ( $session->shouldForceHTTPS() || 
$session->getUser()->requiresHTTPS() ) {
-   $options['secure'] = true;
+   // Don't set the secure flag if the request 
came in
+   // over "http", for backwards compat.
+   // @todo Break that backwards compat properly.
+   $options['secure'] = $this->config->get( 
'CookieSecure' );
}
 
// We only save the user into the central session if 
it's not a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49ae17ca7c2cf606f2db21f7ce200a06357b2a9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] Add GENDER to welcome messages - change (mediawiki...Sudo)

[jenkins-bot (Code Review)]

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

Change subject: Add GENDER to welcome messages
..


Add GENDER to welcome messages

https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Sudo-success/es_and_MediaWiki:Sudo-unsudo/en

Change-Id: Ice22272a39fcc51d8623a472276fab54949d6510
---
M SpecialSudo.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 7 insertions(+), 5 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/SpecialSudo.php b/SpecialSudo.php
index 04f5dda..3e9165e 100644
--- a/SpecialSudo.php
+++ b/SpecialSudo.php
@@ -98,6 +98,7 @@
$wgOut->addHTML( $this->msg( 'sudo-success' )
->rawParams( Linker::link( 
$suUser->getUserPage(), htmlspecialchars( $suUser->getName() ) ) )
->rawParams( Linker::link( 
$wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) ) )
+   ->params( $wgUser->getName() )
->parse()
);
}
@@ -125,8 +126,9 @@
);
$wgOut->addHTML(
$this->msg( 'sudo-unsudo' )
-   -rawParams( Linker::link( 
$suUser->getUserPage(), htmlspecialchars( $suUser->getName() ) ) )
+   ->rawParams( Linker::link( 
$suUser->getUserPage(), htmlspecialchars( $suUser->getName() ) ) )
->rawParams (Linker::link( 
$wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) )
+   ->params( $wgUser->getName() )
->parse()
) .
Xml::submitButton( $this->msg( 
'sudo-unsudo-submit' )->text() ) .
diff --git a/i18n/en.json b/i18n/en.json
index e6b7330..f2a6d83 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,9 +13,9 @@
"sudo-user": "Username:",
"sudo-reason": "Reason:",
"sudo-submit": "Login",
-   "sudo-unsudo": "Welcome $1, you are currently logged into the wiki as 
$2. Click on \"{{int:sudo-unsudo-submit}}\" to return to your own account.",
+   "sudo-unsudo": "{{GENDER:$3|Welcome}} $1, you are currently logged into 
the wiki as $2. Click on \"{{int:sudo-unsudo-submit}}\" to return to your own 
account.",
"sudo-unsudo-submit": "Return",
-   "sudo-success": "Welcome $1, you are now logged into the wiki as $2.",
+   "sudo-success": "{{GENDER:$3|Welcome}} $1, you are now logged into the 
wiki as $2.",
"sudo-error": "Sudo error: $1",
"sudo-error-sudo-invaliduser": "Invalid username",
"sudo-error-sudo-ip": "Cannot login as an IP address",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2ee1c78..c7ae6f9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,9 +16,9 @@
"sudo-user": "{{Identical|Username}}",
"sudo-reason": "{{Identical|Reason}}",
"sudo-submit": "{{Identical|Login}}",
-   "sudo-unsudo": "{{doc-important|Do not translate 
{{int:sudo-unsudo-submit}}.}}\nRefers to 
{{msg-mw|Sudo-unsudo-submit}}.\n\nUsed as welcome message. Parameters:\n* $1 - 
username of super user (with link)\n* $2 - username (with link)\nSee also:\n* 
{{msg-mw|Sudo-success}}",
+   "sudo-unsudo": "{{doc-important|Do not translate 
{{int:sudo-unsudo-submit}}.}}\nRefers to 
{{msg-mw|Sudo-unsudo-submit}}.\n\nUsed as welcome message. Parameters:\n* $1 - 
username of super user (with link)\n* $2 - username (with link)\n* $3 - 
username of user, used for GENDER\nSee also:\n* {{msg-mw|Sudo-success}}",
"sudo-unsudo-submit": "Used as label for Submit button.\n\nUsed in 
{{msg-mw|Sudo-unsudo}}.\n{{Identical|Return}}",
-   "sudo-success": "Used as welcome message. Parameters:\n* $1 - username 
of super user (with link)\n* $2 - username (with link)\nSee also:\n* 
{{msg-mw|Sudo-unsudo}}",
+   "sudo-success": "Used as welcome message. Parameters:\n* $1 - username 
of super user (with link)\n* $2 - username (with link)\n* $3 - username of 
user, used for GENDER\nSee also:\n* {{msg-mw|Sudo-unsudo}}",
"sudo-error": "Used as error message. Parameters:\n* $1 - error 
message. Any one of the following messages:\n** 
{{msg-mw|Sudo-error-sudo-invaliduser}}\n** {{msg-mw|Sudo-error-sudo-ip}}\n** 
{{msg-mw|Sudo-error-sudo-nonexistent}}\n** {{msg-mw|Sudo-error-sudo-self}}\n** 
{{msg-mw|Sudo-error-nosudo}}",
"sudo-error-sudo-invaliduser": "Used as $1 in 
{{msg-mw|Sudo-error}}.\n{{Identical|Invalid username}}",
"sudo-error-sudo-ip": "Used as $1 in 
{{msg-mw|Sudo-error}}.",

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

[MediaWiki-commits] [Gerrit] Add sample rate for thank_you CiviMail activities - change (wikimedia...crm)

[jenkins-bot (Code Review)]

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

Change subject: Add sample rate for thank_you CiviMail activities
..


Add sample rate for thank_you CiviMail activities

Bug: T119560
Change-Id: I81955cf5b43c0fcddcd47497c39c68c807590fe3
---
M sites/all/modules/thank_you/thank_you.module
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/sites/all/modules/thank_you/thank_you.module 
b/sites/all/modules/thank_you/thank_you.module
index 428d352..2aaf2f3 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -457,7 +457,9 @@
$mailer = Mailer::getDefault();
 
$civi_queue_record = null;
-   if ( variable_get( 'thank_you_add_civimail_records', 'false' ) === 
'true' ) {
+   $create_civi_mail = variable_get( 'thank_you_add_civimail_records', 
'false' );
+   $rate = variable_get( 'thank_you_civimail_rate', 1.0 );
+   if ( $create_civi_mail === 'true' && mt_rand(0, 1) <= $rate * 1 
) {
$civi_queue_record = thank_you_add_civi_queue(
$email['to_address'],
$email['subject'],
@@ -663,6 +665,13 @@
 '#default_value' => variable_get('thank_you_add_civimail_records', 
'false'),
   );
 
+  $form['thank_you_civimail_rate'] = array(
+'#type' => 'textfield',
+'#title' => t('CiviMail sample rate, from 0 (never) to 1 (always)'),
+'#default_value' => variable_get('thank_you_civimail_rate', 1),
+'#required' => TRUE,
+  );
+
   return system_settings_form($form);
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Add risk score to Adyen queue messages. - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Add risk score to Adyen queue messages.
..

Add risk score to Adyen queue messages.

It will be used by the IPN listener to decide whether to capture
authorized payments or leave them for manual review.

Bug: T122244
Change-Id: Ieb45af0c2047dce460cb3c7bb76c0d6ca301b5d9
---
M adyen_gateway/adyen.adapter.php
M tests/Adapter/Adyen/AdyenTest.php
2 files changed, 22 insertions(+), 0 deletions(-)


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

diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index c880fda..fbd4dda 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -264,6 +264,19 @@
return $this->transaction_response;
}
 
+   /**
+* Adds risk score to the message we send to the limbo queue.
+* The IPN listener will combine this with scores based on CVV and AVS
+* results returned with the authorization notification and determine
+* whether to capture the payment or leave it for manual review.
+* @return array
+*/
+   protected function getStompTransaction() {
+   $transaction = parent::getStompTransaction();
+   $transaction['risk_score'] = $this->risk_score;
+   return $transaction;
+   }
+
static function getCurrencies() {
// See 
http://www.adyen.com/platform/all-countries-all-currencies/
// This should be the list of all global "acceptance 
currencies".  Not
diff --git a/tests/Adapter/Adyen/AdyenTest.php 
b/tests/Adapter/Adyen/AdyenTest.php
index d3e0be9..5cd6975 100644
--- a/tests/Adapter/Adyen/AdyenTest.php
+++ b/tests/Adapter/Adyen/AdyenTest.php
@@ -90,4 +90,13 @@
$this->assertNotNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), "Adyen order_id is null, and we need one for 'merchantReference'" 
);
}
 
+   function testRiskScoreAddedToQueueMessage() {
+   $init = $this->getDonorTestData();
+   $gateway = $this->getFreshGatewayObject( $init );
+
+   $exposed = TestingAccessWrapper::newFromObject( $gateway );
+   $exposed->risk_score = 57;
+   $message = $exposed->getStompTransaction();
+   $this->assertEquals( 57, $message['risk_score'], 'Risk score 
was not correctly added to queue message.' );
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb45af0c2047dce460cb3c7bb76c0d6ca301b5d9
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] Fix working directory for testreduce clients on ruthenium - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Fix working directory for testreduce clients on ruthenium
..


Fix working directory for testreduce clients on ruthenium

Change-Id: Ia643d1d24a1c2c3270a4976605d3dc491e6f416f
---
M modules/testreduce/files/parsoid-rt-client.systemd.service
M modules/testreduce/files/parsoid-vd-client.systemd.service
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/testreduce/files/parsoid-rt-client.systemd.service 
b/modules/testreduce/files/parsoid-rt-client.systemd.service
index 20dc9f8..c0ff2e8 100644
--- a/modules/testreduce/files/parsoid-rt-client.systemd.service
+++ b/modules/testreduce/files/parsoid-rt-client.systemd.service
@@ -5,7 +5,7 @@
 [Service]
 User=testreduce
 Group=testreduce
-WorkingDirectory=/usr/lib/testreduce/client
+WorkingDirectory=/srv/testreduce/client
 ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 8 
/etc/testreduce/parsoid-rt-client.config.js
 StandardOutput=journal
 StandardError=journal
diff --git a/modules/testreduce/files/parsoid-vd-client.systemd.service 
b/modules/testreduce/files/parsoid-vd-client.systemd.service
index d90b5f7..4e482d5 100644
--- a/modules/testreduce/files/parsoid-vd-client.systemd.service
+++ b/modules/testreduce/files/parsoid-vd-client.systemd.service
@@ -5,7 +5,7 @@
 [Service]
 User=testreduce
 Group=testreduce
-WorkingDirectory=/usr/lib/testreduce/client
+WorkingDirectory=/srv/testreduce/client
 ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 4 
/srv/visualdiff/testreduce/parsoid-vd-client.config.js
 StandardOutput=journal
 StandardError=journal

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia643d1d24a1c2c3270a4976605d3dc491e6f416f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Fix working directory for testreduce clients on ruthenium - change (operations/puppet)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Fix working directory for testreduce clients on ruthenium
..

Fix working directory for testreduce clients on ruthenium

Change-Id: Ia643d1d24a1c2c3270a4976605d3dc491e6f416f
---
M modules/testreduce/files/parsoid-rt-client.systemd.service
M modules/testreduce/files/parsoid-vd-client.systemd.service
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/266300/1

diff --git a/modules/testreduce/files/parsoid-rt-client.systemd.service 
b/modules/testreduce/files/parsoid-rt-client.systemd.service
index 20dc9f8..c0ff2e8 100644
--- a/modules/testreduce/files/parsoid-rt-client.systemd.service
+++ b/modules/testreduce/files/parsoid-rt-client.systemd.service
@@ -5,7 +5,7 @@
 [Service]
 User=testreduce
 Group=testreduce
-WorkingDirectory=/usr/lib/testreduce/client
+WorkingDirectory=/srv/testreduce/client
 ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 8 
/etc/testreduce/parsoid-rt-client.config.js
 StandardOutput=journal
 StandardError=journal
diff --git a/modules/testreduce/files/parsoid-vd-client.systemd.service 
b/modules/testreduce/files/parsoid-vd-client.systemd.service
index d90b5f7..4e482d5 100644
--- a/modules/testreduce/files/parsoid-vd-client.systemd.service
+++ b/modules/testreduce/files/parsoid-vd-client.systemd.service
@@ -5,7 +5,7 @@
 [Service]
 User=testreduce
 Group=testreduce
-WorkingDirectory=/usr/lib/testreduce/client
+WorkingDirectory=/srv/testreduce/client
 ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 4 
/srv/visualdiff/testreduce/parsoid-vd-client.config.js
 StandardOutput=journal
 StandardError=journal

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

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

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

[MediaWiki-commits] [Gerrit] [WPtouch] Add jenkins tests - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [WPtouch] Add jenkins tests
..

[WPtouch] Add jenkins tests

Add mw-checks-test test.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/06/266306/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6167405..af6c6c8 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2014,6 +2014,10 @@
 template:
  - name: mw-checks
 
+  - name: mediawiki/skins/WPtouch
+template:
+ - name: mw-checks-test
+
   - name: mediawiki/tools/code-utils
 check-voter:
  - php53lint

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

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

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

[MediaWiki-commits] [Gerrit] Use $wgSecureCookie to decide whether to actually mark secur... - change (mediawiki...CentralAuth)

[jenkins-bot (Code Review)]

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

Change subject: Use $wgSecureCookie to decide whether to actually mark secure 
cookies as 'secure'
..


Use $wgSecureCookie to decide whether to actually mark secure cookies as 
'secure'

The pre-SessionManager code did this, and the change in combination with
the API not honoring forceHTTPS led to T124252.

Bug: T124252
Change-Id: I49ae17ca7c2cf606f2db21f7ce200a06357b2a9b
---
M includes/session/CentralAuthSessionProvider.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/session/CentralAuthSessionProvider.php 
b/includes/session/CentralAuthSessionProvider.php
index d78beb2..1350265 100644
--- a/includes/session/CentralAuthSessionProvider.php
+++ b/includes/session/CentralAuthSessionProvider.php
@@ -285,7 +285,10 @@
 
$options = $this->centralCookieOptions;
if ( $session->shouldForceHTTPS() || 
$session->getUser()->requiresHTTPS() ) {
-   $options['secure'] = true;
+   // Don't set the secure flag if the request 
came in
+   // over "http", for backwards compat.
+   // @todo Break that backwards compat properly.
+   $options['secure'] = $this->config->get( 
'CookieSecure' );
}
 
// We only save the user into the central session if 
it's not a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49ae17ca7c2cf606f2db21f7ce200a06357b2a9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Cleanup HTML output and modules - change (mediawiki...Kartographer)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup HTML output and modules
..


Cleanup HTML output and modules

For parsing consistency always output
  
as the root element.

Change-Id: I9ff808430cd91125554a167071db4b25944f9f42
---
M extension.json
M includes/DataModule.php
M includes/TagHandler.php
M modules/kartographer.js
R styles/kartographer.less
D styles/live.less
D styles/static.less
7 files changed, 27 insertions(+), 51 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7c069ab..ac45558 100644
--- a/extension.json
+++ b/extension.json
@@ -18,21 +18,10 @@
"Kartographer\\TagHandler": "includes/TagHandler.php"
},
"ResourceModules": {
-   "ext.kartographer.data": {
-   "class": "Kartographer\\DataModule"
-   },
-   "ext.kartographer.error": {
+   "ext.kartographer": {
+   "class": "Kartographer\\DataModule",
"styles": [
-   "styles/error.less"
-   ],
-   "targets": [
-   "mobile",
-   "desktop"
-   ]
-   },
-   "ext.kartographer.static": {
-   "styles": [
- "styles/static.less"
+   "styles/kartographer.less"
],
"targets": [
"mobile",
@@ -41,14 +30,13 @@
},
"ext.kartographer.live": {
"dependencies": [
-   "ext.kartographer.data"
+   "ext.kartographer"
],
"scripts": [
  "lib/mapbox-lib.js",
  "modules/kartographer.js"
],
"styles": [
- "styles/live.less",
  "lib/style.css"
],
"targets": [
diff --git a/includes/DataModule.php b/includes/DataModule.php
index 5405207..7d4c713 100644
--- a/includes/DataModule.php
+++ b/includes/DataModule.php
@@ -10,11 +10,9 @@
 
 use ResourceLoader;
 use ResourceLoaderContext;
-use ResourceLoaderModule;
+use ResourceLoaderFileModule;
 
-class DataModule extends ResourceLoaderModule {
-
-   protected $targets = array( 'desktop', 'mobile' );
+class DataModule extends ResourceLoaderFileModule {
 
public function getScript( ResourceLoaderContext $context ) {
$config = $context->getResourceLoader()->getConfig();
@@ -23,9 +21,5 @@
'wgKartographerIconServer' => $config->get( 
'KartographerIconServer' ),
'wgKartographerSrcsetScales' => $config->get( 
'KartographerSrcsetScales' ),
) );
-   }
-
-   public function enableModuleContentVersion() {
-   return true;
}
 }
diff --git a/includes/TagHandler.php b/includes/TagHandler.php
index 78ddad7..7990d67 100644
--- a/includes/TagHandler.php
+++ b/includes/TagHandler.php
@@ -31,6 +31,7 @@
) {
global $wgKartographerStyles, $wgKartographerDfltStyle;
$output = $parser->getOutput();
+   $output->addModuleStyles( 'ext.kartographer' );
 
if ( $input !== '' && $input !== null ) {
$status = FormatJson::parse( $input, 
FormatJson::TRY_FIXING | FormatJson::STRIP_COMMENTS );
@@ -129,6 +130,9 @@
}
 
$html = '';
+   $attrs = array(
+   'class' => 'mw-kartographer mw-kartographer-' . $mode,
+   );
switch ( $mode ) {
case 'static':
// 
http://.../img/{source},{zoom},{lat},{lon},{width}x{height} [ @{scale}x ] 
.{format}
@@ -139,7 +143,6 @@
$wgKartographerMapServer, $style, 
$zoom, $lat, $lon, $width, $height );
 
$imgAttrs = array(
-   'class' => 'mw-kartographer-img',
'src' => $statParams . '.jpeg' . 
$dataParam,
'width' => $width,
'height' => $height,
@@ -153,19 +156,15 @@
$imgAttrs['srcset'] = Html::srcSet( 
$srcSet );
}
 
-   $output->addModules( 'ext.kartographer.static' 
);
-   $html = Html::rawElement( 'img', $imgAttrs );
+   $html 

[MediaWiki-commits] [Gerrit] LocalFile: Ensure same timestamp for log entry and image rev... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: LocalFile: Ensure same timestamp for log entry and image 
revision
..


LocalFile: Ensure same timestamp for log entry and image revision

For file patrolling, we rely on the timestamp of image revision
(`image` table) and log entry (`logging` table) being the same, but we
weren't actually making sure it is the same.

Note that the timestamp of page revision can still differ, but that
shouldn't matter and it's a more involved fix.

Change-Id: I8e1b75d744c4a96cb0bb636b153d6e8ea2ee1fcf
---
M includes/filerepo/file/LocalFile.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index 9e214f6..2b5a4e6 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1355,6 +1355,7 @@
 
// Add the log entry...
$logEntry = new ManualLogEntry( 'upload', $reupload ? 
'overwrite' : 'upload' );
+   $logEntry->setTimestamp( $this->timestamp );
$logEntry->setPerformer( $user );
$logEntry->setComment( $comment );
$logEntry->setTarget( $descTitle );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e1b75d744c4a96cb0bb636b153d6e8ea2ee1fcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Cenarium 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Sync up with Parsoid parserTests.
..

Sync up with Parsoid parserTests.

This now aligns with Parsoid commit b04ce02432166128a295c0f00ac1d64c6a469a81

Change-Id: I9f27dc299b87aa265039c0e25084489810c0f7c8
---
M tests/parser/parserTests.txt
1 file changed, 74 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/266309/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 61c331d..078fa6c 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -8788,6 +8788,40 @@
 !! end
 
 !! test
+1. Nested mixed wikitext and html list
+!! wikitext
+* hi
+* ho
+* hi
+** ho
+!! html/php
+ hi
+ ho
+ hi
+ ho
+
+!! html/parsoid
+ hi
+ ho
+ hi
+ ho
+!! end
+
+!! test
+2. Nested mixed wikitext and html list (incompatible)
+!! wikitext
+; hi
+: {{echo|ho}}
+!! html/php
+ hi
+ ho
+
+!! html/parsoid
+ hi
+ ho
+!! end
+
+!! test
 Nested lists 1
 !! wikitext
 *foo
@@ -10655,6 +10689,43 @@
 !! html/parsoid
 foo bar
 baz
 
+!! end
+
+## This test is about making sure Parsoid's data-mw is well formed in the
+## face of multiple templates with intersecting and overlapping ranges.  The
+## wikitext itself is wretched.
+!! test
+Templates with intersecting and overlapping ranges
+!! wikitext
+{|{{echo|
+ha}}
+{|{{echo|
+ho}}
+{{echo|{{!}}hi}}
+|}
+!! html/php+tidy
+ha
+ho
+
+
+
+
+
+hi
+
+
+
+
+
+
+
+!! html/parsoid
+ha
+
+ho
+
+hi
+
 !! end
 
 !! article
@@ -20689,9 +20760,11 @@
 Strip reserved data attributes
 !! wikitext
 d
-!! html
+!! html/php
 d
 
+!! html/parsoid
+d
 !! end
 
 !! test

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

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

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

[MediaWiki-commits] [Gerrit] Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc
..


Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc

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

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index f566518..50d40a6 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -292,6 +292,8 @@
 * ParserOutput::getSecondaryDataUpdates() was removed (deprecated since 1.25).
 * Gallery images with multiple caption pipes no longer concatenate them all
   together but instead pick the final one, similar to image syntax.
+* XML-like parser tags (such as ), when unclosed, will be left 
unparsed
+  rather than consume everything until the end of the page.
 
 == Compatibility ==
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23199a7e8c67e93e4313f80b2c2b2ba074d52b86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add recurse_submodules => true while cloning parsoid in pars... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Add recurse_submodules => true while cloning parsoid in 
parsoid::testing role
..


Add recurse_submodules => true while cloning parsoid in parsoid::testing role

Change-Id: I9b7d716960420e2a693be39ae8881ef3d878ea3d
---
M manifests/role/parsoid.pp
1 file changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 96d771f..1bcec63 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -275,14 +275,15 @@
 # We clone the git repo and let testing services
 # update / modify the repo as appropriate
 # (via scripts, manually, however).
+# FIXME: Should we move this to /srv/parsoid ?
+# I am picking /usr/lib to minimize changes to
+# ruthenium setup.
 git::clone { 'mediawiki/services/parsoid/deploy':
-owner => 'root',
-group => 'wikidev',
-# FIXME: Should we move this to /srv/parsoid ?
-# I am picking /usr/lib to minimize changes to
-# ruthenium setup.
-directory => '/usr/lib/parsoid',
-before=> Service['parsoid'],
+owner  => 'root',
+group  => 'wikidev',
+recurse_submodules => true,
+directory  => '/usr/lib/parsoid',
+before => Service['parsoid'],
 }
 
 file { '/lib/systemd/system/parsoid.service':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b7d716960420e2a693be39ae8881ef3d878ea3d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ruthenium services: /usr/lib/parsoid/deploy/src => /usr/lib/... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: ruthenium services: /usr/lib/parsoid/deploy/src => 
/usr/lib/parsoid/src
..


ruthenium services: /usr/lib/parsoid/deploy/src => /usr/lib/parsoid/src

* I was mixing up production deploy paths with ruthenium
  git checkout paths.

Change-Id: Id3041576a4823d87bdc39b3caa0d8ff5b71da91f
---
M files/misc/parsoid.systemd.service
M manifests/role/parsoid.pp
M manifests/role/parsoid_rt_client.pp
3 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/files/misc/parsoid.systemd.service 
b/files/misc/parsoid.systemd.service
index e3ef662..06e0933 100644
--- a/files/misc/parsoid.systemd.service
+++ b/files/misc/parsoid.systemd.service
@@ -7,9 +7,9 @@
 Group=parsoid
 LimitNOFILE=10K
 
-Environment=NODE_PATH=/usr/lib/parsoid/deploy/node_modules VCAP_APP_PORT=8000
-WorkingDirectory=/usr/lib/parsoid/deploy/src
-ExecStart=node bin/server.js -c /usr/lib/parsoid/deploy/src/localsettings.js
+Environment=NODE_PATH=/usr/lib/parsoid/node_modules VCAP_APP_PORT=8000
+WorkingDirectory=/usr/lib/parsoid/src
+ExecStart=node bin/server.js -c /usr/lib/parsoid/src/localsettings.js
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 1bcec63..c364abb 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -304,9 +304,9 @@
 
 # Use the default settings file for the parsoid service.
 # Can tweak this later if necessary.
-file { '/usr/lib/parsoid/deploy/src/localsettings.js':
+file { '/usr/lib/parsoid/src/localsettings.js':
 ensure => link,
-target => '/usr/lib/parsoid/deploy/src/localsettings.js.example',
+target => '/usr/lib/parsoid/src/localsettings.js.example',
 before => Service['parsoid'],
 }
 
diff --git a/manifests/role/parsoid_rt_client.pp 
b/manifests/role/parsoid_rt_client.pp
index 9312b5d..9476a03 100644
--- a/manifests/role/parsoid_rt_client.pp
+++ b/manifests/role/parsoid_rt_client.pp
@@ -2,7 +2,7 @@
 class role::parsoid_rt_client {
 include ::testreduce
 
-file { 
'/usr/lib/parsoid/deploy/src/tests/testreduce/parsoid-rt-client.rttest.localsettings.js':
+file { 
'/usr/lib/parsoid/src/tests/testreduce/parsoid-rt-client.rttest.localsettings.js':
 source => 
'puppet:///modules/testreduce/parsoid-rt-client.rttest.localsettings.js',
 owner  => 'root',
 group  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3041576a4823d87bdc39b3caa0d8ff5b71da91f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] ruthenium services: /usr/lib/parsoid/deploy/src => /usr/lib/... - change (operations/puppet)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: ruthenium services: /usr/lib/parsoid/deploy/src => 
/usr/lib/parsoid/src
..

ruthenium services: /usr/lib/parsoid/deploy/src => /usr/lib/parsoid/src

* I was mixing up production deploy paths with ruthenium
  git checkout paths.

Change-Id: Id3041576a4823d87bdc39b3caa0d8ff5b71da91f
---
M files/misc/parsoid.systemd.service
M manifests/role/parsoid.pp
M manifests/role/parsoid_rt_client.pp
3 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/files/misc/parsoid.systemd.service 
b/files/misc/parsoid.systemd.service
index e3ef662..06e0933 100644
--- a/files/misc/parsoid.systemd.service
+++ b/files/misc/parsoid.systemd.service
@@ -7,9 +7,9 @@
 Group=parsoid
 LimitNOFILE=10K
 
-Environment=NODE_PATH=/usr/lib/parsoid/deploy/node_modules VCAP_APP_PORT=8000
-WorkingDirectory=/usr/lib/parsoid/deploy/src
-ExecStart=node bin/server.js -c /usr/lib/parsoid/deploy/src/localsettings.js
+Environment=NODE_PATH=/usr/lib/parsoid/node_modules VCAP_APP_PORT=8000
+WorkingDirectory=/usr/lib/parsoid/src
+ExecStart=node bin/server.js -c /usr/lib/parsoid/src/localsettings.js
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 1bcec63..c364abb 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -304,9 +304,9 @@
 
 # Use the default settings file for the parsoid service.
 # Can tweak this later if necessary.
-file { '/usr/lib/parsoid/deploy/src/localsettings.js':
+file { '/usr/lib/parsoid/src/localsettings.js':
 ensure => link,
-target => '/usr/lib/parsoid/deploy/src/localsettings.js.example',
+target => '/usr/lib/parsoid/src/localsettings.js.example',
 before => Service['parsoid'],
 }
 
diff --git a/manifests/role/parsoid_rt_client.pp 
b/manifests/role/parsoid_rt_client.pp
index 9312b5d..9476a03 100644
--- a/manifests/role/parsoid_rt_client.pp
+++ b/manifests/role/parsoid_rt_client.pp
@@ -2,7 +2,7 @@
 class role::parsoid_rt_client {
 include ::testreduce
 
-file { 
'/usr/lib/parsoid/deploy/src/tests/testreduce/parsoid-rt-client.rttest.localsettings.js':
+file { 
'/usr/lib/parsoid/src/tests/testreduce/parsoid-rt-client.rttest.localsettings.js':
 source => 
'puppet:///modules/testreduce/parsoid-rt-client.rttest.localsettings.js',
 owner  => 'root',
 group  => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] ruthenium services: Fix errors in systemd files - change (operations/puppet)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: ruthenium services: Fix errors in systemd files
..

ruthenium services: Fix errors in systemd files

Change-Id: Ifc45d66e0ddf3cb4fb089e51f4f74df3c2c126da
---
M files/misc/parsoid.systemd.service
M modules/testreduce/files/parsoid-rt-client.systemd.service
M modules/testreduce/files/parsoid-rt.systemd.service
M modules/visualdiff/files/parsoid-vd-client.systemd.service
M modules/visualdiff/files/parsoid-vd.systemd.service
5 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/266282/1

diff --git a/files/misc/parsoid.systemd.service 
b/files/misc/parsoid.systemd.service
index 06e0933..67a4958 100644
--- a/files/misc/parsoid.systemd.service
+++ b/files/misc/parsoid.systemd.service
@@ -5,11 +5,11 @@
 [Service]
 User=parsoid
 Group=parsoid
-LimitNOFILE=10K
+LimitNOFILE=1
 
 Environment=NODE_PATH=/usr/lib/parsoid/node_modules VCAP_APP_PORT=8000
 WorkingDirectory=/usr/lib/parsoid/src
-ExecStart=node bin/server.js -c /usr/lib/parsoid/src/localsettings.js
+ExecStart=/usr/bin/nodejs bin/server.js -c 
/usr/lib/parsoid/src/localsettings.js
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
diff --git a/modules/testreduce/files/parsoid-rt-client.systemd.service 
b/modules/testreduce/files/parsoid-rt-client.systemd.service
index bce0ff1..20dc9f8 100644
--- a/modules/testreduce/files/parsoid-rt-client.systemd.service
+++ b/modules/testreduce/files/parsoid-rt-client.systemd.service
@@ -6,7 +6,7 @@
 User=testreduce
 Group=testreduce
 WorkingDirectory=/usr/lib/testreduce/client
-ExecStart=node rtclient-cluster.js -c 8 
/etc/testreduce/parsoid-rt-client.config.js
+ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 8 
/etc/testreduce/parsoid-rt-client.config.js
 StandardOutput=journal
 StandardError=journal
 RestartSec=2
diff --git a/modules/testreduce/files/parsoid-rt.systemd.service 
b/modules/testreduce/files/parsoid-rt.systemd.service
index 9d19375..48ec0ff 100644
--- a/modules/testreduce/files/parsoid-rt.systemd.service
+++ b/modules/testreduce/files/parsoid-rt.systemd.service
@@ -5,11 +5,11 @@
 [Service]
 User=testreduce
 Group=testreduce
-LimitNOFILE=10K
+LimitNOFILE=1
 
 Environment=NODE_PATH=/srv/testreduce/node_modules PORT=8001
 WorkingDirectory=/srv/testreduce/server
-ExecStart=node server.js --config /etc/testreduce/parsoid-rt.settings.js
+ExecStart=/usr/bin/nodejs server.js --config 
/etc/testreduce/parsoid-rt.settings.js
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
diff --git a/modules/visualdiff/files/parsoid-vd-client.systemd.service 
b/modules/visualdiff/files/parsoid-vd-client.systemd.service
index 2cce301..d90b5f7 100644
--- a/modules/visualdiff/files/parsoid-vd-client.systemd.service
+++ b/modules/visualdiff/files/parsoid-vd-client.systemd.service
@@ -6,7 +6,7 @@
 User=testreduce
 Group=testreduce
 WorkingDirectory=/usr/lib/testreduce/client
-ExecStart=node rtclient-cluster.js -c 4 
/srv/visualdiff/testreduce/parsoid-vd-client.config.js
+ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 4 
/srv/visualdiff/testreduce/parsoid-vd-client.config.js
 StandardOutput=journal
 StandardError=journal
 RestartSec=2
diff --git a/modules/visualdiff/files/parsoid-vd.systemd.service 
b/modules/visualdiff/files/parsoid-vd.systemd.service
index 944c824..f1eb8c5 100644
--- a/modules/visualdiff/files/parsoid-vd.systemd.service
+++ b/modules/visualdiff/files/parsoid-vd.systemd.service
@@ -5,11 +5,11 @@
 [Service]
 User=testreduce
 Group=testreduce
-LimitNOFILE=10K
+LimitNOFILE=1
 
 Environment=NODE_PATH=/srv/testreduce/node_modules PORT=8001
 WorkingDirectory=/srv/testreduce/server
-ExecStart=node server.js --config /etc/testreduce/parsoid-vd.settings.js
+ExecStart=/usr/bin/nodejs server.js --config 
/etc/testreduce/parsoid-vd.settings.js
 StandardInput=null
 StandardOutput=journal
 StandardError=journal

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

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

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

[MediaWiki-commits] [Gerrit] Fix PreviewTaskTests - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Fix PreviewTaskTests
..

Fix PreviewTaskTests

The service's HTML output has changed. Make the test a little less exact
and a little less fragile by just checking that the response contains
the input.

Change-Id: I6bc82f9fdcd7bd2b6362575ae159fe8ef819836c
---
M app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java 
b/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java
index 8ae89a2..8032a20 100644
--- a/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java
@@ -12,7 +12,7 @@
 
 import static android.support.test.InstrumentationRegistry.getTargetContext;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
+import static org.hamcrest.Matchers.containsString;
 
 @RunWith(AndroidJUnit4.class)
 public class PreviewTaskTests {
@@ -21,10 +21,9 @@
 final PageTitle title = new PageTitle(null, 
"Test_page_for_app_testing/Section1", new Site("test.wikipedia.org"));
 long randomTime = System.currentTimeMillis();
 final String wikiText = "== Section 2 ==\n\nEditing section INSERT 
RANDOM & HERE test at " + randomTime;
-final String expected = "Section 2Edit\nEditing section INSERT RANDOM  
HERE test at " + randomTime + "\n\n\n\n\n\n";
 
 String result = Subject.execute(wikiText, title);
-assertThat(result, is(expected));
+assertThat(result, containsString(String.valueOf(randomTime)));
 }
 
 private static class Subject extends EditPreviewTask {

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

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

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

[MediaWiki-commits] [Gerrit] [staging]: match restbase config to current Cassandra cluster - change (operations/puppet)

[Eevans (Code Review)]

Eevans has uploaded a new change for review.

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

Change subject: [staging]: match restbase config to current Cassandra cluster
..

[staging]: match restbase config to current Cassandra cluster

Bug: T123869
Change-Id: If738e7401a60e47ca45b875ed3abefa40dcebe11
---
M hieradata/regex.yaml
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/266299/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 68c1d60..0fa7c2a 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -88,22 +88,13 @@
   - restbase-test2003-a.codfw.wmnet
   - restbase-test2003-b.codfw.wmnet
   restbase::seeds:
-  - cerium.eqiad.wmnet
   - cerium-a.eqiad.wmnet
-  - cerium-b.eqiad.wmnet
-  - praseodymium.eqiad.wmnet
   - praseodymium-a.eqiad.wmnet
-  - praseodymium-b.eqiad.wmnet
-  - xenon.eqiad.wmnet
   - xenon-a.eqiad.wmnet
-  - xenon-b.eqiad.wmnet
-  - restbase-test2001.codfw.wmnet
   - restbase-test2001-a.codfw.wmnet
   - restbase-test2001-b.codfw.wmnet
-  - restbase-test2002.codfw.wmnet
   - restbase-test2002-a.codfw.wmnet
   - restbase-test2002-b.codfw.wmnet
-  - restbase-test2003.codfw.wmnet
   - restbase-test2003-a.codfw.wmnet
   - restbase-test2003-b.codfw.wmnet
   restbase::cassandra_datacenters:

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

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

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

[MediaWiki-commits] [Gerrit] ve.dm.Scalable: Prevent validation from exploding on bad input - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ve.dm.Scalable: Prevent validation from exploding on bad input
..


ve.dm.Scalable: Prevent validation from exploding on bad input

Bug: T124515
Change-Id: Iaa4812974dc6130bd39ebe64e7b5fc3ca406b634
---
M src/dm/ve.dm.Scalable.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/src/dm/ve.dm.Scalable.js b/src/dm/ve.dm.Scalable.js
index 61abb55..ed000ae 100644
--- a/src/dm/ve.dm.Scalable.js
+++ b/src/dm/ve.dm.Scalable.js
@@ -604,6 +604,7 @@
maxDimensions = this.isEnforcedMax() && !$.isEmptyObject( 
this.getMaxDimensions() ) && this.getMaxDimensions();
 
this.valid = (
+   !!dimensions &&
$.isNumeric( dimensions.width ) &&
$.isNumeric( dimensions.height ) &&
(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa4812974dc6130bd39ebe64e7b5fc3ca406b634
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add escaping test to EntityTermsViewTest - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Add escaping test to EntityTermsViewTest
..


Add escaping test to EntityTermsViewTest

Test for the fix in Id394493.

I'm not sure if this is worth the trouble. Note that this is pretty
expensive because it creates a temporary page. Is there a better way
to mock a message?

Change-Id: Id5d96d898e86a5d45e52cc4892966a22dbd928c2
---
M view/tests/phpunit/EntityTermsViewTest.php
1 file changed, 14 insertions(+), 1 deletion(-)

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



diff --git a/view/tests/phpunit/EntityTermsViewTest.php 
b/view/tests/phpunit/EntityTermsViewTest.php
index 60537d8..6dbd9da 100644
--- a/view/tests/phpunit/EntityTermsViewTest.php
+++ b/view/tests/phpunit/EntityTermsViewTest.php
@@ -4,6 +4,7 @@
 
 use Language;
 use MediaWikiLangTestCase;
+use MessageCache;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Term\Fingerprint;
 use Wikibase\View\EntityTermsView;
@@ -240,9 +241,21 @@
$this->assertNotContains( '', $html, 'no double escaping' 
);
}
 
+   public function testGetEntityTermsForLanguageListView_isEscaped() {
+   MessageCache::singleton()->enable();
+   $this->setMwGlobals( 'wgLang', Language::factory( 'en' ) );
+   $this->insertPage( 
'MediaWiki:wikibase-entitytermsforlanguagelistview-language', "''RAW''" );
+
+   $view = $this->getEntityTermsView();
+   $html = $view->getEntityTermsForLanguageListView( new 
Fingerprint(), array() );
+
+   $this->assertContains( 'RAW', $html );
+   $this->assertNotContains( "'RAW'", $html );
+   }
+
public function testGetEntityTermsForLanguageListView_isMarkedAsEmpty() 
{
$view = $this->getEntityTermsView( 0, 1 );
-   $html = $view->getEntityTermsForLanguageListView( new 
Fingerprint(), array( 'en' ), null );
+   $html = $view->getEntityTermsForLanguageListView( new 
Fingerprint(), array( 'en' ) );
 
$this->assertContains( 'wb-empty', $html );
$this->assertContains( '(wikibase-label-empty)', $html );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5d96d898e86a5d45e52cc4892966a22dbd928c2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use $wgSecureCookie to decide whether to actually mark secur... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use $wgSecureCookie to decide whether to actually mark secure 
cookies as 'secure'
..


Use $wgSecureCookie to decide whether to actually mark secure cookies as 
'secure'

The pre-SessionManager code did this, and the change in combination with
the API not honoring forceHTTPS led to T124252.

Bug: T124252
Change-Id: Ic6a79fbb30491040facd7c200b1f47d6b99ce637
---
M includes/session/CookieSessionProvider.php
M tests/phpunit/includes/session/CookieSessionProviderTest.php
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/session/CookieSessionProvider.php 
b/includes/session/CookieSessionProvider.php
index 915127f..2d01d1d 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -176,7 +176,10 @@
 
$forceHTTPS = $session->shouldForceHTTPS() || 
$user->requiresHTTPS();
if ( $forceHTTPS ) {
-   $options['secure'] = true;
+   // Don't set the secure flag if the request came in
+   // over "http", for backwards compat.
+   // @todo Break that backwards compat properly.
+   $options['secure'] = $this->config->get( 'CookieSecure' 
);
}
 
$response->setCookie( $this->params['sessionName'], 
$session->getId(), null,
diff --git a/tests/phpunit/includes/session/CookieSessionProviderTest.php 
b/tests/phpunit/includes/session/CookieSessionProviderTest.php
index ccf45f6..702f556 100644
--- a/tests/phpunit/includes/session/CookieSessionProviderTest.php
+++ b/tests/phpunit/includes/session/CookieSessionProviderTest.php
@@ -431,7 +431,7 @@
'cookieOptions' => array( 'prefix' => 'x' ),
) );
$config = $this->getConfig();
-   $config->set( 'CookieSecure', false );
+   $config->set( 'CookieSecure', $secure );
$provider->setLogger( new \TestLogger() );
$provider->setConfig( $config );
$provider->setManager( SessionManager::singleton() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6a79fbb30491040facd7c200b1f47d6b99ce637
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set $wgWikimediaBadgesCommonsCategoryProperty for beta - change (operations/mediawiki-config)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Set $wgWikimediaBadgesCommonsCategoryProperty for beta
..

Set $wgWikimediaBadgesCommonsCategoryProperty for beta

Bug: T124403
Change-Id: I00b35ac610ad5d908a00be05c7ebaa65159614b8
---
M wmf-config/Wikibase-labs.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/Wikibase-labs.php b/wmf-config/Wikibase-labs.php
index 95dee64..e2e425e 100644
--- a/wmf-config/Wikibase-labs.php
+++ b/wmf-config/Wikibase-labs.php
@@ -41,4 +41,6 @@
);
 
$wgWBClientSettings['repoConceptBaseUri'] = 
'http://wikidata.beta.wmflabs.org/entity/';
+
+   $wgWikimediaBadgesCommonsCategoryProperty = 'P725';
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00b35ac610ad5d908a00be05c7ebaa65159614b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Avoid races on null revision insertion - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Avoid races on null revision insertion
..


Avoid races on null revision insertion

Bug: T51581
Change-Id: I7bfa9a4b20458e76ab3c4659e7041cd68aac13a4
---
M includes/Revision.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/includes/Revision.php b/includes/Revision.php
index 1d7ac72..9373e40 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1628,8 +1628,10 @@
array(
'page_id' => $pageId,
'page_latest=rev_id',
-   ),
-   __METHOD__ );
+   ),
+   __METHOD__,
+   array( 'FOR UPDATE' ) // T51581
+   );
 
if ( $current ) {
if ( !$user ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bfa9a4b20458e76ab3c4659e7041cd68aac13a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Handle static access in TestingAccessWrapper - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Handle static access in TestingAccessWrapper
..


Handle static access in TestingAccessWrapper

Change-Id: Ia8ec6ee0a364807e78fc182c4ce99d782b921eda
---
M tests/phpunit/data/helpers/WellProtectedClass.php
M tests/phpunit/includes/TestingAccessWrapper.php
M tests/phpunit/includes/TestingAccessWrapperTest.php
3 files changed, 148 insertions(+), 18 deletions(-)

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



diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php 
b/tests/phpunit/data/helpers/WellProtectedClass.php
index a45cfbb..f2b5a14 100644
--- a/tests/phpunit/data/helpers/WellProtectedClass.php
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -17,9 +17,20 @@
 }
 
 class WellProtectedClass extends WellProtectedParentClass {
+   protected static $staticProperty = 'sp';
+   private static $staticPrivateProperty = 'spp';
+
protected $property;
private $privateProperty;
 
+   protected static function staticMethod() {
+   return 'sm';
+   }
+
+   private static function staticPrivateMethod() {
+   return 'spm';
+   }
+
public function __construct() {
parent::__construct();
$this->property = 1;
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php 
b/tests/phpunit/includes/TestingAccessWrapper.php
index 63d8971..7332e15 100644
--- a/tests/phpunit/includes/TestingAccessWrapper.php
+++ b/tests/phpunit/includes/TestingAccessWrapper.php
@@ -12,36 +12,98 @@
  *$formatter = $title->getTitleFormatter();
  *
  * TODO:
- * - Provide access to static methods and properties.
  * - Organize other helper classes in tests/testHelpers.inc into a directory.
  */
 class TestingAccessWrapper {
+   /** @var mixed The object, or the class name for static-only access */
public $object;
 
/**
 * Return the same object, without access restrictions.
 */
public static function newFromObject( $object ) {
+   if ( !is_object( $object ) ) {
+   throw new InvalidArgumentException( __METHOD__ . ' must 
be called with an object' );
+   }
$wrapper = new TestingAccessWrapper();
$wrapper->object = $object;
return $wrapper;
}
 
+   /**
+* Allow access to non-public static methods and properties of the 
class.
+* Use non-static access,
+*/
+   public static function newFromClass( $className ) {
+   if ( !is_string( $className ) ) {
+   throw new InvalidArgumentException( __METHOD__ . ' must 
be called with a class name' );
+   }
+   $wrapper = new TestingAccessWrapper();
+   $wrapper->object = $className;
+   return $wrapper;
+   }
+
public function __call( $method, $args ) {
-   $classReflection = new ReflectionClass( $this->object );
-   $methodReflection = $classReflection->getMethod( $method );
-   $methodReflection->setAccessible( true );
-   return $methodReflection->invokeArgs( $this->object, $args );
+   $methodReflection = $this->getMethod( $method );
+
+   if ( $this->isStatic() && !$methodReflection->isStatic() ) {
+   throw new DomainException( __METHOD__ . ': Cannot call 
non-static when wrapping static class' );
+   }
+
+   return $methodReflection->invokeArgs( 
$methodReflection->isStatic() ? null : $this->object,
+   $args );
+   }
+
+   public function __set( $name, $value ) {
+   $propertyReflection = $this->getProperty( $name );
+
+   if ( $this->isStatic() && !$propertyReflection->isStatic() ) {
+   throw new DomainException( __METHOD__ . ': Cannot set 
property when wrapping static class' );
+   }
+
+   $propertyReflection->setValue( $this->object, $value );
+   }
+
+   public function __get( $name ) {
+   $propertyReflection = $this->getProperty( $name );
+
+   if ( $this->isStatic() && !$propertyReflection->isStatic() ) {
+   throw new DomainException( __METHOD__ . ': Cannot get 
property when wrapping static class' );
+   }
+
+   return $propertyReflection->getValue( $this->object );
+   }
+
+   private function isStatic() {
+   return is_string( $this->object );
}
 
/**
+* Return a property and make it accessible.
+* @param string $name
+* @return ReflectionMethod
+*/
+   private function getMethod( $name ) {
+   $classReflection = new ReflectionClass( $this->object );
+   

[MediaWiki-commits] [Gerrit] SpecialWatchlist: Display actual number of days for the "all... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: SpecialWatchlist: Display actual number of days for the "all" 
option
..


SpecialWatchlist: Display actual number of days for the "all" option

Bug: T120416
Change-Id: Icff5f9550ea27cde6d1c6ea42bb6ab89bf2b8616
---
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 12 insertions(+), 9 deletions(-)

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



diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index 20dde01..6ebe9a8 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -532,9 +532,19 @@
$days[] = $userWatchlistOption;
}
 
+   $maxDays = (string)( $this->getConfig()->get( 'RCMaxAge' ) / ( 
3600 * 24 ) );
+   // add the maximum possible value, if it isn't available already
+   if ( !in_array( $maxDays, $days ) ) {
+   $days[] = $maxDays;
+   }
+
$selected = (string)$options['days'];
+   if ( $selected <= 0 ) {
+   $selected = $maxDays;
+   }
+
// add the currently selected value, if it isn't available 
already
-   if ( !in_array( $selected, $days ) && $selected !== '0' ) {
+   if ( !in_array( $selected, $days ) ) {
$days[] = $selected;
}
 
@@ -549,11 +559,6 @@
}
$select->addOption( $name, $value );
}
-
-   // 'all' option
-   $name = $this->msg( 'watchlistall2' )->text();
-   $value = '0';
-   $select->addOption( $name, $value );
 
return $select->getHTML() . "\n\n";
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index cfb7d54..cbf7971 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2023,7 +2023,6 @@
"wlheader-showupdated": "Pages that have been changed since you last 
visited them are shown in bold.",
"wlnote": "Below {{PLURAL:$1|is the last change|are the last 
$1 changes}} in the last {{PLURAL:$2|hour|$2 
hours}}, as of $3, $4.",
"wlshowlast": "Show last $1 hours $2 days",
-   "watchlistall2": "all",
"watchlist-hide": "Hide",
"watchlist-submit": "Show",
"wlshowtime": "Period of time to display:",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index f9b5120..12ac93b 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2198,10 +2198,9 @@
"wlheader-showupdated": "Message at the top of [[Special:Watchlist]], 
after {{msg-mw|watchlist-details}}. Has to be a full sentence.",
"wlnote": "Used on [[Special:Watchlist]] when a maximum number of hours 
or days is specified.\n\nParameters:\n* $1 - the number of changes shown\n* $2 
- the number of hours for which the changes are shown\n* $3 - a date alone\n* 
$4 - a time alone",
"wlshowlast": "Appears on [[Special:Watchlist]]. Parameters:\n* $1 - a 
choice of different numbers of hours (\"1 | 2 | 6 | 12\")\n* $2 - a choice of 
different numbers of days (\"1 | 3 | 7\" and the maximum number of days 
available)\nClicking on your choice changes the list of changes you see 
(without changing the default in my preferences).",
-   "watchlistall2": "Appears on [[Special:Watchlist]], after 
{{msg-mw|wlshowtime}}, as the option to display all available data regardless 
of age.\n{{Identical|All}}",
"watchlist-hide": "Appears on [[Special:Watchlist]]. It is the first 
word on a new line with checkboxes to hide/unhide options\n{{Identical|Hide}}",
"watchlist-submit": "Label on the submit button in 
[[Special:Watchlist]]\n{{Identical|Show}}",
-   "wlshowtime": "Appears on [[Special:Watchlist]]. Label of a drop-down 
list used to specify the period of time to display in the watchlist. This 
period can be {{msg-mw|days}}, {{msg-mw|hours}}, or {{msg-mw|watchlistall2}}.",
+   "wlshowtime": "Appears on [[Special:Watchlist]]. Label of a drop-down 
list used to specify the period of time to display in the watchlist. This 
period can be {{msg-mw|days}} or {{msg-mw|hours}}.",
"wlshowhideminor": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhideminor}}.\n{{Identical|Minor edit}}",
"wlshowhidebots": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidebots}}.\n{{Identical|Bot}}",
"wlshowhideliu": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhideliu}}.\n{{Identical|Registered user}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] Clean up Wikibase related code - change (mediawiki...Math)

[WMDE]

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

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

Change subject: Clean up Wikibase related code
..

Clean up Wikibase related code

I'm trying to fix as many code style issues as I can find. There is a
lot going on here. This fixes some warnings in my PHPStorm, gets rid
of duplicate code, inlines constants that do not make the code easier
to read, and more.

Change-Id: I02f446491509043f5d3e51e26e932f76c9ecb6cf
---
M MathFormatter.php
M MathInputCheckRestbase.php
M tests/MathFormatterTest.php
3 files changed, 39 insertions(+), 58 deletions(-)


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

diff --git a/MathFormatter.php b/MathFormatter.php
index d7c4826..93802ef 100644
--- a/MathFormatter.php
+++ b/MathFormatter.php
@@ -2,7 +2,6 @@
 
 use DataValues\StringValue;
 use ValueFormatters\Exceptions\MismatchingDataValueTypeException;
-use ValueFormatters\FormattingException;
 use ValueFormatters\ValueFormatter;
 use Wikibase\Lib\SnakFormatter;
 
@@ -17,22 +16,25 @@
 
 class MathFormatter implements ValueFormatter {
 
+   /**
+* @var string One of the SnakFormatter::FORMAT_... constants.
+*/
private $format;
 
-   /*
+   /**
 * Loads format to distinguish the type of formatting
 *
-* @param string $format
+* @param string $format One of the SnakFormatter::FORMAT_... constants.
 *
 * @throws InvalidArgumentException
 */
public function __construct( $format ) {
switch ( $format ) {
-   case ( SnakFormatter::FORMAT_HTML ):
-   case ( SnakFormatter::FORMAT_HTML_DIFF ):
-   case ( SnakFormatter::FORMAT_HTML_WIDGET ):
-   case ( SnakFormatter::FORMAT_WIKI ):
-   case ( SnakFormatter::FORMAT_PLAIN ):
+   case SnakFormatter::FORMAT_PLAIN:
+   case SnakFormatter::FORMAT_WIKI:
+   case SnakFormatter::FORMAT_HTML:
+   case SnakFormatter::FORMAT_HTML_DIFF:
+   case SnakFormatter::FORMAT_HTML_WIDGET:
$this->format = $format;
break;
default:
@@ -40,44 +42,40 @@
}
}
 
-   /*
-*
+   /**
 * @param StringValue $value
 *
+* @throws MismatchingDataValueTypeException
 * @return string
-* @throws \ValueFormatters\Exceptions\MismatchingDataValueTypeException
 */
public function format( $value ) {
if ( !( $value instanceof StringValue ) ) {
throw new MismatchingDataValueTypeException( 
'StringValue', get_class( $value ) );
}
+
$tex = $value->getValue();
 
switch ( $this->format ) {
-   case ( SnakFormatter::FORMAT_PLAIN ):
-   return "$tex";
-   case ( SnakFormatter::FORMAT_WIKI ):
+   case SnakFormatter::FORMAT_PLAIN:
+   return $tex;
+   case SnakFormatter::FORMAT_WIKI:
return "$tex";
-   case ( SnakFormatter::FORMAT_HTML ):
-   case ( SnakFormatter::FORMAT_HTML_WIDGET ):
-   case ( SnakFormatter::FORMAT_HTML_DIFF ):
+   default:
$renderer = new MathMathML( $tex );
-   if ( $renderer->checkTex() ) {
-   if ( $renderer->render() ) {
-   return 
$renderer->getHtmlOutput();
-   }
+   if ( $renderer->checkTex() && 
$renderer->render() ) {
+   return $renderer->getHtmlOutput();
}
+
// TeX string is not valid or rendering failed
return $renderer->getLastError();
}
}
 
/**
-*
-* @return format
+* @return string One of the SnakFormatter::FORMAT_... constants.
 */
-
public function getFormat() {
return $this->format;
}
+
 }
diff --git a/MathInputCheckRestbase.php b/MathInputCheckRestbase.php
index 0fd2bc5..eb70d66 100644
--- a/MathInputCheckRestbase.php
+++ b/MathInputCheckRestbase.php
@@ -9,8 +9,6 @@
  * @author Moritz Schubotz
  */
 
-use MediaWiki\Logger\LoggerFactory;
-
 class MathInputCheckRestbase extends MathInputCheck {
private $restbaseInterface;
 
diff --git a/tests/MathFormatterTest.php 

[MediaWiki-commits] [Gerrit] Can't use getPersistedSessionId any more - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Can't use getPersistedSessionId any more
..


Can't use getPersistedSessionId any more

*sigh* another core change, another bit of breakage. There doesn't
seem to be a good way to just see if a session exists with
SessionManager. getSessionInfoForRequest would tell us, but it's
private. So this commit does away with session_exists, which was
barely used anyway, and just lets you ensure that a session does
exist.

Change-Id: Ic19b0562fc3aa5cd91eacdcb3da0145990ebb72f
---
M gateway_common/WmfFramework.mediawiki.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect_resultswitcher.body.php
3 files changed, 1 insertion(+), 26 deletions(-)

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



diff --git a/gateway_common/WmfFramework.mediawiki.php 
b/gateway_common/WmfFramework.mediawiki.php
index 85846de..85b5332 100644
--- a/gateway_common/WmfFramework.mediawiki.php
+++ b/gateway_common/WmfFramework.mediawiki.php
@@ -36,7 +36,7 @@
static function setupSession( $sessionId = false ) {
if ( class_exists( 'MediaWiki\Session\SessionManager' ) ) {

MediaWiki\Session\SessionManager::getGlobalSession()->persist();
-   } else {
+   } else if ( 
!RequestContext::getMain()->getRequest()->checkSessionCookie() ){
wfSetupSession();
}
}
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index cf2703e..11da3c5 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3061,30 +3061,12 @@
}
 
/**
-* Check to see if the session exists.
-*/
-   public function session_exists() {
-   if ( class_exists( 'MediaWiki\Session\SessionManager' ) ) {
-   $id = MediaWiki\Session\SessionManager::singleton()
-   ->getPersistedSessionId( $this->request );
-   return !is_null( $id );
-   }
-   return $this->request->checkSessionCookie();
-   }
-
-   /**
 * session_ensure
 * Ensure that we have a session set for the current user.
 * If we do not have a session set for the current user,
 * start the session.
 */
public function session_ensure() {
-   // if the session is already started, do nothing
-   if ( $this->session_exists() ) {
-   return;
-   }
-
-   // otherwise, fire it up using global mw function wfSetupSession
WmfFramework::setupSession();
}
 
diff --git a/globalcollect_gateway/globalcollect_resultswitcher.body.php 
b/globalcollect_gateway/globalcollect_resultswitcher.body.php
index d923c40..bc8d2c9 100644
--- a/globalcollect_gateway/globalcollect_resultswitcher.body.php
+++ b/globalcollect_gateway/globalcollect_resultswitcher.body.php
@@ -71,10 +71,6 @@
if ( is_null( $session_oid ) || ( ($this->qs_oid !== 
$session_oid) && strpos( $this->qs_ref, ( string ) $session_oid ) === false ) ) 
{
$forbidden = true;
$f_message = "Requested order id not present in the 
session. (session_oid = '$session_oid')";
-
-   if ( !$this->adapter->session_exists() ) {
-   $this->logger->error( "Resultswitcher: 
{$this->qs_oid} Is popped out, but still has no session data." );
-   }
}
 
if ( $forbidden ){
@@ -168,9 +164,6 @@
//However, we're _definitely_ going to need to pop out _before_ 
we redirect to the thank you or fail pages. 
$referrer = $request->getHeader( 'referer' );
if ( ( strpos( $referrer, $wgServer ) === false ) ) {
-   if ( !$this->adapter->session_exists() ) {
-   $this->logger->error( "Resultswitcher: 
{$this->qs_oid} warning: iframed script cannot see session cookie." );
-   }
 
$sessionOrders = $request->getSessionData( 
'order_status' );
$sessionOrders[$this->qs_oid] = 'liberated';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic19b0562fc3aa5cd91eacdcb3da0145990ebb72f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 

[MediaWiki-commits] [Gerrit] Changed the visual design of the geo dygraph - change (wikimedia...prince)

[OliverKeyes (Code Review)]

OliverKeyes has submitted this change and it was merged.

Change subject: Changed the visual design of the geo dygraph
..


Changed the visual design of the geo dygraph

- The new geo graph has a light-on-dark design that (hopefully) makes
it easier to see/differentiate the colors.
- It also adds the “Weekday (Month/Day)” x-axis label formatter.

Bug: T123959
Change-Id: I27a80445cd904a74b8fca7805bef563dc33d5197
---
M server.R
M tab_documentation/geography.md
M ui.R
A www/inverse.css
4 files changed, 25 insertions(+), 9 deletions(-)

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



diff --git a/server.R b/server.R
index 6d1fbab..9173799 100644
--- a/server.R
+++ b/server.R
@@ -16,6 +16,7 @@
 polloi::make_dygraph(
   data = clickthrough_rate,
   xlab = "Date", ylab = "Clickthrough rate (%)", title = "Wikipedia portal 
clickthrough rate") %>%
+  dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter, 
axisLabelWidth = 70) %>%
   dyAnnotation(as.Date("2015-12-07"), text = "A",
tooltip = "Sampling change - see below",
width = 12, height = 20, attachAtBottom = FALSE)
@@ -25,6 +26,8 @@
 polloi::make_dygraph(
   data = action_breakdown,
   xlab = "Date", ylab = "Actions (%)", title = "Actions on the Wikipedia 
portal") %>%
+  dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter, 
axisLabelWidth = 70) %>%
+  dyLegend(labelsDiv = "action_breakdown_legend", show = "always", width = 
400) %>%
   dyAnnotation(as.Date("2015-12-07"), text = "A",
tooltip = "Sampling change - see below",
width = 12, height = 20, attachAtBottom = FALSE)
@@ -34,17 +37,17 @@
 polloi::make_dygraph(
   data = dwelltime_data,
   xlab = "Date", ylab = "Dwell Time (Seconds)", title = "Time spent on the 
Wikipedia portal") %>%
+  dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter, 
axisLabelWidth = 70) %>%
   dyAnnotation(as.Date("2015-12-07"), text = "A",
tooltip = "Sampling change - see below",
width = 12, height = 20, attachAtBottom = FALSE)
   })
   
   output$country_breakdown_dygraph <- renderDygraph({
-polloi::make_dygraph(
-  data = country_data,
-  xlab = "Date",
-  ylab = "Users (%)",
-  title = "Geographic breakdown of portal visitors"
-)
+country_data %>%
+  polloi::make_dygraph(xlab = "", ylab = "Users (%)", title = "Geographic 
breakdown of portal visitors") %>%
+  dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter, 
axisLabelWidth = 70) %>%
+  dyLegend(labelsDiv = "country_breakdown_legend", show = "always", width 
= 400) %>%
+  dyCSS(css = "www/inverse.css")
   })
 })
diff --git a/tab_documentation/geography.md b/tab_documentation/geography.md
index f6515fe..2399d40 100644
--- a/tab_documentation/geography.md
+++ b/tab_documentation/geography.md
@@ -1,4 +1,4 @@
-Dwell-time on the Wikipedia portal
+Where users come from to the Wikipedia portal
 ===
 
 This measures where portal users come from each day, displaying the proportion 
of users from each top-10 country and the proportion from other countries, as a 
percentage.
diff --git a/ui.R b/ui.R
index d426891..fa50e58 100644
--- a/ui.R
+++ b/ui.R
@@ -27,7 +27,9 @@
 includeMarkdown("./tab_documentation/clickthrough_rate.md")
 ),
 tabItem(tabName = "action_breakdown",
-dygraphOutput("action_breakdown_dygraph"),
+div(dygraphOutput("action_breakdown_dygraph"),
+div(id = "action_breakdown_legend",
+style = "height: 60px; padding-top: 30px; padding-left: 
20px;")),
 includeMarkdown("./tab_documentation/breakdown.md")
 ),
 tabItem(tabName = "dwell_data",
@@ -35,7 +37,10 @@
 includeMarkdown("./tab_documentation/dwelltime.md")
 ),
 tabItem(tabName = "country_breakdown",
-dygraphOutput("country_breakdown_dygraph"),
+div(dygraphOutput("country_breakdown_dygraph"),
+div(id = "country_breakdown_legend",
+style = "height: 60px; padding-top: 30px; padding-left: 
20px;"),
+style = "width: 100%; background-color: #222D32; color: 
#ECF0F5; padding-top: 10px;"),
 includeMarkdown("./tab_documentation/geography.md")
 )
   )
diff --git a/www/inverse.css b/www/inverse.css
new file mode 100644
index 000..a30f078
--- /dev/null
+++ b/www/inverse.css
@@ -0,0 +1,8 @@
+#country_breakdown .dygraph-legend, #country_breakdown .dygraph-label {
+  background-color: #222D32 !important;
+  color: #ECF0F5;
+}
+
+#country_breakdown_dygraph .dygraph-axis-label {
+  color: #ECF0F5;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] Convert p2wiki to use skin registration - change (mediawiki...p2wiki)

[jenkins-bot (Code Review)]

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

Change subject: Convert p2wiki to use skin registration
..


Convert p2wiki to use skin registration

Change-Id: Ib15e61d10cbbc6fbef378b8633d48c3947a7f029
---
D P2wiki.i18n.php
M p2wiki.php
A skin.json
3 files changed, 47 insertions(+), 53 deletions(-)

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



diff --git a/P2wiki.i18n.php b/P2wiki.i18n.php
deleted file mode 100644
index 73610f1..000
--- a/P2wiki.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim41dccf09caecc0cd' ) ) {
-   function wfJsonI18nShim41dccf09caecc0cd( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim41dccf09caecc0cd';
-}
diff --git a/p2wiki.php b/p2wiki.php
index 3e2863f..c005906 100644
--- a/p2wiki.php
+++ b/p2wiki.php
@@ -22,21 +22,15 @@
  * require_once("$IP/skins/p2wiki/p2wiki.php");
  */
 
-if( !defined( 'MEDIAWIKI' ) ) die( "This is an extension to the MediaWiki 
package and cannot be run standalone." );
-
-$wgExtensionCredits['skin'][] = array (
-   'path' => __FILE__,
-   'name' => 'P2 wiki',
-   'author' => array('[http://automattic.com/ Automattic]', 
'[https://www.mediawiki.org/wiki/User:Dantman Daniel Friesen]'),
-   'description-msg' => 'p2wiki-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Skin:P2_wiki'
-);
-
-$skinID = basename(dirname(__FILE__));
-$wgValidSkinNames[$skinID] = 'P2wiki';
-$wgAutoloadClasses['SkinP2wiki'] = dirname(__FILE__).'/P2wiki.skin.php';
-$wgMessagesDirs['SkinP2wiki'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['SkinP2wiki'] = dirname(__FILE__).'/P2wiki.i18n.php';
-$wgResourceModules["skins.$skinID"] = array(
-   'styles' => array( "skins/$skinID/style/screen.css" => array( 'media' 
=> 'screen' ) )
-);
+if ( function_exists( 'wfLoadSkin' ) ) {
+   wfLoadSkin( 'p2wiki' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['p2wiki'] = __DIR__ . '/i18n';
+   /*wfWarn(
+   'Deprecated PHP entry point used for p2wiki skin. Please use 
wfLoadSkin instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );*/
+   return;
+} else {
+   die( 'This version of the p2wiki skin requires MediaWiki 1.25+' );
+}
diff --git a/skin.json b/skin.json
new file mode 100644
index 000..ef8d1b5
--- /dev/null
+++ b/skin.json
@@ -0,0 +1,35 @@
+{
+   "name": "P2 wiki",
+   "author": [
+   "[http://automattic.com/ Automattic]",
+   "[https://www.mediawiki.org/wiki/User:Dantman Daniel Friesen]"
+   ],
+   "descriptionmsg": "p2wiki-desc",
+   "url": "https://www.mediawiki.org/wiki/Skin:P2_wiki;,
+   "type": "skin",
+   "ValidSkinNames": {
+   "p2wiki": "P2wiki"
+   },
+   "AutoloadClasses": {
+   "SkinP2wiki": "P2wiki.skin.php"
+   },
+   "MessagesDirs": {
+   "SkinP2wiki": [
+   "i18n"
+   ]
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteSkinPath": "p2wiki"
+   },
+   "ResourceModules": {
+   "skins.p2wiki": {
+   "styles": {
+   "style/screen.css": {
+   "media": 

[MediaWiki-commits] [Gerrit] Add user-agent header to internal requests from RESTBase - change (mediawiki...mobileapps)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Add user-agent header to internal requests from RESTBase
..

Add user-agent header to internal requests from RESTBase

For better internal tracking.

Change-Id: I880005f6d22fb376b7c7aa205d5fd06937c69396
---
M lib/parsoid-access.js
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/81/266281/1

diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index 6340b5b..1dcd5a9 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -100,7 +100,10 @@
 }
 opts.redirects--;
 return preq.get({
-uri: uri
+uri: uri,
+headers: {
+'user-agent': 'WMF Mobile Content Service [mobileapps]'
+}
 }).then(function(response) {
 mwapi.checkResponseStatus(response);
 if (hasRedirectResponseStatus(response)) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I880005f6d22fb376b7c7aa205d5fd06937c69396
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] Use "Location" instead of deprecated "Location dec" - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

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

Change subject: Use "Location" instead of deprecated "Location dec"
..


Use "Location" instead of deprecated "Location dec"

Bug: T124674
Change-Id: I2efc269483cf7f7e6088515ed3f1a5c6891c198a
---
M resources/details/uw.LocationDetailsWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/details/uw.LocationDetailsWidget.js 
b/resources/details/uw.LocationDetailsWidget.js
index 806a9dc..b522030 100644
--- a/resources/details/uw.LocationDetailsWidget.js
+++ b/resources/details/uw.LocationDetailsWidget.js
@@ -103,7 +103,7 @@
headnum = parseFloat( heading );
 
if ( !isNaN( latnum ) && !isNaN( longnum ) ) {
-   locationParts = [ '{{Location dec', latitude, longitude 
];
+   locationParts = [ '{{Location', latitude, longitude ];
 
if ( !isNaN( headnum ) ) {
locationParts.push( 'heading:' + heading );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2efc269483cf7f7e6088515ed3f1a5c6891c198a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ruthenium services: Move config files to modules/testreduce/ - change (operations/puppet)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: ruthenium services: Move config files to modules/testreduce/
..

ruthenium services: Move config files to modules/testreduce/

* visual diffing instantiates a testreduce server and use that module.
  So, the config files are expected in modules/testreduce/ as well.

Change-Id: If31acde7222e34bc6ea58b406a9e3027f716e9a1
---
R modules/testreduce/files/parsoid-vd-client.config.js
R modules/testreduce/files/parsoid-vd-client.systemd.service
R modules/testreduce/files/parsoid-vd.systemd.service
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/266290/1

diff --git a/modules/visualdiff/files/parsoid-vd-client.config.js 
b/modules/testreduce/files/parsoid-vd-client.config.js
similarity index 100%
rename from modules/visualdiff/files/parsoid-vd-client.config.js
rename to modules/testreduce/files/parsoid-vd-client.config.js
diff --git a/modules/visualdiff/files/parsoid-vd-client.systemd.service 
b/modules/testreduce/files/parsoid-vd-client.systemd.service
similarity index 100%
rename from modules/visualdiff/files/parsoid-vd-client.systemd.service
rename to modules/testreduce/files/parsoid-vd-client.systemd.service
diff --git a/modules/visualdiff/files/parsoid-vd.systemd.service 
b/modules/testreduce/files/parsoid-vd.systemd.service
similarity index 100%
rename from modules/visualdiff/files/parsoid-vd.systemd.service
rename to modules/testreduce/files/parsoid-vd.systemd.service

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

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

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

[MediaWiki-commits] [Gerrit] ruthenium services: Move config files to modules/testreduce/ - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: ruthenium services: Move config files to modules/testreduce/
..


ruthenium services: Move config files to modules/testreduce/

* visual diffing instantiates a testreduce server and use that module.
  So, the config files are expected in modules/testreduce/ as well.

Change-Id: If31acde7222e34bc6ea58b406a9e3027f716e9a1
---
R modules/testreduce/files/parsoid-vd-client.config.js
R modules/testreduce/files/parsoid-vd-client.systemd.service
R modules/testreduce/files/parsoid-vd.systemd.service
3 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/visualdiff/files/parsoid-vd-client.config.js 
b/modules/testreduce/files/parsoid-vd-client.config.js
similarity index 100%
rename from modules/visualdiff/files/parsoid-vd-client.config.js
rename to modules/testreduce/files/parsoid-vd-client.config.js
diff --git a/modules/visualdiff/files/parsoid-vd-client.systemd.service 
b/modules/testreduce/files/parsoid-vd-client.systemd.service
similarity index 100%
rename from modules/visualdiff/files/parsoid-vd-client.systemd.service
rename to modules/testreduce/files/parsoid-vd-client.systemd.service
diff --git a/modules/visualdiff/files/parsoid-vd.systemd.service 
b/modules/testreduce/files/parsoid-vd.systemd.service
similarity index 100%
rename from modules/visualdiff/files/parsoid-vd.systemd.service
rename to modules/testreduce/files/parsoid-vd.systemd.service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If31acde7222e34bc6ea58b406a9e3027f716e9a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Clarify link as a noun - change (mediawiki...Score)

[jenkins-bot (Code Review)]

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

Change subject: Clarify link as a noun
..


Clarify link as a noun

https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Score-visualeditor-mwscoreinspector-midi/ksh

Change-Id: Ia69bca1855a596d8de9274303ca0a510bbd86cd8
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jforrester: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 4d6107f..263e931 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -39,7 +39,7 @@
"score-visualeditor-mwscoreinspector-lang": "Language",
"score-visualeditor-mwscoreinspector-lang-abc": "ABC",
"score-visualeditor-mwscoreinspector-lang-lilypond": "LilyPond",
-   "score-visualeditor-mwscoreinspector-midi": "Link to a MIDI file 
(auto-generated by default)",
+   "score-visualeditor-mwscoreinspector-midi": "A link to a MIDI file 
(auto-generated by default)",
"score-visualeditor-mwscoreinspector-override-midi": "Use an existing 
MIDI file",
"score-visualeditor-mwscoreinspector-override-midi-placeholder": "Name 
of existing MIDI file",
"score-visualeditor-mwscoreinspector-override-ogg": "Use an existing 
audio file",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia69bca1855a596d8de9274303ca0a510bbd86cd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Purodha 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Quit double-staging Adyen data - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Quit double-staging Adyen data
..

Quit double-staging Adyen data

addRequestData already triggers staging, no need to call stageData
again a few lines down.

Change-Id: I55cff94a7fd9c4484d487f892b30f77af22d52e6
---
M adyen_gateway/adyen.adapter.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index c880fda..1db9a3c 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -232,7 +232,10 @@
case 'donate':
$formaction = $this->url . 
'/hpp/pay.shtml';
$this->runAntifraudHooks();
-   $this->addRequestData( array ( 
'risk_score' => $this->risk_score ) ); //this will also fire off staging again.
+   // Add the risk score to our data. This 
will also trigger
+   // staging, placing the risk score in 
the constructed URL
+   // as 'offset' for use in 
processor-side fraud filters.
+   $this->addRequestData( array ( 
'risk_score' => $this->risk_score ) );
if ( $this->getValidationAction() != 
'process' ) {
// copied from base class.
$this->logger->info( "Failed 
pre-process checks for transaction type $transaction." );
@@ -248,7 +251,6 @@
) );
break;
}
-   $this->stageData();
$requestParams = 
$this->buildRequestParams();
 
$this->transaction_response->setData( 
array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55cff94a7fd9c4484d487f892b30f77af22d52e6
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] ruthenium: remove rsyncd, was for upgrade only - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: ruthenium: remove rsyncd, was for upgrade only
..


ruthenium: remove rsyncd, was for upgrade only

The rsyncd was just here temp., to copy data back
and forth during the server upgrade to jessie.

Bug:T122328
Change-Id: Ibf1201839e2f11340c90c7db40438bacd55adc86
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index add093f..e2294bc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2317,7 +2317,7 @@
 # Right now, both rt-server and rt-clients run on the same node
 # But, we are likely going to split them into different boxes soon.
 node 'ruthenium.eqiad.wmnet' {
-role testsystem, rsync_ruthenium,
+role testsystem,
 parsoid::testing, parsoid_rt_server, parsoid_rt_client,
 parsoid_vd_server, parsoid_vd_client
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf1201839e2f11340c90c7db40438bacd55adc86
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] [production]: match restbase config to current Cassandra clu... - change (operations/puppet)

[Eevans (Code Review)]

Eevans has uploaded a new change for review.

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

Change subject: [production]: match restbase config to current Cassandra 
cluster Bug: T123869
..

[production]: match restbase config to current Cassandra cluster
Bug: T123869

Change-Id: Ie3a0b06c8a2164f967718624e8c33a8ade7b7d01
---
M hieradata/role/codfw/restbase.yaml
M hieradata/role/eqiad/restbase.yaml
2 files changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/266297/1

diff --git a/hieradata/role/codfw/restbase.yaml 
b/hieradata/role/codfw/restbase.yaml
index a291fcc..63bad39 100644
--- a/hieradata/role/codfw/restbase.yaml
+++ b/hieradata/role/codfw/restbase.yaml
@@ -1,6 +1,10 @@
 restbase::seeds:
 - restbase2001-a.codfw.wmnet
-- restbase2002.codfw.wmnet
+- restbase2001-b.codfw.wmnet
+- restbase2001-c.codfw.wmnet
+- restbase2002-a.codfw.wmnet
+- restbase2002-b.codfw.wmnet
+- restbase2002-c.codfw.wmnet
 - restbase2003.codfw.wmnet
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
diff --git a/hieradata/role/eqiad/restbase.yaml 
b/hieradata/role/eqiad/restbase.yaml
index 0c17515..06eea11 100644
--- a/hieradata/role/eqiad/restbase.yaml
+++ b/hieradata/role/eqiad/restbase.yaml
@@ -2,12 +2,12 @@
 - restbase1001.eqiad.wmnet
 - restbase1002.eqiad.wmnet
 - restbase1003.eqiad.wmnet
-- restbase1004.eqiad.wmnet
+- restbase1004-a.eqiad.wmnet
 - restbase1005.eqiad.wmnet
 - restbase1006.eqiad.wmnet
-- restbase1007.eqiad.wmnet
-- restbase1008.eqiad.wmnet
-- restbase1009.eqiad.wmnet
+- restbase1007-a.eqiad.wmnet
+- restbase1008-a.eqiad.wmnet
+- restbase1009-a.eqiad.wmnet
 
 lvs::realserver::realserver_ips:
   - '10.2.2.17' # restbase.svc.eqiad.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] Fix annotation bug - change (wikimedia...wetzel)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Fix annotation bug
..

Fix annotation bug

Bug: https://phabricator.wikimedia.org/T124685
Change-Id: I65036fa94627e19981c0f081aeeca6d6b41503de
---
M server.R
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel 
refs/changes/98/266298/1

diff --git a/server.R b/server.R
index 9551731..14edc05 100644
--- a/server.R
+++ b/server.R
@@ -35,13 +35,13 @@
   dyLegend(labelsDiv = "tiles_summary_series_legend", show = "always") %>%
   dyAnnotation(as.Date("2015-09-17"), text = "A",
tooltip = "Maps launch announcement",
-   width = 10, height = 20, attachAtBottom = FALSE, series = 
"total users") %>%
+   width = 10, height = 20, attachAtBottom = FALSE, series = 
grep('total', names(temp), value = TRUE)) %>%
   dyAnnotation(as.Date("2016-01-08"), text = "B",
tooltip = "Maps launched on en.wikipedia.org",
-   width = 10, height = 20, attachAtBottom = FALSE, series = 
"total users") %>%
+   width = 10, height = 20, attachAtBottom = FALSE, series = 
grep('total', names(temp), value = TRUE)) %>%
   dyAnnotation(as.Date("2016-01-12"), text = "C",
tooltip = "Maps launch on en.wikipedia.org reverted on the 
9th; caches begin to clear",
-   width = 10, height = 20, attachAtBottom = FALSE, series = 
"total users")
+   width = 10, height = 20, attachAtBottom = FALSE, series = 
grep('total', names(temp), value = TRUE))
   })
   
   output$tiles_style_series <- renderDygraph({

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65036fa94627e19981c0f081aeeca6d6b41503de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wetzel
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Update RESTBase URI from rest.wikimedia.org to /api/rest_v1/ - change (mediawiki...mobileapps)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Update RESTBase URI from rest.wikimedia.org to /api/rest_v1/
..

Update RESTBase URI from rest.wikimedia.org to /api/rest_v1/

Since (a) it's being deprecated, and (b) switching will provide benefits
including better performance from geo-distributed caching, no additional
DNS lookups, and sharing of TLS / HTTP2 connections.

Change-Id: I6d703b627fc22a0bfe7c27b32efa54ef0e10b5cf
---
M config.dev.yaml
M config.prod.yaml
M lib/parsoid-access.js
M routes/definition.js
M routes/media.js
M routes/mobile-sections.js
M routes/mobile-summary.js
7 files changed, 15 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/01/266301/1

diff --git a/config.dev.yaml b/config.dev.yaml
index 79b6e7c..46d2310 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -59,6 +59,5 @@
   #   - if-match
   #   - user-agent
   #   - x-request-id
-  restbase_uri: https://restbase.wikimedia.org
   # whether to print extra debug info
   debug: true
diff --git a/config.prod.yaml b/config.prod.yaml
index 81dd8d3..d32b36e 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -33,6 +33,5 @@
   port: 6927
   # interface: localhost # uncomment to only listen on localhost
   # more per-service config settings
-  restbase_uri: https://restbase.wikimedia.org
   # whether to print extra debug info
   debug: false
diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index 6340b5b..fd6a410 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -64,7 +64,6 @@
 
 /**
  * @param {Logger} logger the logger instance to use
- * @param {string} restbase_uri the base URI for restbase as configured
  * @param {string} domain the wikipedia domain (e.g. "en.wikipedia.org")
  * @param {string} title the article title
  * @param {int, optional} revision the revision of the page to request
@@ -73,9 +72,9 @@
  *{Object} orig the original request domain and title
  * @return {promise} a Promise, which if fulfilled, will return the Parsoid 
content of the given page.
  */
-function getContent(logger, restbase_uri, domain, title, revision, opts) {
-var uri = restbase_uri + '/' + domain.replace(/^(\w+\.)m\./, '$1')
-+ '/v1/page/html/' + encodeURIComponent(title);
+function getContent(logger, domain, title, revision, opts) {
+var uri = 'https://' + domain.replace(/^(\w+\.)m\./, '$1')
++ '/api/rest_v1/page/html/' + encodeURIComponent(title);
 if (!opts && revision && revision.constructor === Object) {
 opts = revision;
 revision = undefined;
@@ -104,9 +103,9 @@
 }).then(function(response) {
 mwapi.checkResponseStatus(response);
 if (hasRedirectResponseStatus(response)) {
-return getContent(logger, restbase_uri, domain, 
getRedirectTitleFromLocationHeader(response), null, opts);
+return getContent(logger, domain, 
getRedirectTitleFromLocationHeader(response), null, opts);
 } else if (hasRedirectInPayload(response.body)) {
-return getContent(logger, restbase_uri, domain, 
getRedirectTitleFromPayload(response.body), null, opts);
+return getContent(logger, domain, 
getRedirectTitleFromPayload(response.body), null, opts);
 } else {
 return response;
 }
@@ -167,8 +166,8 @@
 }
 
 /** Returns a promise to retrieve the page content from Parsoid */
-function pageContentPromise(logger, restbase_uri, domain, title, revision) {
-return getContent(logger, restbase_uri, domain, title, revision)
+function pageContentPromise(logger, domain, title, revision) {
+return getContent(logger, domain, title, revision)
 .then(function (response) {
 var page = { revision: getRevisionFromEtag(response.headers) };
 var doc = domino.createDocument(response.body);
@@ -184,7 +183,7 @@
 
 /** Returns a promise to retrieve a set of definitions parsed from Wiktionary 
Parsoid HTML,
 or throws 501 if requesting from an unsupported Wiktionary domain. */
-function definitionPromise(logger, restbase_uri, domain, term, revision) {
+function definitionPromise(logger, domain, term, revision) {
 if (domain.indexOf('en') !== 0) {
 throw new sUtil.HTTPError({
 status: 501,
@@ -193,7 +192,7 @@
 detail: 'The language you have requested is not yet supported.'
 });
 }
-return getContent(logger, restbase_uri, domain, term, revision)
+return getContent(logger, domain, term, revision)
 .then(function (response) {
 var doc = domino.createDocument(response.body);
 transforms.runParsoidDomTransforms(doc);
diff --git a/routes/definition.js b/routes/definition.js
index a5bc5fa..3b6fa73 100644
--- a/routes/definition.js
+++ 

[MediaWiki-commits] [Gerrit] Show cookies and edit tokens in dev settings - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Show cookies and edit tokens in dev settings
..


Show cookies and edit tokens in dev settings

Change-Id: I3a8d3bd01cf33fcdd1a81d58b5871a5dc0a20d67
---
M 
app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values/dev_settings_strings.xml
M app/src/main/res/xml/developer_preferences.xml
4 files changed, 73 insertions(+), 11 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
 
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
index eaf4402..2b8e398 100644
--- 
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
+++ 
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.support.annotation.NonNull;
 
@@ -10,6 +11,8 @@
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.crash.RemoteLogException;
 import org.wikipedia.util.log.L;
+
+import java.util.List;
 
 /*package*/ class DeveloperSettingsPreferenceLoader extends 
BasePreferenceLoader {
 @NonNull private final Context context;
@@ -35,18 +38,20 @@
 /*package*/
 DeveloperSettingsPreferenceLoader(@NonNull PreferenceFragment fragment) {
 super(fragment);
-this.context = fragment.getActivity().getApplicationContext();
+this.context = fragment.getActivity();
 }
 
 @Override
 public void loadPreferences() {
 loadPreferences(R.xml.developer_preferences);
-setupRestBaseCheckboxes();
-setupCrashButton(findPreference(getCrashButtonKey()));
-
setupRemoteLogButton(findPreference(R.string.preference_key_remote_log));
+setUpRestBaseCheckboxes();
+setUpCookies((PreferenceCategory) 
findPreference(R.string.preferences_developer_cookies_key));
+setUpEditTokens((PreferenceCategory) 
findPreference(R.string.preferences_developer_edit_tokens_key));
+setUpCrashButton(findPreference(getCrashButtonKey()));
+
setUpRemoteLogButton(findPreference(R.string.preference_key_remote_log));
 }
 
-private void setupRestBaseCheckboxes() {
+private void setUpRestBaseCheckboxes() {
 CheckBoxPreference manualPreference = (CheckBoxPreference) 
findPreference(getManualKey());
 
manualPreference.setOnPreferenceChangeListener(setRestBaseManuallyChangeListener);
 setUseRestBasePreference(manualPreference.isChecked());
@@ -75,7 +80,7 @@
 return context.getString(R.string.preferences_developer_crash_key);
 }
 
-private void setupCrashButton(Preference button) {
+private void setUpCrashButton(Preference button) {
 button.setOnPreferenceClickListener(buildCrashButtonClickListener());
 }
 
@@ -88,7 +93,7 @@
 };
 }
 
-private void setupRemoteLogButton(Preference button) {
+private void setUpRemoteLogButton(Preference button) {
 
button.setOnPreferenceChangeListener(buildRemoteLogPreferenceChangeListener());
 }
 
@@ -103,6 +108,32 @@
 };
 }
 
+private void setUpCookies(@NonNull PreferenceCategory cat) {
+List domains = Prefs.getCookieDomainsAsList();
+for (String domain : domains) {
+String key = Prefs.getCookiesForDomainKey(domain);
+Preference pref = newDataStringPref(key, domain);
+cat.addPreference(pref);
+}
+}
+
+private void setUpEditTokens(@NonNull PreferenceCategory cat) {
+List domains = Prefs.getCookieDomainsAsList();
+for (String domain : domains) {
+String key = Prefs.getEditTokenForWikiKey(domain);
+Preference pref = newDataStringPref(key, domain);
+cat.addPreference(pref);
+}
+}
+
+private EditTextAutoSummarizePreference newDataStringPref(String key, 
String title) {
+EditTextAutoSummarizePreference pref = new 
EditTextAutoSummarizePreference(context, null,
+android.R.attr.editTextPreferenceStyle);
+pref.setKey(key);
+pref.setTitle(title);
+return pref;
+}
+
 private static class TestException extends RuntimeException {
 TestException(String message) {
 super(message);
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 67f007b..65e2ed0 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -358,16 +358,16 

[MediaWiki-commits] [Gerrit] Set $wgWikimediaBadgesCommonsCategoryProperty for beta - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Set $wgWikimediaBadgesCommonsCategoryProperty for beta
..


Set $wgWikimediaBadgesCommonsCategoryProperty for beta

Bug: T124403
Change-Id: I00b35ac610ad5d908a00be05c7ebaa65159614b8
---
M wmf-config/Wikibase-labs.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase-labs.php b/wmf-config/Wikibase-labs.php
index 95dee64..e2e425e 100644
--- a/wmf-config/Wikibase-labs.php
+++ b/wmf-config/Wikibase-labs.php
@@ -41,4 +41,6 @@
);
 
$wgWBClientSettings['repoConceptBaseUri'] = 
'http://wikidata.beta.wmflabs.org/entity/';
+
+   $wgWikimediaBadgesCommonsCategoryProperty = 'P725';
 }

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

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

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

[MediaWiki-commits] [Gerrit] Respect ANDROID_SERIAL when executing Spoon tests - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Respect ANDROID_SERIAL when executing Spoon tests
..


Respect ANDROID_SERIAL when executing Spoon tests

Spoon does not respect ANDROID_SERIAL by default[0]. This can cause the
wrong devices to be tested.

[0] https://github.com/stanfy/spoon-gradle-plugin/issues/49

Change-Id: I9a480f301b4075690f171a96718d5c446870621b
---
M config/quality.gradle
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/config/quality.gradle b/config/quality.gradle
index 76709df..ed81f99 100644
--- a/config/quality.gradle
+++ b/config/quality.gradle
@@ -58,4 +58,11 @@
 
 spoon {
 adbTimeout = 600
+
+// only run on the CI job's devices
+// https://github.com/stanfy/spoon-gradle-plugin/issues/49
+def envSerial = System.env['ANDROID_SERIAL'];
+if (envSerial) {
+devices = [envSerial];
+}
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a480f301b4075690f171a96718d5c446870621b
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Decommission: Removed nitrogen - change (operations/puppet)

[Papaul (Code Review)]

Papaul has uploaded a new change for review.

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

Change subject: Decommission: Removed nitrogen
..

Decommission: Removed nitrogen

Change-Id: I50f37e759737395af7efba5f258aad6f47ab2efc
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/266311/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index aafa4bc..8b2d6bb 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5955,11 +5955,6 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
-host nitrogen {
-   hardware ethernet 78:2b:cb:09:0e:37;
-   fixed-address nitrogen.wikimedia.org;
-}
-
 host nobelium {
hardware ethernet F0:1F:AF:E8:B1:FB;
fixed-address nobelium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] Improve translatable page header code - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Improve translatable page header code
..

Improve translatable page header code

Moved code for  into separate file and load styles via
parser.

Merge mw-translate-page-info into mw-pt-translate-header to avoid
duplication. Load this for all pages with  tags as well
as translation pages. Include noprint class with all uses of this
class. These changes make it so that styles are properly loaded for
pages which have  tags but are not yet marked for
translation, which didn't work before this patch.

Needs a follow-up after a while to remove code kept for now to
avoid breaking cached pages.

Change-Id: I94888f858e5ae523493ffa5dbf6431e675bdf380
---
M Resources.php
M resources/css/ext.translate.css
A resources/css/ext.translate.tag.languages.css
M tag/PageTranslationHooks.php
4 files changed, 83 insertions(+), 73 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 8064b4a..9a868a3 100644
--- a/Resources.php
+++ b/Resources.php
@@ -510,6 +510,11 @@
'position' => 'top',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.tag.languages'] = array(
+   'styles' => 'resources/css/ext.translate.tag.languages.css',
+   'position' => 'top',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.translationstashstorage'] = array(
'scripts' => 'resources/js/ext.translate.translationstashstorage.js',
'dependencies' => array(
diff --git a/resources/css/ext.translate.css b/resources/css/ext.translate.css
index de49a98..e1a93ff 100644
--- a/resources/css/ext.translate.css
+++ b/resources/css/ext.translate.css
@@ -1,72 +1,4 @@
-.mw-translate-page-info {
-   font-size: x-small;
-   text-align: center;
-   direction: ltr;
-}
-
-.mw-pt-languages {
-   display: table;
-   border: 1px solid rgb(170, 170, 170);
-   background: rgb(246, 249, 237) none repeat scroll 0 0;
-   border-collapse: collapse;
-   line-height: 1.2;
-   width: 100%;
-   clear: both;
-   overflow: auto;
-}
-
-.mw-pt-languages-label {
-   display: table-cell;
-   border-right: 1px solid rgb(170, 170, 170);
-   padding: 0.5em;
-   background: rgb(238, 243, 226) none repeat scroll 0 0;
-   font-weight: bold;
-   width: 15%;
-}
-
-.mw-pt-languages-list {
-   padding-left: 0.5em;
-   padding-bottom: 0.7em;
-   display: table-cell;
-   width: 80%;
-}
-
-.mw-pt-languages-list a {
-   white-space: nowrap;
-}
-
 .mw-pt-translate-header {
font-size: x-small;
text-align: center;
-}
-
-.mw-pt-languages-selected,
-.mw-pt-languages-ui {
-   font-weight: bold;
-}
-
-.mw-pt-progress {
-   padding-right: 11px;
-   background: transparent right center no-repeat;
-   background-size: 9px 9px;
-}
-
-.mw-pt-progress--stub {
-   background-image: url('../images/prog-1.png');
-}
-
-.mw-pt-progress--low {
-   background-image: url('../images/prog-2.png');
-}
-
-.mw-pt-progress--med {
-   background-image: url('../images/prog-3.png');
-}
-
-.mw-pt-progress--high {
-   background-image: url('../images/prog-4.png');
-}
-
-.mw-pt-progress--complete {
-   background-image: url('../images/prog-5.png');
 }
diff --git a/resources/css/ext.translate.tag.languages.css 
b/resources/css/ext.translate.tag.languages.css
new file mode 100644
index 000..1d308d0
--- /dev/null
+++ b/resources/css/ext.translate.tag.languages.css
@@ -0,0 +1,61 @@
+.mw-pt-languages {
+   display: table;
+   border: 1px solid rgb(170, 170, 170);
+   background: rgb(246, 249, 237) none repeat scroll 0 0;
+   border-collapse: collapse;
+   line-height: 1.2;
+   width: 100%;
+   clear: both;
+   overflow: auto;
+}
+
+.mw-pt-languages-label {
+   display: table-cell;
+   border-right: 1px solid rgb(170, 170, 170);
+   padding: 0.5em;
+   background: rgb(238, 243, 226) none repeat scroll 0 0;
+   font-weight: bold;
+   width: 15%;
+}
+
+.mw-pt-languages-list {
+   padding-left: 0.5em;
+   padding-bottom: 0.7em;
+   display: table-cell;
+   width: 80%;
+}
+
+.mw-pt-languages-list a {
+   white-space: nowrap;
+}
+
+.mw-pt-languages-selected,
+.mw-pt-languages-ui {
+   font-weight: bold;
+}
+
+.mw-pt-progress {
+   padding-right: 11px;
+   background: transparent right center no-repeat;
+   background-size: 9px 9px;
+}
+
+.mw-pt-progress--stub {
+   background-image: url('../images/prog-1.png');
+}
+
+.mw-pt-progress--low {
+   background-image: url('../images/prog-2.png');
+}
+
+.mw-pt-progress--med {
+   background-image: url('../images/prog-3.png');
+}
+
+.mw-pt-progress--high {
+   background-image: url('../images/prog-4.png');
+}
+

[MediaWiki-commits] [Gerrit] Hygiene: rename Site usage from "primary" to "app" - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: rename Site usage from "primary" to "app"
..


Hygiene: rename Site usage from "primary" to "app"

"Primary" is unclear. We have an app language (which still has some ties
to the system language) and an article language. Similarly, we have an
app site and an article site. Remove "primary" terminology and just use
"site" when communicating with WikipediaApp. No functional changes
intended.

Change-Id: I1ca807abe0b90c9288ce3e9a8ee5145f49e21387
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/Funnel.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/random/RandomHandler.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
16 files changed, 33 insertions(+), 32 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 6373d35..778bcea 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -100,7 +100,7 @@
 private EditTokenStorage editTokenStorage;
 private SharedPreferenceCookieManager cookieManager;
 private String userAgent;
-private Site primarySite;
+private Site site;
 
 private CrashReporter crashReporter;
 
@@ -249,24 +249,25 @@
 }
 
 /**
- * Default site of the application
- * You should use PageTitle.getSite() to get the currently browsed site
+ * Default site for the app
+ * You should use PageTitle.getSite() to get the article site
  */
-public Site getPrimarySite() {
-if (primarySite == null) {
-primarySite = Site.forLanguage(getAppOrSystemLanguageCode());
+public Site getSite() {
+// TODO: why don't we ensure that the app language hasn't changed here 
instead of the client?
+if (site == null) {
+site = Site.forLanguage(getAppOrSystemLanguageCode());
 }
 
-return primarySite;
+return site;
 }
 
 /**
- * Convenience method to get an API object for the primary site.
+ * Convenience method to get an API object for the app site.
  *
- * @return An API object that is equivalent to calling 
getAPIForSite(getPrimarySite)
+ * @return An API object that is equivalent to calling 
getAPIForSite(getSite)
  */
-public Api getPrimarySiteApi() {
-return getAPIForSite(getPrimarySite());
+public Api getSiteApi() {
+return getAPIForSite(getSite());
 }
 
 @Nullable
@@ -515,7 +516,7 @@
 }
 
 public void resetSite() {
-primarySite = null;
+site = null;
 }
 
 public OnboardingStateMachine getOnboardingStateMachine() {
diff --git a/app/src/main/java/org/wikipedia/analytics/Funnel.java 
b/app/src/main/java/org/wikipedia/analytics/Funnel.java
index b16afaa..118cce4 100644
--- a/app/src/main/java/org/wikipedia/analytics/Funnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/Funnel.java
@@ -147,7 +147,7 @@
 new EventLoggingEvent(
 schemaName,
 revision,
-getDBNameForSite(site == null ? 
getApp().getPrimarySite() : site),
+getDBNameForSite(site == null ? getApp().getSite() : 
site),
 app.getUserAgent(),
 preprocessData(eventData)
 ).log();
diff --git 
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java 
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 42a63d3..5949ce3 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -91,7 +91,7 @@
 progressDialog.setCancelable(false);
 
progressDialog.setMessage(getString(R.string.dialog_create_account_checking_progress));
 
-captchaHandler = new CaptchaHandler(this, app.getPrimarySite(), 
progressDialog, 

[MediaWiki-commits] [Gerrit] Avoid use of statementList.addItem when not needed - change (mediawiki...Wikibase)

[WMDE]

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

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

Change subject: Avoid use of statementList.addItem when not needed
..

Avoid use of statementList.addItem when not needed

This is in preparation for
https://github.com/wmde/WikibaseDataModelJavaScript/pull/54

Change-Id: I835f6a383305170d2173cdd194c104377765af21
---
M view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
1 file changed, 4 insertions(+), 5 deletions(-)


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

diff --git 
a/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
index d124f51..5de88b5 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
@@ -154,18 +154,17 @@
 */
value: function( statementList ) {
if ( statementList === undefined ) {
-   var lia = this._listview.listItemAdapter();
-
-   statementList = new wb.datamodel.StatementList();
+   var statements = [],
+   lia = this._listview.listItemAdapter();
 
this._listview.items().each( function() {
var statement = lia.liInstance( $( this ) 
).value();
if ( statement ) {
-   statementList.addItem( statement );
+   statements.push( statement );
}
} );
 
-   return statementList;
+   return new wb.datamodel.StatementList( statements );
}
 
this.option( 'value', statementList );

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

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

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

[MediaWiki-commits] [Gerrit] Add provenance parameter when sharing text. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add provenance parameter when sharing text.
..


Add provenance parameter when sharing text.

A bit late to the party, but still a nice thing to have.

Bug: T112146
Change-Id: I7a544551774e10d264d9250d1e045724b8612a99
---
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M app/src/main/java/org/wikipedia/util/ShareUtil.java
M app/src/main/java/org/wikipedia/util/UriUtil.java
M app/src/main/res/values/strings_no_translate.xml
4 files changed, 27 insertions(+), 12 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java 
b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index d142c31..3f9fd6e 100755
--- a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -38,6 +38,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wikipedia.util.UriUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.wiktionary.WiktionaryDialog;
 
@@ -147,9 +148,6 @@
 
 final String selectedText = sanitizeText(input.toString());
 final PageTitle title = curPageFragment.getTitle();
-final String introText = 
activity.getString(R.string.snippet_share_intro,
-title.getDisplayText(),
-title.getCanonicalUri() + "?wprov=sfia1"); // See 
https://wikitech.wikimedia.org/wiki/Provenance;
 
 (new 
ImageLicenseFetchTask(WikipediaApp.getInstance().getAPIForSite(title.getSite()),
 title.getSite(),
@@ -171,8 +169,7 @@
 if (shareDialog != null) {
 shareDialog.dismiss();
 }
-shareDialog = new PreviewDialog(activity, snippetBitmap, 
title.getDisplayText(), introText,
-selectedText, funnel);
+shareDialog = new PreviewDialog(activity, snippetBitmap, 
title, selectedText, funnel);
 shareDialog.show();
 }
 
@@ -321,9 +318,8 @@
 class PreviewDialog extends BottomDialog {
 private boolean completed = false;
 
-PreviewDialog(final PageActivity activity, final Bitmap resultBitmap,
-  final String title, final String introText, final String 
selectedText,
-  final ShareAFactFunnel funnel) {
+PreviewDialog(final PageActivity activity, final Bitmap resultBitmap, 
final PageTitle title,
+  final String selectedText, final ShareAFactFunnel funnel) {
 super(activity, R.layout.dialog_share_preview);
 ImageView previewImage = (ImageView) 
getDialogLayout().findViewById(R.id.preview_img);
 previewImage.setImageBitmap(resultBitmap);
@@ -331,7 +327,11 @@
 .setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
-ShareUtil.shareImage(activity, resultBitmap, title, 
title, introText, false);
+String introText = 
activity.getString(R.string.snippet_share_intro,
+title.getDisplayText(),
+UriUtil.getUrlWithProvenance(activity, title, 
R.string.prov_share_image));
+ShareUtil.shareImage(activity, resultBitmap, 
title.getDisplayText(),
+title.getDisplayText(), introText, false);
 funnel.logShareIntent(selectedText, ShareMode.image);
 completed = true;
 }
@@ -340,7 +340,11 @@
 .setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
-ShareUtil.shareText(activity, title, 
constructShareText(selectedText, introText));
+String introText = 
activity.getString(R.string.snippet_share_intro,
+title.getDisplayText(),
+UriUtil.getUrlWithProvenance(activity, title, 
R.string.prov_share_text));
+ShareUtil.shareText(activity, title.getDisplayText(),
+constructShareText(selectedText, introText));
 funnel.logShareIntent(selectedText, ShareMode.text);
 completed = true;
 }
@@ -350,7 +354,7 @@
 public void onDismiss(DialogInterface dialog) {
 resultBitmap.recycle();
 if (!completed) {
-funnel.logAbandoned(title);
+funnel.logAbandoned(title.getDisplayText());
 }
 }
 });
diff --git a/app/src/main/java/org/wikipedia/util/ShareUtil.java 

[MediaWiki-commits] [Gerrit] Use $wgSecureCookie to decide whether to actually mark secur... - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Use $wgSecureCookie to decide whether to actually mark secure 
cookies as 'secure'
..

Use $wgSecureCookie to decide whether to actually mark secure cookies as 
'secure'

The pre-SessionManager code did this, and the change in combination with
the API not honoring forceHTTPS led to T124252.

Bug: T124252
Change-Id: Ic6a79fbb30491040facd7c200b1f47d6b99ce637
---
M includes/session/CookieSessionProvider.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/includes/session/CookieSessionProvider.php 
b/includes/session/CookieSessionProvider.php
index 915127f..2d01d1d 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -176,7 +176,10 @@
 
$forceHTTPS = $session->shouldForceHTTPS() || 
$user->requiresHTTPS();
if ( $forceHTTPS ) {
-   $options['secure'] = true;
+   // Don't set the secure flag if the request came in
+   // over "http", for backwards compat.
+   // @todo Break that backwards compat properly.
+   $options['secure'] = $this->config->get( 'CookieSecure' 
);
}
 
$response->setCookie( $this->params['sessionName'], 
$session->getId(), null,

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

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

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