date:20161205

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Try upload 3 times

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Try upload 3 times
..


Try upload 3 times

Four shalt thou not count, neither count thou two, excepting that thou then
proceed to three. Five is right out.

Bug: T152352
Change-Id: I134c1235b7d2cda695d34e5ad4478ac86aac4098
---
M silverpop_export/upload.py
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/silverpop_export/upload.py b/silverpop_export/upload.py
index 950a3d4..8ab7e27 100644
--- a/silverpop_export/upload.py
+++ b/silverpop_export/upload.py
@@ -2,6 +2,7 @@
 
 import glob
 import os
+import sys
 
 import process
 from process.logging import Logger as log
@@ -36,6 +37,14 @@
 
 lock.begin()
 
-upload_most_recent()
+for i in range(3):
+try:
+upload_most_recent()
+break
+except:
+log.error("Ran into trouble: " + str(sys.exc_info()))
+
+if i == 2:
+raise
 
 lock.end()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I134c1235b7d2cda695d34e5ad4478ac86aac4098
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Roll out wikidata description taglines to French and German ...

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Roll out wikidata description taglines to French and German 
Wikipedias
..


Roll out wikidata description taglines to French and German Wikipedias

Update nowikidatadescriptiontaglines.dblist to remove top 6 wikis given
that only 2 wikis (English and Russian) do not have this feature.

Explicitly disable there.

Bug: T151345
Change-Id: Ic3e75fcf3d6a58f93f7077dbdf8ee2e97d6c7053
---
M dblists/nowikidatadescriptiontaglines.dblist
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 7 deletions(-)

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



diff --git a/dblists/nowikidatadescriptiontaglines.dblist 
b/dblists/nowikidatadescriptiontaglines.dblist
index 7a94bf1..fdeac05 100644
--- a/dblists/nowikidatadescriptiontaglines.dblist
+++ b/dblists/nowikidatadescriptiontaglines.dblist
@@ -1 +1 @@
-%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + top6-wikipedia.dblist + special.dblist - s4.dblist
\ No newline at end of file
+%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
\ No newline at end of file
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 62ece75..ccde3c0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14665,13 +14665,11 @@
'nowikidatadescriptiontaglines' => [
'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
-   // This can be removed when top6-wikipedia.dblist is no longer inside 
nowikidatadescriptiontaglines
-   'jawiki' => [
-   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => true
+   'ruwiki' => [
+   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
-   // This can be removed when top6-wikipedia.dblist is no longer inside 
nowikidatadescriptiontaglines
-   'eswiki' => [
-   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => true
+   'enwiki' => [
+   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
 ],
 'wgMinervaUseFooterV2' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3e75fcf3d6a58f93f7077dbdf8ee2e97d6c7053
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...drupal[master]: Re-apply WMF patches

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Re-apply WMF patches
..


Re-apply WMF patches

Note I have rolled the following into one patch. I had to fix conflicts on the
98f9e6b (FR #1070) patch on includes/registry.inc

debfcf6 Use sans-serifs for Civi's sake
98f9e6b (FR #1070) Drupal registry supports namespaces
89c75c5 Accept anything callable as a callback, need not be a global function 
name.
e91344f WIP fixes for testing

Change-Id: I4220bfd37a587acf07942e4f94d416908aafcdbe
---
M includes/form.inc
M includes/registry.inc
M modules/system/system.info
A modules/system/tests/NamespacedClass.php
M modules/user/user.module
M themes/bartik/css/style.css
6 files changed, 19 insertions(+), 4 deletions(-)

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



diff --git a/includes/form.inc b/includes/form.inc
index 130775f..835b117 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -789,7 +789,7 @@
 
   // We first check to see if there's a function named after the $form_id.
   // If there is, we simply pass the arguments on to it to get the form.
-  if (!function_exists($form_id)) {
+  if (!is_callable($form_id)) {
 // In cases where many form_ids need to share a central constructor 
function,
 // such as the node editing form, modules can implement hook_forms(). It
 // maps one or more form_ids to the correct constructor functions.
diff --git a/includes/registry.inc b/includes/registry.inc
index 29a1fca..67c7a4c 100644
--- a/includes/registry.inc
+++ b/includes/registry.inc
@@ -164,8 +164,14 @@
  *   (optional) Weight of the module.
  */
 function _registry_parse_file($filename, $contents, $module = '', $weight = 0) 
{
+  $namespace = '';
+  // We support one namespace per file
+  if 
(preg_match('/^<\?(?:php)?\s*(?:declare[^;]+;\s*)?namespace\s+?([a-zA-Z0-9_]+)/ms',
 $contents, $matches)) {
+$namespace = $matches[1] . '\\';
+  }
   if 
(preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface|trait)\s+([a-zA-Z0-9_]+)/m',
 $contents, $matches)) {
-foreach ($matches[2] as $key => $name) {
+foreach ($matches[2] as $key => &$name) {
+  $name = $namespace . $name;
   db_merge('registry')
 ->key(array(
   'name' => $name,
diff --git a/modules/system/system.info b/modules/system/system.info
index 3653157..8241d4c 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -9,6 +9,7 @@
 files[] = system.tar.inc
 files[] = system.updater.inc
 files[] = system.test
+files[] = tests/NamespacedClass.php
 required = TRUE
 configure = admin/config/system
 
diff --git a/modules/system/tests/NamespacedClass.php 
b/modules/system/tests/NamespacedClass.php
new file mode 100644
index 000..b27aedb
--- /dev/null
+++ b/modules/system/tests/NamespacedClass.php
@@ -0,0 +1,4 @@
+uid == 1) {
 return TRUE;
@@ -1570,7 +1574,7 @@
  *   TRUE if the user is logged in, FALSE if the user is anonymous.
  */
 function user_is_logged_in() {
-  return (bool) $GLOBALS['user']->uid;
+  return $GLOBALS['user'] && (bool) $GLOBALS['user']->uid;
 }
 
 /**
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 8426e56..80d8a5c 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -106,7 +106,7 @@
 #site-slogan,
 .ui-widget,
 .comment-form label {
-  font-family: Georgia, "Times New Roman", Times, serif;
+  font-family: Helvetica, Arial, sans-serif;
 }
 #header,
 #footer-wrapper,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make SpecialGoToLinkedPage use OOUI

2016-12-05 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: Make SpecialGoToLinkedPage use OOUI
..

Make SpecialGoToLinkedPage use OOUI

Change-Id: I80ecaceef17ee57b720b1e3a7562d355538c885f
---
M repo/includes/Specials/SpecialGoToLinkedPage.php
M repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
2 files changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/55/325455/1

diff --git a/repo/includes/Specials/SpecialGoToLinkedPage.php 
b/repo/includes/Specials/SpecialGoToLinkedPage.php
index e103127..801b563 100644
--- a/repo/includes/Specials/SpecialGoToLinkedPage.php
+++ b/repo/includes/Specials/SpecialGoToLinkedPage.php
@@ -245,7 +245,7 @@
)
);
 
-   HTMLForm::factory( 'inline', $formDescriptor, 
$this->getContext() )
+   HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() 
)
->setId( 'wb-gotolinkedpage-form1' )
->setMethod( 'get' )
->setSubmitID( 'wb-gotolinkedpage-submit' )
diff --git a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
index 3f73d42..764ea83 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
@@ -164,23 +164,19 @@
$matchers['site'] = array(
'tag' => 'input',
'attributes' => array(
-   'id' => 'wb-gotolinkedpage-sitename',
'name' => 'site',
'value' => $site
) );
$matchers['itemid'] = array(
'tag' => 'input',
'attributes' => array(
-   'id' => 'wb-gotolinkedpage-itemid',
'name' => 'itemid',
'value' => $item
) );
$matchers['submit'] = array(
-   'tag' => 'input',
+   'tag' => 'button',
'attributes' => array(
-   'id' => 'wb-gotolinkedpage-submit',
'type' => 'submit',
-   'name' => ''
)
);
foreach ( $matchers as $key => $matcher ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80ecaceef17ee57b720b1e3a7562d355538c885f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Install zip for statistics::web role (on thorium)

2016-12-05 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Install zip for statistics::web role (on thorium)
..


Install zip for statistics::web role (on thorium)

Bug: T149438
Change-Id: I89af996ff78d7b77b58e2ff2a7eadfe767c68d0b
---
M modules/statistics/manifests/web.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/statistics/manifests/web.pp 
b/modules/statistics/manifests/web.pp
index ff60e5a..b3211b5 100644
--- a/modules/statistics/manifests/web.pp
+++ b/modules/statistics/manifests/web.pp
@@ -19,6 +19,7 @@
 require_package([
 'mc',
 'unzip',
+'zip',
 ])
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89af996ff78d7b77b58e2ff2a7eadfe767c68d0b
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] operations/puppet[production]: move install_console from global /files to modules/role/files/

2016-12-05 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: move install_console from global /files to modules/role/files/
..

move install_console from global /files to modules/role/files/

Change-Id: I97d5d8a242ed6b296421f5673818dcd13376498a
---
R modules/role/files/access_new_install/install_console
M modules/role/manifests/access_new_install.pp
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/325460/1

diff --git a/files/misc/scripts/install_console 
b/modules/role/files/access_new_install/install_console
similarity index 100%
rename from files/misc/scripts/install_console
rename to modules/role/files/access_new_install/install_console
diff --git a/modules/role/manifests/access_new_install.pp 
b/modules/role/manifests/access_new_install.pp
index 98119b7..99e5815 100644
--- a/modules/role/manifests/access_new_install.pp
+++ b/modules/role/manifests/access_new_install.pp
@@ -21,7 +21,7 @@
 mode   => '0555',
 # FIXME - move to module install_server?
 # lint:ignore:puppet_url_without_modules
-source => 'puppet:///files/misc/scripts/install_console',
+source => 'puppet:///modules/role/access_new_install/install_console',
 # lint:endignore
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganeti: move id_dsa.pub from /files to modules/role/file/gan...

2016-12-05 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganeti: move id_dsa.pub from /files to modules/role/file/ganeti/
..

ganeti: move id_dsa.pub from /files to modules/role/file/ganeti/

Change-Id: I7bb7bd64388cb611498c7a91b268682b3d5b82f6
---
R modules/role/files/ganeti/id_dsa.pub
M modules/role/manifests/ganeti.pp
2 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/325461/1

diff --git a/files/ganeti/id_dsa.pub b/modules/role/files/ganeti/id_dsa.pub
similarity index 100%
rename from files/ganeti/id_dsa.pub
rename to modules/role/files/ganeti/id_dsa.pub
diff --git a/modules/role/manifests/ganeti.pp b/modules/role/manifests/ganeti.pp
index d58dfa9..5b90054 100644
--- a/modules/role/manifests/ganeti.pp
+++ b/modules/role/manifests/ganeti.pp
@@ -13,10 +13,7 @@
 ensure => present,
 user   => 'root',
 skey   => 'ganeti',
-# move to ganeti module?
-# lint:ignore:puppet_url_without_modules
-source => 'puppet:///files/ganeti/id_dsa.pub',
-# lint:endignore
+source => 'puppet:///modules/role/ganeti/id_dsa.pub',
 }
 
 # And the private key
@@ -33,9 +30,7 @@
 owner  => 'root',
 group  => 'root',
 mode   => '0400',
-# lint:ignore:puppet_url_without_modules
-source => 'puppet:///files/ganeti/id_dsa.pub',
-# lint:endignore
+source => 'puppet:///modules/role/ganeti/id_dsa.pub',
 }
 
 # If ganeti_cluster fact is not defined, the node has not been added to a

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

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

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

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

2016-12-05 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

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

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

93b916 Submodule update.
  civicrm - Do not give validation error on address with no location_type
ff86662 Alternate fix for reconciliation report doubling some rows.
24480a6 Update thank you letter.
8e05deb Simulate 1000 emails

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/325464/1


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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Alternate fix for reconciliation report doubling some rows.

2016-12-05 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Alternate fix for reconciliation report doubling some rows.
..

Alternate fix for reconciliation report doubling some rows.

The previous fix was to filter fee rows out of the join. That works. But I 
wanted to trial
a bit more and to do so it seemed really useful to be able to see the total in 
the original
currency. Once I tried adding that it showed that the rows were still being 
duplicated,
only the value was blank for the 'wrong' rows. I feel replacing the left join 
with a WHERE
might save confusion later. Also, I think the option of original_amount total 
seems useful.

Bug: T152238
Change-Id: I63e2240da371bd18cb4bc37c9424365cbc27968b
---
M 
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
1 file changed, 17 insertions(+), 7 deletions(-)


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

diff --git 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index 98511e5..b2402f8 100644
--- 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++ 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -107,6 +107,13 @@
 'default' => false,
 'no_display' => true,
 ),
+'original_amount' => array(
+  'title' => ts( 'Original Amount' ),
+  'type' => CRM_Utils_Type::T_MONEY,
+  'statistics' => array(
+'sum' => ts( 'Total Original Amount' ),
+  ),
+),
 'original_currency' => array(
 'title' => ts( 'Original Currency' ),
 'required' => true,
@@ -204,12 +211,6 @@
 }
 
 function from( ) {
-
-$depositFinancialAccountID = civicrm_api3('FinancialAccount', 
'getvalue', array(
-  'return' => 'id',
-  'name' => 'Deposit Bank Account',
-));
-
 $this->_from = <<_aliases['civicrm_contribution']}
 LEFT JOIN wmf_contribution_extra {$this->_aliases['wmf_contribution_extra']}
@@ -221,7 +222,6 @@
 
   LEFT JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']}
 ON {$this->_aliases['civicrm_financial_trxn']}.id = 
entity_financial_trxn_civireport.financial_trxn_id
-AND 
{$this->_aliases['civicrm_financial_trxn']}.to_financial_account_id = 
{$depositFinancialAccountID}
 EOS;
 if ( $this->isTableSelected( 'civicrm_country' ) ) {
 $this->_from .= <<_selectAliases[] = $field['dbAlias'];
 }
 
+function storeWhereHavingClauseArray() {
+  parent::storeWhereHavingClauseArray();
+  $depositFinancialAccountID = civicrm_api3('FinancialAccount', 
'getvalue', array(
+'return' => 'id',
+'name' => 'Deposit Bank Account',
+  ));
+  $this->_whereClauses[] = 
"{$this->_aliases['civicrm_financial_trxn']}.to_financial_account_id = 
{$depositFinancialAccountID}";
+
+}
+
   /**
*
   * Alter display of rows.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: base: Fix puppet URLs in comments
..

base: Fix puppet URLs in comments

Change-Id: I52f01d2ff70668b4d953f21fd4bc8c8998d85e76
---
M modules/base/files/environment/mysql-ps1.sh
M modules/base/files/firewall/main-minimal.conf
M modules/base/files/labs-acct.default
M modules/base/files/logrotate/puppet
M modules/base/files/logrotate/upstart
M modules/base/files/screenrc
M modules/base/files/upstart/ttyS0.conf
7 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/325468/1

diff --git a/modules/base/files/environment/mysql-ps1.sh 
b/modules/base/files/environment/mysql-ps1.sh
index a08c9dd..21c4c95 100644
--- a/modules/base/files/environment/mysql-ps1.sh
+++ b/modules/base/files/environment/mysql-ps1.sh
@@ -1,5 +1,5 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/environment/mysql-ps1.sh
+### puppet:///base/environment/mysql-ps1.sh
 #
 export MYSQL_PS1='mysql:\u@\h [\d]> '
diff --git a/modules/base/files/firewall/main-minimal.conf 
b/modules/base/files/firewall/main-minimal.conf
index d0aeaa2..5e74a94 100644
--- a/modules/base/files/firewall/main-minimal.conf
+++ b/modules/base/files/firewall/main-minimal.conf
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/base/firewall/main-minimal.conf
+ puppet:///base/firewall/main-minimal.conf
 ##
 
 # basic minimal ruleset
diff --git a/modules/base/files/labs-acct.default 
b/modules/base/files/labs-acct.default
index c4014e4..6543cb9 100644
--- a/modules/base/files/labs-acct.default
+++ b/modules/base/files/labs-acct.default
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/labs-acct.default
+### puppet:///base/labs-acct.default
 #
 
 # Defaults for acct
diff --git a/modules/base/files/logrotate/puppet 
b/modules/base/files/logrotate/puppet
index 60c5487..30df976 100644
--- a/modules/base/files/logrotate/puppet
+++ b/modules/base/files/logrotate/puppet
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/logrotate/puppet
+### puppet:///base/logrotate/puppet
 #
 
 /var/log/puppet {
diff --git a/modules/base/files/logrotate/upstart 
b/modules/base/files/logrotate/upstart
index a134531..04b9ebe 100644
--- a/modules/base/files/logrotate/upstart
+++ b/modules/base/files/logrotate/upstart
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/logrotate/puppet
+### puppet:///base/logrotate/upstart
 #
 
 #
diff --git a/modules/base/files/screenrc b/modules/base/files/screenrc
index 1a527eb..154f2a5 100644
--- a/modules/base/files/screenrc
+++ b/modules/base/files/screenrc
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/base/screenrc
+ puppet:///base/screenrc
 ##
 
 #change the hardstatus settings to give an window list at the bottom of the
diff --git a/modules/base/files/upstart/ttyS0.conf 
b/modules/base/files/upstart/ttyS0.conf
index bd683ac..5d89912 100644
--- a/modules/base/files/upstart/ttyS0.conf
+++ b/modules/base/files/upstart/ttyS0.conf
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/base/upstart/ttyS0.conf
+ puppet:///base/upstart/ttyS0.conf
 ##
 #
 # ttyS0 - getty

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: beta: Fix puppet URLs in comments
..

beta: Fix puppet URLs in comments

Change-Id: Ic660030a88730d6d030c80a8ac6a94fd938e6775
---
M modules/beta/files/wmf-beta-update-databases.py
M modules/beta/templates/wmf-beta-autoupdate.py.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/325469/1

diff --git a/modules/beta/files/wmf-beta-update-databases.py 
b/modules/beta/files/wmf-beta-update-databases.py
index 2ddf28f..4ec8bf1 100755
--- a/modules/beta/files/wmf-beta-update-databases.py
+++ b/modules/beta/files/wmf-beta-update-databases.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 ###
 # WARNING: this file is managed by Puppet
-# puppet:///modules/beta/wmf-beta-update-databases.py
+# puppet:///beta/wmf-beta-update-databases.py
 ###
 
 """
diff --git a/modules/beta/templates/wmf-beta-autoupdate.py.erb 
b/modules/beta/templates/wmf-beta-autoupdate.py.erb
index a11da1c..78bc794 100755
--- a/modules/beta/templates/wmf-beta-autoupdate.py.erb
+++ b/modules/beta/templates/wmf-beta-autoupdate.py.erb
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 ###
 # WARNING: this file is managed by Puppet
-# puppet:///modules/beta/wmf-beta-autoupdate.py
+# puppet:///beta/wmf-beta-autoupdate.py.erb
 ###
 
 """

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: extdist: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: extdist: Fix puppet URL in comment
..

extdist: Fix puppet URL in comment

Change-Id: I917c918d849c394008e5a0b71c14b111b36fc5fd
---
M modules/extdist/templates/extdist.nginx.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/extdist/templates/extdist.nginx.erb 
b/modules/extdist/templates/extdist.nginx.erb
index 69558a6..c0548a8 100644
--- a/modules/extdist/templates/extdist.nginx.erb
+++ b/modules/extdist/templates/extdist.nginx.erb
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///templates/extdist.nginx.erb
+ puppet:///extdist/extdist.nginx.erb
 
   Changes to this file will be discarded by Puppet periodically
   and without warning.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: publichtml: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: publichtml: Fix puppet URL in comment
..

publichtml: Fix puppet URL in comment

Change-Id: Ide4030e29e30b9f637769e2b841230e0757dca9d
---
M modules/publichtml/templates/apacheconfig.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/publichtml/templates/apacheconfig.erb 
b/modules/publichtml/templates/apacheconfig.erb
index ac71027..bdccd72 100644
--- a/modules/publichtml/templates/apacheconfig.erb
+++ b/modules/publichtml/templates/apacheconfig.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/publichtml/apacheconfig.erb
+### puppet:///publichtml/apacheconfig.erb
 #
 # vim: filetype=apache
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki_singlenode: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: mediawiki_singlenode: Fix puppet URL in comment
..

mediawiki_singlenode: Fix puppet URL in comment

Change-Id: Ic16b37ee84fd6311268d0f84609ae7616ae845a1
---
M modules/mediawiki_singlenode/templates/labs-localsettings
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/325495/1

diff --git a/modules/mediawiki_singlenode/templates/labs-localsettings 
b/modules/mediawiki_singlenode/templates/labs-localsettings
index 3560e47..22fb49e 100644
--- a/modules/mediawiki_singlenode/templates/labs-localsettings
+++ b/modules/mediawiki_singlenode/templates/labs-localsettings
@@ -1,7 +1,7 @@
 https://gerrit.wikimedia.org/r/325495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ocg: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: ocg: Fix puppet URL in comment
..

ocg: Fix puppet URL in comment

Change-Id: I82ddc68e1e30e1a10dc165c0aa034c6e6862204a
---
M modules/ocg/files/logrotate
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/325496/1

diff --git a/modules/ocg/files/logrotate b/modules/ocg/files/logrotate
index 9bf4576..c182e37 100644
--- a/modules/ocg/files/logrotate
+++ b/modules/ocg/files/logrotate
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/ocg/logrotate
+### puppet:///ocg/logrotate
 #
 
 /srv/deployment/ocg/log/ocg.log {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: gerrit: Fix puppet URL in comment
..

gerrit: Fix puppet URL in comment

Change-Id: I0a222a92cd44518222ca51307fddcdf02dfb3bb7
---
M modules/gerrit/templates/gerrit.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb 
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 209177b..3f4ef71 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/gerrit.wikimedia.org.erb
+### puppet:///gerrit/gerrit.wikimedia.org.erb
 #
 # vim: filetype=apache
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: labstore: Fix puppet URL in comment
..

labstore: Fix puppet URL in comment

Change-Id: Ie518e393d7398621d1a137df01588fa3df40a395
---
M modules/labstore/files/archive-project-volumes
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/325493/1

diff --git a/modules/labstore/files/archive-project-volumes 
b/modules/labstore/files/archive-project-volumes
index 7cd4ab3..ff3f222 100755
--- a/modules/labstore/files/archive-project-volumes
+++ b/modules/labstore/files/archive-project-volumes
@@ -2,7 +2,7 @@
 
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///files/ldap/scripts/archive-managed-projects
+# puppet:///labstore/archive-project-volumes
 #
 """
  Sometimes labs projects are deleted.  When this happens,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ipmi: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: ipmi: Fix puppet URL in comment
..

ipmi: Fix puppet URL in comment

Change-Id: I8f7bccea337c6a9d27dfdd00fdf685cae74c89be
---
M modules/ipmi/files/ipmi_mgmt
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ipmi/files/ipmi_mgmt b/modules/ipmi/files/ipmi_mgmt
index 1a29cac..5806219 100644
--- a/modules/ipmi/files/ipmi_mgmt
+++ b/modules/ipmi/files/ipmi_mgmt
@@ -2,7 +2,7 @@
 
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/ipmi/files/ipmi_mgmt
+### puppet:///ipmi/ipmi_mgmt
 #
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: exim4: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: exim4: Fix puppet URL in comment
..

exim4: Fix puppet URL in comment

Change-Id: I866acfb911699357330fe5ab53a63aa0d46ac546
---
M modules/exim4/templates/exim4.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/325488/1

diff --git a/modules/exim4/templates/exim4.default.erb 
b/modules/exim4/templates/exim4.default.erb
index 1de3dce..2f7c2bc 100644
--- a/modules/exim4/templates/exim4.default.erb
+++ b/modules/exim4/templates/exim4.default.erb
@@ -1,7 +1,7 @@
 # /etc/default/exim4
 #
 ### THIS FILE IS MANAGED BY PUPPET 
-### puppet:///templates/exim/exim4.default.erb
+### puppet:///exim4/exim4.default.erb
 #
 
 EX4DEF_VERSION=''

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: icinga: Fix puppet URL in comment
..

icinga: Fix puppet URL in comment

Change-Id: Ia499197a25518389d140ea93709ab675e52919e1
---
M modules/icinga/files/logrotate.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/325491/1

diff --git a/modules/icinga/files/logrotate.conf 
b/modules/icinga/files/logrotate.conf
index a3cab58..2c2107d 100644
--- a/modules/icinga/files/logrotate.conf
+++ b/modules/icinga/files/logrotate.conf
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/icinga
+### puppet:///icinga/logrotate.conf
 #
 
 /var/log/icinga/icinga.log {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: logstash: Fix puppet URL in comment
..

logstash: Fix puppet URL in comment

Change-Id: I9804aa64f20224914370a4b0fd1faa233e7f0890
---
M modules/logstash/templates/default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/325494/1

diff --git a/modules/logstash/templates/default.erb 
b/modules/logstash/templates/default.erb
index 7f9167c..8d5c575 100644
--- a/modules/logstash/templates/default.erb
+++ b/modules/logstash/templates/default.erb
@@ -1,6 +1,6 @@
 #
 ## THIS FILE IS MANAGED BY PUPPET
-## puppet:///modules/logstash/default
+## puppet:///logstash/default.erb
 #
 
 # Start logstash on boot?

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistats: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: wikistats: Fix puppet URL in comment
..

wikistats: Fix puppet URL in comment

Change-Id: Ie996f9c541c434e9c68270b3b421fa172086fa60
---
M modules/wikistats/templates/apache/wikistats.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/325503/1

diff --git a/modules/wikistats/templates/apache/wikistats.erb 
b/modules/wikistats/templates/apache/wikistats.erb
index 8ef14c5..b2f21d2 100644
--- a/modules/wikistats/templates/apache/wikistats.erb
+++ b/modules/wikistats/templates/apache/wikistats.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/wikistats/templates/apache/wikistats.erb
+### puppet:///wikistats/apache/wikistats.erb
 #
 # vim: filetype=apache
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: rsync: Fix puppet URL in comment
..

rsync: Fix puppet URL in comment

Change-Id: I93a6923f7fa5c2d4404156f451e81f71941a854c
---
M modules/rsync/templates/rsync.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/rsync/templates/rsync.default.erb 
b/modules/rsync/templates/rsync.default.erb
index 7a5ad7c..6756983 100644
--- a/modules/rsync/templates/rsync.default.erb
+++ b/modules/rsync/templates/rsync.default.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/rsync/rsync.default.erb
+### puppet:///rsync/rsync.default.erb
 #
 
 # defaults file for rsync daemon mode

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eventlogging: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: eventlogging: Fix puppet URL in comment
..

eventlogging: Fix puppet URL in comment

Change-Id: I6d71f36133eea6de322d2a225a46f8ea50514821
---
M modules/eventlogging/templates/logrotate.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/325487/1

diff --git a/modules/eventlogging/templates/logrotate.erb 
b/modules/eventlogging/templates/logrotate.erb
index 4a08f11..82e1271 100644
--- a/modules/eventlogging/templates/logrotate.erb
+++ b/modules/eventlogging/templates/logrotate.erb
@@ -1,5 +1,5 @@
 # This file is managed by Puppet.
-# puppet:///modules/eventlogging/logrotate
+# puppet:///eventlogging/logrotate.erb
 # Rotate eventlogging daemon runtime logs
 #
 <%= @log_dir %>/*.log {

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1087"

2016-12-05 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review.

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

Change subject: Revert "db-eqiad.php: Depool db1087"
..

Revert "db-eqiad.php: Depool db1087"

db1087 has finished its ALTER table and it is ready to be pooled back

This reverts commit 0161ae80fea17854c8702694f07d489ae28b2011.

Change-Id: Ib1ecc4446177c1afdbe38868698cf6876211967a
---
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/13/325313/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5905050..c9d6a52 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
'db1082' => 500, # 3.6TB 512GB
-#  'db1087' => 500, # 3.6TB 512GB #T148967
+   'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],
's6' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove remnant files and templates of mha classes

2016-12-05 Thread Tim Landscheidt (Code Review)

Hello Jcrespo,

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

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

to review the following change.

Change subject: Remove remnant files and templates of mha classes
..

Remove remnant files and templates of mha classes

The classes mha::manager and mha::node were removed by
01dd84e894bca81ccdaa688baa7ff4ddf5348fa1, but the associated files and
templates were left behind.  As they are not used anymore, this change
removes them.

Change-Id: Idb7a5649c7ff0e1ad598444f26ad9b33f122ab01
---
D files/mha/master_ip_online_change
D files/mha/mha_site_switch
D modules/role/templates/mha/local.erb
D modules/role/templates/mha/siteswitch.erb
4 files changed, 0 insertions(+), 469 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/325509/1

diff --git a/files/mha/master_ip_online_change 
b/files/mha/master_ip_online_change
deleted file mode 100755
index 3ebcf20..000
--- a/files/mha/master_ip_online_change
+++ /dev/null
@@ -1,274 +0,0 @@
-#!/usr/bin/env perl
-
-#  Copyright (C) 2011 DeNA Co.,Ltd.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#  Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-## Note: This is a sample script and is not complete. Modify the script based 
on your environment.
-##
-## 2013-01 Modified for WMF, currently sets the old-master to read-only prior 
to killing threads
-## and ensures that the new-master is read-only until the slaves have been 
pointed to it. -Asher
-
-use strict;
-use warnings FATAL => 'all';
-
-use Getopt::Long;
-use MHA::DBHelper;
-use MHA::NodeUtil;
-use Time::HiRes qw( sleep gettimeofday tv_interval );
-use Data::Dumper;
-
-my $_tstart;
-my $_running_interval = 0.1;
-my (
-  $command,  $orig_master_host, $orig_master_ip,
-  $orig_master_port, $orig_master_user, $orig_master_password,
-  $new_master_host,  $new_master_ip,$new_master_port,
-  $new_master_user,  $new_master_password
-);
-GetOptions(
-  'command=s'  => \$command,
-  'orig_master_host=s' => \$orig_master_host,
-  'orig_master_ip=s'   => \$orig_master_ip,
-  'orig_master_port=i' => \$orig_master_port,
-  'orig_master_user=s' => \$orig_master_user,
-  'orig_master_password=s' => \$orig_master_password,
-  'new_master_host=s'  => \$new_master_host,
-  'new_master_ip=s'=> \$new_master_ip,
-  'new_master_port=i'  => \$new_master_port,
-  'new_master_user=s'  => \$new_master_user,
-  'new_master_password=s'  => \$new_master_password,
-);
-
-exit ();
-
-sub current_time_us {
-  my ( $sec, $microsec ) = gettimeofday();
-  my $curdate = localtime($sec);
-  return $curdate . " " . sprintf( "%06d", $microsec );
-}
-
-sub sleep_until {
-  my $elapsed = tv_interval($_tstart);
-  if ( $_running_interval > $elapsed ) {
-sleep( $_running_interval - $elapsed );
-  }
-}
-
-sub get_threads_util {
-  my $dbh= shift;
-  my $my_connection_id   = shift;
-  my $running_time_threshold = shift;
-  my $type   = shift;
-  $running_time_threshold = 0 unless ($running_time_threshold);
-  $type   = 0 unless ($type);
-  my @threads;
-
-  my $sth = $dbh->prepare("SHOW PROCESSLIST");
-  $sth->execute();
-
-  while ( my $ref = $sth->fetchrow_hashref() ) {
-my $id = $ref->{Id};
-my $user   = $ref->{User};
-my $host   = $ref->{Host};
-my $command= $ref->{Command};
-my $state  = $ref->{State};
-my $query_time = $ref->{Time};
-my $info   = $ref->{Info};
-$info =~ s/^\s*(.*?)\s*$/$1/ if defined($info);
-next if ( $my_connection_id == $id );
-next if ( defined($query_time) && $query_time < $running_time_threshold );
-next if ( defined($command)&& $command eq "Binlog Dump" );
-next if ( defined($user)   && $user eq "system user" );
-next
-  if ( defined($command)
-  && $command eq "Sleep"
-  && defined($query_time)
-  && $query_time >= 1 );
-
-if ( $type >= 1 ) {
-  next if ( defined($command) && $command eq "Sleep" );
-  next if ( defined($command) && $command eq "Connect" );
-}
-
-if ( $type >= 2 ) {
-  next if ( defined($info) && $info =~ m/^select/i );
-  next if ( defined($info) && $info =~ m/^show/i );
-}
-
-push

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add UI for abusefilter cases in description editing

2016-12-05 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Add UI for abusefilter cases in description editing
..

Add UI for abusefilter cases in description editing

This is a minimal UI for when abusefilters are triggered.
Unlike for page edits, this only shows a validation error text
below the edit text field. No special layout or icons here.

Use uselang parameter to get localized abusefilter error messages.

Bug: T150704
Change-Id: I90f847acffbe521e205fc25e7c54f78c09ca2632
---
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
M app/src/main/java/org/wikipedia/server/mwapi/MwServiceError.java
M app/src/test/java/org/wikipedia/descriptions/DescriptionEditClientTest.java
4 files changed, 39 insertions(+), 18 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
index 268e81b..52cb8e5 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
@@ -23,13 +23,15 @@
 class DescriptionEditClient {
 private static final String ANONYMOUS_TOKEN = "+\\";
 private static final WikiSite WIKI_DATA_SITE = new 
WikiSite("www.wikidata.org", "");
+private static final String ABUSEFILTER_DISALLOWED = 
"abusefilter-disallowed";
+private static final String ABUSEFILTER_WARNING = "abusefilter-warning";
 
 @NonNull private final MwCachedService cachedService
 = new MwCachedService<>(Service.class);
 
 public interface Callback {
 void success(@NonNull Call call);
-void abusefilter(@NonNull Call call, boolean 
disallowed);
+void abusefilter(@NonNull Call call, String info);
 void failure(@NonNull Call call, @NonNull Throwable 
caught);
 }
 
@@ -56,7 +58,7 @@
   final boolean loggedIn,
   @NonNull final Callback cb) {
 
-Call call = service.edit(languageCode, languageCode + 
"wiki",
+Call call = service.edit(languageCode, languageCode, 
languageCode + "wiki",
 pageTitle.getPrefixedText(), description, ANONYMOUS_TOKEN, 
null,
 /* TODO: loggedIn ? "user" : */ null);
 call.enqueue(new retrofit2.Callback() {
@@ -91,10 +93,10 @@
 private void handleError(@NonNull Call call, @NonNull 
DescriptionEdit body,
  @NonNull Callback cb) {
 MwServiceError error = body.getError();
-if (error != null && error.hasMessageName("abusefilter-disallowed")) {
-cb.abusefilter(call, true);
-} else if (error != null && 
error.hasMessageName("abusefilter-warning")) {
-cb.abusefilter(call, false);
+if (error != null && error.hasMessageName(ABUSEFILTER_DISALLOWED)) {
+cb.abusefilter(call, error.getMessageHtml(ABUSEFILTER_DISALLOWED));
+} else if (error != null && error.hasMessageName(ABUSEFILTER_WARNING)) 
{
+cb.abusefilter(call, error.getMessageHtml(ABUSEFILTER_WARNING));
 } else {
 String info = body.info();
 RuntimeException exception = new RuntimeException(info != null
@@ -107,6 +109,7 @@
 @FormUrlEncoded
 @POST("w/api.php?action=wbsetdescription=json")
 Call edit(@NonNull @Field("language") String language,
+   @NonNull @Field("uselang") String useLang,
@NonNull @Field("site") String site,
@NonNull @Field("title") String title,
@NonNull @Field("value") String 
newDescription,
diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
index 74e9e9b..45147d6 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -125,12 +125,9 @@
 }
 
 @Override public void abusefilter(@NonNull 
Call call,
-  boolean disallowed) {
-if (disallowed) {
-// TODO: go to ABUSE_FILTER_DISALLOWED fragment
-} else {
-// TODO: go to ABUSE_FILTER_WARNING fragment
-}
+  String info) {
+

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Move section handling to the LST extension

2016-12-05 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Move section handling to the LST extension
..

Move section handling to the LST extension

 * This works now that ext tag take precedence over block levels.

Change-Id: Ieeb0c55d13ff159f6c1993a6aa229362c93a6e5d
---
M lib/ext/LST/index.js
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
3 files changed, 35 insertions(+), 29 deletions(-)


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

diff --git a/lib/ext/LST/index.js b/lib/ext/LST/index.js
index 698f663..c375916 100644
--- a/lib/ext/LST/index.js
+++ b/lib/ext/LST/index.js
@@ -3,7 +3,11 @@
 var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
 
 var DU = ParsoidExtApi.DOMUtils;
+var Util = ParsoidExtApi.Util;
 var Promise = ParsoidExtApi.Promise;
+var defines = ParsoidExtApi.defines;
+
+var SelfclosingTagTk = defines.SelfclosingTagTk;
 
 // Special case for  until LST is implemented natively.
 var serialHandler = {
@@ -26,15 +30,44 @@
}),
 };
 
+// TODO: Properly handle this.
+// Special handling for wikisource: hide section tags for now.
+// See https://www.mediawiki.org/wiki/Parsoid/HTML_based_LST
+var tokenHandler = function(manager, pipelineOpts, extToken, cb) {
+   var sectionAttribs = [];
+   var sectionType = 'mw:Extension/LabeledSectionTransclusion';
+
+   extToken.getAttribute('options').some(function(kv) {
+   if (kv.k === 'begin' || kv.k === 'end') {
+   sectionType += '/' + kv.k;
+   sectionAttribs.push({ k: 'content', v: kv.v });
+   return true;
+   }
+   });
+   sectionAttribs.push({ k: 'typeof', v: sectionType });
+   sectionAttribs.push({ k: 'data-mw', v: JSON.stringify({ name: "section" 
}) });
+
+   var token = new SelfclosingTagTk('meta', sectionAttribs, {
+   src: extToken.getAttribute('source'),
+   tsr: Util.clone(extToken.dataAttribs.tsr),
+   });
+
+   cb({ tokens: [token] });
+};
+
 // LST constructor
 module.exports = function() {
this.config = {
tags: [
{
-   name: 'labeledSectiontransclusion/begin',
+   name: 'section',
+   tokenHandler: tokenHandler,
+   },
+   {
+   name: 'labeledsectiontransclusion/begin',
serialHandler: serialHandler,
}, {
-   name: 'labeledSectiontransclusion/end',
+   name: 'labeledsectiontransclusion/end',
serialHandler: serialHandler,
},
],
diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index e4eb64c..19cad3b 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -730,31 +730,6 @@
token = "";
}
 
-   if (origToken.name === 'section') {
-   // Special handling for wikisource: hide section tags 
for now
-   // TODO: Properly handle this. See
-   // https://www.mediawiki.org/wiki/Parsoid/HTML_based_LST
-   var sectionType = 
'mw:Extension/LabeledSectionTransclusion';
-   var sectionAttribs = [];
-   origToken.attribs.forEach(function(a) {
-   var content;
-   if (a.k === 'begin') {
-   sectionType += '/begin';
-   content = a.v;
-   } else if (a.k === 'end') {
-   sectionType += '/end';
-   content = a.v;
-   }
-   if (content) {
-   sectionAttribs.push({k: 'content', v: 
content});
-   }
-   });
-   sectionAttribs = [{k: 'typeof', v: 
sectionType}].concat(sectionAttribs);
-   token = new SelfclosingTagTk('meta', sectionAttribs, {
-   src: token,
-   tsr: origToken.tsr,
-   });
-   }
} else {
// Convert attributes to string, if necessary.
// XXX: Likely better done in AttributeTransformManager when 
processing is
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index f9755c6..59af5d7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -22890,8 +22890,6 @@
 
 !!

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use the spec'd extension model for LST

2016-12-05 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Use the spec'd extension model for LST
..

Use the spec'd extension model for LST

 * It's unclear why we have this unconventional representation.

Change-Id: If3df2ea441a9c89409d98b586a40e181047d8f8b
---
M lib/ext/LST/index.js
1 file changed, 8 insertions(+), 43 deletions(-)


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

diff --git a/lib/ext/LST/index.js b/lib/ext/LST/index.js
index c375916..cd1c9ac 100644
--- a/lib/ext/LST/index.js
+++ b/lib/ext/LST/index.js
@@ -9,49 +9,21 @@
 
 var SelfclosingTagTk = defines.SelfclosingTagTk;
 
-// Special case for  until LST is implemented natively.
-var serialHandler = {
-   handle: Promise.method(function(node, state, wrapperUnmodified) {
-   var env = state.env;
-   var typeOf = node.getAttribute('typeof') || '';
-   var dp = DU.getDataParsoid(node);
-   var src;
-   if (dp.src) {
-   src = dp.src;
-   } else if (typeOf.match('begin')) {
-   src = '';
-   } else if (typeOf.match('end')) {
-   src = '';
-   } else {
-   env.log('error', 'LST  without content in: ' + 
node.outerHTML);
-   src = '';
-   }
-   return src;
-   }),
-};
-
 // TODO: Properly handle this.
 // Special handling for wikisource: hide section tags for now.
 // See https://www.mediawiki.org/wiki/Parsoid/HTML_based_LST
 var tokenHandler = function(manager, pipelineOpts, extToken, cb) {
-   var sectionAttribs = [];
-   var sectionType = 'mw:Extension/LabeledSectionTransclusion';
-
-   extToken.getAttribute('options').some(function(kv) {
-   if (kv.k === 'begin' || kv.k === 'end') {
-   sectionType += '/' + kv.k;
-   sectionAttribs.push({ k: 'content', v: kv.v });
-   return true;
-   }
-   });
-   sectionAttribs.push({ k: 'typeof', v: sectionType });
-   sectionAttribs.push({ k: 'data-mw', v: JSON.stringify({ name: "section" 
}) });
-
-   var token = new SelfclosingTagTk('meta', sectionAttribs, {
+   var argDict = Util.getArgInfo(extToken).dict;
+   if (!extToken.dataAttribs.tagWidths[1]) {
+   argDict.body = null;  // Serialize to self-closing.
+   }
+   var token = new SelfclosingTagTk('meta', [
+   { k: 'typeof', v: 'mw:Extension/' + argDict.name },
+   { k: 'data-mw', v: JSON.stringify(argDict) },
+   ], {
src: extToken.getAttribute('source'),
tsr: Util.clone(extToken.dataAttribs.tsr),
});
-
cb({ tokens: [token] });
 };
 
@@ -62,13 +34,6 @@
{
name: 'section',
tokenHandler: tokenHandler,
-   },
-   {
-   name: 'labeledsectiontransclusion/begin',
-   serialHandler: serialHandler,
-   }, {
-   name: 'labeledsectiontransclusion/end',
-   serialHandler: serialHandler,
},
],
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3df2ea441a9c89409d98b586a40e181047d8f8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
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] mediawiki/core[master]: Remove broken apcu_set() calls

2016-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove broken apcu_set() calls
..

Remove broken apcu_set() calls

The method call was misnamed (bogus) and not needed anyway,
since the other BagOStuff classes fail if no key is present.

Change-Id: I726965e665c2d0c5843d8dd33504810d130b9e98
---
M includes/libs/objectcache/APCUBagOStuff.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/325516/1

diff --git a/includes/libs/objectcache/APCUBagOStuff.php 
b/includes/libs/objectcache/APCUBagOStuff.php
index 02b3c92..6e6a3ad 100644
--- a/includes/libs/objectcache/APCUBagOStuff.php
+++ b/includes/libs/objectcache/APCUBagOStuff.php
@@ -72,7 +72,7 @@
if ( apcu_exists( $key . self::KEY_SUFFIX ) ) {
return apcu_inc( $key . self::KEY_SUFFIX, $value );
} else {
-   return apcu_set( $key . self::KEY_SUFFIX, $value );
+   return false;
}
}
 
@@ -85,7 +85,7 @@
if ( apcu_exists( $key . self::KEY_SUFFIX ) ) {
return apcu_dec( $key . self::KEY_SUFFIX, $value );
} else {
-   return apcu_set( $key . self::KEY_SUFFIX, -$value );
+   return false;
}
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I726965e665c2d0c5843d8dd33504810d130b9e98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Change vendor name

2016-12-05 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

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

Change subject: Change vendor name
..

Change vendor name

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


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

diff --git a/composer.json b/composer.json
index 131691b..28a89ae 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-   "name": "wikimedia/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-Genealogy",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36d09ad644ce726f1c1cf715fda6bbe3c90f0c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Fix composer validation errors

2016-12-05 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

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

Change subject: Fix composer validation errors
..

Fix composer validation errors

Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
---
M composer.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/composer.json b/composer.json
index 28a89ae..8115995 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
-   "name": "samwilson/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-genealogy",
+   "description": "A MediaWiki extension that adds a parser function to 
assist with linking between genealogical records",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [Popups] depends on EventLogging

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: [Popups] depends on EventLogging
..

[Popups] depends on EventLogging

Popups has a soft dependency on EventLogging but its unit and
integration tests assume that it's present.

Change-Id: I4b952a539a495b62d4f4b783b305027e9421ce70
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/13/325513/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index d4e5dc9..891bf64 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -146,7 +146,7 @@
 'PhpTagsWiki': ['PhpTags', 'PhpTagsFunctions'],
 'PictureGame': ['SocialProfile'],
 'PollNY': ['SocialProfile'],
-'Popups': ['BetaFeatures', 'TextExtracts', 'PageImages'],
+'Popups': ['BetaFeatures', 'TextExtracts', 'PageImages', 'EventLogging'],
 'PronunciationRecording': ['UploadWizard'],
 'ProofreadPage': ['LabeledSectionTransclusion', 'VisualEditor'],
 'QuickSurveys': ['EventLogging'],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off duplicate key reporting for parser cache (2)

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Turn off duplicate key reporting for parser cache (2)
..


Turn off duplicate key reporting for parser cache (2)

Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a9d3fdd..456938b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -341,6 +341,7 @@
'purgePeriod' => 0,
'tableName' => 'pc',
'shards' => 256,
+   'reportDupes' => false
],
],
'replication' => 'async',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off duplicate key reporting for parser cache (2)

2016-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Turn off duplicate key reporting for parser cache (2)
..

Turn off duplicate key reporting for parser cache (2)

Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a9d3fdd..456938b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -341,6 +341,7 @@
'purgePeriod' => 0,
'tableName' => 'pc',
'shards' => 256,
+   'reportDupes' => false
],
],
'replication' => 'async',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Fix composer validation errors

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix composer validation errors
..


Fix composer validation errors

Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
---
M composer.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 28a89ae..8115995 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
-   "name": "samwilson/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-genealogy",
+   "description": "A MediaWiki extension that adds a parser function to 
assist with linking between genealogical records",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1087"

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db1087"
..


Revert "db-eqiad.php: Depool db1087"

db1087 has finished its ALTER table and it is ready to be pooled back

This reverts commit 0161ae80fea17854c8702694f07d489ae28b2011.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5905050..c9d6a52 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
'db1082' => 500, # 3.6TB 512GB
-#  'db1087' => 500, # 3.6TB 512GB #T148967
+   'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],
's6' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove obsolete PPA key files

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Remove obsolete PPA key files
..

Remove obsolete PPA key files

These files were used to set up apt to source from PPAs and are no
longer in use.

Change-Id: Ib604af36b9e8b73fa0cbae7dc9bf7ee0522ad50f
---
D files/ppa/2085FE8D.key
D files/ppa/2A2356C9.key
D files/ppa/3D1B4472.key
D files/ppa/AA8F5DAB.key
4 files changed, 0 insertions(+), 50 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/325510/1

diff --git a/files/ppa/2085FE8D.key b/files/ppa/2085FE8D.key
deleted file mode 100644
index a64ae3b..000
--- a/files/ppa/2085FE8D.key
+++ /dev/null
@@ -1,12 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: SKS 1.0.10
-
-mI0ETTQqsgEEAKw4CQlBUH/RBNJCxkDDRirYEJO2nccX49jYBF1MOMTNkVejMP6UbNzRksse
-IIjZMcriuQiqmjq1qYJ8JXx5vrakAUALZRIM851m3CD1w/2waoYZNmUlfdtfeME5ny50rGz5
-FXFfKZrXfg4IMQdTYC7lq+oL1JLjzjVdFnQ4iOrxABEBAAG0HUxhdW5jaHBhZCBQUEEgZm9y
-IEdsYW5jZSBDb3JliLgEEwECACIFAk00KrICGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheA
-AAoJEK3PShoghf6N/A4EAJG3VPu5JX9WXnM0Np6GtAv4k1T3W1DqpyxhsoVlzfAbqVOLvQN+
-vb7E4lOekvvB66YXOPr7HbKFETgaLmqo5o1NoGc1IYg1XTwlGFB1aLP0KLKxNCsnworDKMcF
-+X2fgZoWqR1voprXckB+fVIVFMb0lof+A9bqMANegEMtrhdl
-=DfOR
--END PGP PUBLIC KEY BLOCK-
diff --git a/files/ppa/2A2356C9.key b/files/ppa/2A2356C9.key
deleted file mode 100644
index a6e880f..000
--- a/files/ppa/2A2356C9.key
+++ /dev/null
@@ -1,12 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: SKS 1.0.10
-
-mI0ETD/6ogEEAK8f9PI2Kbo5HVjECg90+mQTzflD6ApY5ahT9NE+G5LYjvNRYMUInZp9OB7G
-KwfFye3Cek5XxFG5QehTQfl5WPKgw+kyLqxGS82oPO1NbpAnDgY/+OeNJL+LzAZc+MkQJd4f
-FH9CUnVg3yGg8hR9sV05MtOrhqDU1qDVmXTQxCLJABEBAAG0F0xhdW5jaHBhZCBOb3ZhIFBh
-Y2thZ2VziLYEEwECACAFAkw/+qICGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAeuj03
-KiNWyYQXBACQicvIZ25lsYR93QRBlc0siBoc6ZI7i8vD0BNEz760o4eYmtTIDYXjUqAIt4+l
-LKrJtIdYaxmHuEThLhkxnmwUTygkKwW+/i2mxNBLDhY6EwNHPKHUkR6qqgP/2uzHbqYmx1R+
-oyWH/V4z8J977xV/FJ37TraD3AJfnfeZRw71Gg==
-=+1Wm
--END PGP PUBLIC KEY BLOCK-
diff --git a/files/ppa/3D1B4472.key b/files/ppa/3D1B4472.key
deleted file mode 100644
index 979a04b..000
--- a/files/ppa/3D1B4472.key
+++ /dev/null
@@ -1,12 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: SKS 1.0.10
-
-mI0ETe+FMQEEALsSsqhs28qhedNb46WOPe56cTcbd4Ozvq5w3a+CCP2YXpHpwPbRZJB4n/8u
-Xs9MI2oxP83DX65vfhMD+yFGh4aPMQNKO0tkTwoX3ouHw1F5IOvsk1kmeCHvxBkkgsOHpvYP
-psswT8VfmotVmMdzBunqeJmIkPCdw7op7VzCmMgnABEBAAG0KExhdW5jaHBhZCBQUEEgZm9y
-IE9wZW5TdGFjayByZWxlYXNlIHRlYW2IuAQTAQIAIgUCTe+FMQIbAwYLCQgHAwIGFQgCCQoL
-BBYCAwECHgECF4AACgkQfSHC7D0bRHIWGAP/WYXu6yZFmQLbV7Xl01YQH49jUkaKNn2Akc/X
-oGkHj4NZlS/byRqZC5p4lP58RgaQ5w7wZyFyjAe3q8UTK3Bq7uGnMDWOfvNNUApKsViOGkVE
-nJ747MA1MpHuJfx6VuNy7mcNRX+fhcscFQKaQQeBxj9leXYPr8clJAaqZ3Dnc5o=
-=RxF5
--END PGP PUBLIC KEY BLOCK-
diff --git a/files/ppa/AA8F5DAB.key b/files/ppa/AA8F5DAB.key
deleted file mode 100644
index 394eb9c..000
--- a/files/ppa/AA8F5DAB.key
+++ /dev/null
@@ -1,14 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mI0ET0tiawEEAOBJv3hnX+BgdsRzSrbLbcIZ8/ViGE+hP+0znB40PNobJ1izPCah
-9dKAw88oAvSvYmu0s/4YARBbHDtpMiLuNFYD2yXT2Z44HI2VTXEjUpGsDdNLo20G
-l5JMG1F/azyyjRGlUL1UHBsfEi0LC2w29glKjUGxDL7//0Y/muZCwOd9ABEBAAG0
-K0xhdW5jaHBhZCBQUEEgZm9yIE9wZW5TdGFjayBQUEEgbWFpbnRhaW5lcnOIuAQT
-AQIAIgUCT0tiawIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQoYakrqqP
-XauHzgP/TNk+ztxixp7Gt/Me/2r9FJ+MSb4dTphuWHa8dQPTeBZokK7zjz406ux9
-TMmTUAJwaZ4UR4+a+p696YixRQqPW0Pi24zNxPYDJIqT8DB+x5JA8PnzXBSVVGsv
-s83hFmLjmg5y4Y3Ej27I7k/VhAbsRhTBV+Lh3OI9JSGZplyyOLU=
-=g6id
--END PGP PUBLIC KEY BLOCK-
-

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Change vendor name

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Change vendor name
..


Change vendor name

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

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



diff --git a/composer.json b/composer.json
index 131691b..28a89ae 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-   "name": "wikimedia/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-Genealogy",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36d09ad644ce726f1c1cf715fda6bbe3c90f0c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add inflected forms of sitename on Finnish Wikivoyage

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add inflected forms of sitename on Finnish Wikivoyage
..


Add inflected forms of sitename on Finnish Wikivoyage

Bug: T152376
Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10
---
M WikimediaMessages.hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 61282b3..f7442ea 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -825,26 +825,31 @@
'Wikiuutiset' => 'Wikiuutisten',
'Wikisitaatit' => 'Wikisitaattien',
'Wikimedia Suomi' => 'Wikimedia Suomen',
+   'Wikimatkat' => 'Wikimatkojen',
),
'partitive' => array(
'Wikiuutiset' => 'Wikiuutisia',
'Wikisitaatit' => 'Wikisitaatteja',
'Wikimedia Suomi' => 'Wikimedia Suomea',
+   'Wikimatkat' => 'Wikimatkoja',
),
'elative' => array(
'Wikiuutiset' => 'Wikiuutisista',
'Wikisitaatit' => 'Wikisitaateista',
'Wikimedia Suomi' => 'Wikimedia Suomesta',
+   'Wikimatkat' => 'Wikimatkoista',
),
'inessive' => array(
'Wikiuutiset' => 'Wikiuutisissa',
'Wikisitaatit' => 'Wikisitaateissa',
'Wikimedia Suomi' => 'Wikimedia Suomessa',
+   'Wikimatkat' => 'Wikimatkoissa',
),
'illative' => array(
'Wikiuutiset' => 'Wikiuutisiin',
'Wikisitaatit' => 'Wikisitaatteihin',
'Wikimedia Suomi' => 'Wikimedia Suomeen',
+   'Wikimatkat' => 'Wikimatkoihin',
),
); # fi
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Stryn 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: WIP add dash to crm role

2016-12-05 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

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

Change subject: WIP add dash to crm role
..

WIP add dash to crm role

Suffering from unrelated vagrant provision error:

Error: Could not prefetch package provider 'pip': [nil, nil, nil, nil,
nil, nil, nil, nil, nil, nil, nil]

Only web suggestion was `easy_install pip` which didn't help.

Bug: T99869
Change-Id: I11bbb03e62c844b4abfccb5155b43bbbef969098
---
A puppet/modules/crm/manifests/dash.pp
M puppet/modules/crm/manifests/init.pp
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/15/325515/1

diff --git a/puppet/modules/crm/manifests/dash.pp 
b/puppet/modules/crm/manifests/dash.pp
new file mode 100644
index 000..faf058c
--- /dev/null
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -0,0 +1,13 @@
+# == Class: crm::dash
+#
+# Fundraising dashboard
+#
+class crm::dash (
+) {
+include ::crm
+
+git::clone { 'dash':
+directory => "/srv/dash",
+remote => "g...@github.com:wikimedia/wikimedia-fundraising-dash.git"
+}
+}
diff --git a/puppet/modules/crm/manifests/init.pp 
b/puppet/modules/crm/manifests/init.pp
index df53a6c..6260902 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -37,6 +37,7 @@
 include ::postfix
 include ::crm::apache
 include ::crm::civicrm
+include ::crm::dash
 include ::crm::tools
 include ::activemq
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11bbb03e62c844b4abfccb5155b43bbbef969098
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Don't worry about recursive redirects, just use one

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Don't worry about recursive redirects, just use one
..


Don't worry about recursive redirects, just use one

The Person's title was following any number of redirects, but as
this optimisation is already done in the database it's not
required.

Change-Id: I5a598cc4e71a6d27c64fafae8cc2c0d881d39aeb
---
M src/Person.php
1 file changed, 2 insertions(+), 2 deletions(-)

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

Objections:
  Legoktm: There's a problem with this change, please improve



diff --git a/src/Person.php b/src/Person.php
index 8dfbb51..a794c05 100644
--- a/src/Person.php
+++ b/src/Person.php
@@ -51,8 +51,8 @@
 */
public function getTitle() {
$page = WikiPage::factory( $this->title );
-   while ( $page->isRedirect() ) {
-   $page = WikiPage::factory( $page->getRedirectTarget() );
+   if ( $page->isRedirect() ) {
+   return $page->getRedirectTarget();
}
return $page->getTitle();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a598cc4e71a6d27c64fafae8cc2c0d881d39aeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-05T10:00:01+0000

2016-12-05 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2016-12-05T10:00:01+
..

New Wikidata Build - 2016-12-05T10:00:01+

Change-Id: Ie530d000496f608ddee2a04d40cfa1a5914e24bd
---
M composer.lock
A extensions/Wikibase/client/i18n/sty.json
M extensions/Wikibase/repo/i18n/ast.json
M vendor/composer/installed.json
4 files changed, 30 insertions(+), 19 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index d188793..f55d5e1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a"
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b946b675e628dcb586bcef000a96a81f652c164a;,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b80daa060e9dc6e6d98920203a128362a9150517;,
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517",
 "shasum": ""
 },
 "require": {
@@ -1662,7 +1662,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-12-02 21:21:23"
+"time": "2016-12-04 21:41:34"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/sty.json 
b/extensions/Wikibase/client/i18n/sty.json
new file mode 100644
index 000..f3b6ea6
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/sty.json
@@ -0,0 +1,11 @@
+{
+   "@metadata": {
+   "authors": [
+   "Khanmarat"
+   ]
+   },
+   "tooltip-t-wikibase": "Мәғлүмәтле репозиторийтағы пәйләнкән элементҡа 
ссылка",
+   "wikibase-dataitem": "{{WBREPONAME}}ның элементы",
+   "wikibase-editlinks": "Ссылкаларны төсәткәле",
+   "wikibase-editlinkstitle": "Пашҡа телләртәге ссылкаларны төсәткәле"
+}
diff --git a/extensions/Wikibase/repo/i18n/ast.json 
b/extensions/Wikibase/repo/i18n/ast.json
index 84c736c..57d639a 100644
--- a/extensions/Wikibase/repo/i18n/ast.json
+++ b/extensions/Wikibase/repo/i18n/ast.json
@@ -386,7 +386,7 @@
"apihelp-wbformatvalue-param-datatype": "El tipu de datu del valor. 
Esto ye diferente del tipu del valor",
"apihelp-wbformatvalue-param-datavalue": "Los datos a los que dar 
formatu. Esto tien que ser la serialización JSON d'un oxetu DataValue.",
"apihelp-wbformatvalue-param-options": "Les opciones que tien d'usar el 
formateador. Daes como oxetu JSON.",
-   "apihelp-wbformatvalue-param-property": "Id de propiedá a la que 
pertenez el valor de los datos, tendría d'usase en llugar del parámetru 
datatype.",
+   "apihelp-wbformatvalue-param-property": "ID de la propiedá a la que 
pertenez el valor de los datos, tendría d'usase en llugar del parámetru 
datatype.",
"apihelp-wbformatvalue-example-1": "Da formatu a un valor simple de 
cadena de testu.",
"apihelp-wbformatvalue-example-2": "Da formatu a un valor de cadena de 
testu como URL en HTML.",
"apihelp-wbgetclaims-description": "Recibe afirmaciones de Wikibase.",
@@ -421,12 +421,12 @@
"apihelp-wbgetentities-example-10": "Algamar l'elementu pa la páxina 
«Berlin» del sitiu \"enwiki\", colos atributos de llingua del idioma inglés",
"apihelp-wbgetentities-example-11": "Algamar l'elementu de la páxina 
«Berlin» del sitiu \"enwiki\" después de normalizar el títulu dende «berlin»",
"apihelp-wbgetentities-example-12": "Algamar los enllaces de sitiu del 
elementu Q42",
-   "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42 
amosando sólo los enllaces d'enwiki",
+   "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42 
amosando sólo los enllaces d'\"enwiki\"",
"apihelp-wblinktitles-description": "Asocia dos artículos de dos wikis 
diferentes con un elementu de Wikibase.",
-   "apihelp-wblinktitles-param-tosite": "Un identificador pal sitiu onde 
ta allugada la páxina.\nÚsalu xunto con 'totitle' pa facer un enllaz completu 
del sitiu.",
-   "apihelp-wblinktitles-param-totitle": "Títulu de la páxina a 
asociar.\nÚsalo xunto con 'tosite' pa crear un enllaz completu del sitiu.",
-   "apihelp-wblinktitles-param-fromsite": "Un identificador pal sitiu nel 
que ta asitiada la páxina.\nÚsalo xunto con 'fromtitle' pa crear un enllaz

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Update oozie articleplaceholder_metrics to refinery-job-0.0....

2016-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Update oozie articleplaceholder_metrics to 
refinery-job-0.0.38.jar
..

Update oozie articleplaceholder_metrics to refinery-job-0.0.38.jar

Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
---
M oozie/wikidata/articleplaceholder_metrics/coordinator.properties
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/72/325272/1

diff --git a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties 
b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
index ca6e187..0d202eb 100644
--- a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
+++ b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
@@ -49,7 +49,7 @@
 spark_master  = yarn
 spark_deploy  = cluster
 spark_assembly_jar= 
${name_node}/user/spark/share/lib/spark-assembly.jar
-spark_job_jar = 
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.33.jar
+spark_job_jar = 
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.38.jar
 spark_job_class   = 
org.wikimedia.analytics.refinery.job.WikidataArticlePlaceholderMetrics
 spark_job_name= wikidata_articleplaceholder_metrics
 spark_additional_files= ${name_node}/user/hive/hive-site.xml

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb-replica: Disable parallel replication

2016-12-05 Thread Marostegui (Code Review)

Marostegui has submitted this change and it was merged.

Change subject: labsdb-replica: Disable parallel replication
..


labsdb-replica: Disable parallel replication

As we have done in sanitarium, we should disable parallel replication
in the labs servers.

Bug: T152194
Change-Id: I8c98ae4eb91bd2c93036a2469b7262ae047f5ead
---
M templates/mariadb/labsdb-replica.my.cnf.erb
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/templates/mariadb/labsdb-replica.my.cnf.erb 
b/templates/mariadb/labsdb-replica.my.cnf.erb
index a6fa163..dfe8f39 100644
--- a/templates/mariadb/labsdb-replica.my.cnf.erb
+++ b/templates/mariadb/labsdb-replica.my.cnf.erb
@@ -34,6 +34,10 @@
 log_bin
 log_slave_updates
 
+slave_parallel_mode= none
+slave_parallel_threads = 0
+slave_parallel_max_queued  = 16M
+
 skip-external-locking
 skip-name-resolve
 temp-pool

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Create import sources list for hsbwiki

2016-12-05 Thread Urbanecm (Code Review)

Urbanecm has uploaded a new change for review.

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

Change subject: Create import sources list for hsbwiki
..

Create import sources list for hsbwiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d81235e..c07d132 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10768,6 +10768,7 @@
'hiwikiquote' => [ 'w', 'w:en', 'w:sa', 'q:en', 'q:gu', 'q:sa', 'meta', 
'mw' ], // T127593
'hiwiktionary' => [ 'commons', 'meta', 'w', 'q', 'b', 'species', 
'w:en', 'b:en', 'q:en', 's:en', 'v:en', 'voy:en', 'w:es', 'w:fa', 'w:fr', 
'w:ml', 'w:ne', 'w:nl', 'w:ro', 'w:ru', 'w:pl', 'w:pt', 'w:simple', 'w:ta', 
'w:ur', 'w:mr', 'w:gu', 'w:bh', 'en', 'mg', 'fr', 'es', 'zh', 'ru', 'it', 'pl', 
'sv', 'ku', 'el', 'nl', 'de', 'ko', 'it', 'tr', 'ta', 'hu', 'fi', 'kn', 'ja', 
'ml', 'my', 'or', 'te', 'fa', 'gu', 'ar', 'th', 'ps', 'simple', 'sw' ], // 
T132417
'hifwiki' => [ 'incubator', 'commons', 'meta', 'species', 'bh', 'de', 
'en', 'en:b', 'en:q', 'en:n', 'en:s', 'en:v', 'el', 'es', 'fa', 'fr', 'hi', 
'ml', 'ne', 'nl', 'ro', 'ru', 'pa', 'pl', 'pt', 'simple', 'te', 'ta', 'ur' ], 
// T99826
+   'hsbwiki' => [ 'de', 'dsb', 'en', 'cs', 'pl', 'ru', 'hr', 'sr', 'sh' ], 
// T152382
'hsbwiktionary' => [ 'incubator', 'w' ],
'huwikinews' => [ 'incubator' ],
'idwiki' => [ 'ms' ], // T18033

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1082"

2016-12-05 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review.

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

Change subject: Revert "db-eqiad.php: Depool db1082"
..

Revert "db-eqiad.php: Depool db1082"

db1082 finished the ALTER table and it is ready to go back in the pool

This reverts commit 0881436365874ead7134427e149d09e7409147e8.

Change-Id: Ifcdff4b21002357f9b43aa16ad674a78450c6313
---
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/77/325277/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d29353e..c9d6a52 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -144,7 +144,7 @@
'db1045' => 0,   # 1.4TB  64GB, vslow, dump
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
-#  'db1082' => 500, # 3.6TB 512GB  #T148967
+   'db1082' => 500, # 3.6TB 512GB
'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Send secondary DNS recursor IP from labs DHCP

2016-12-05 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Send secondary DNS recursor IP from labs DHCP
..

Send secondary DNS recursor IP from labs DHCP

Bug: T137460
Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
---
M modules/openstack/manifests/nova/network.pp
M modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
M modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
3 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/325278/1

diff --git a/modules/openstack/manifests/nova/network.pp 
b/modules/openstack/manifests/nova/network.pp
index 72aeacb..34442ba 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -38,6 +38,7 @@
 $dnsconfig = hiera_hash('labsdnsconfig', {})
 $labs_metal = hiera('labs_metal',{})
 $recursor_ip = ipresolve($dnsconfig['recursor'],4)
+$recursor_secondary_ip = ipresolve($dnsconfig['recursor_secondary'],4)
 file { '/etc/dnsmasq-nova.conf':
 content => 
template("openstack/${openstack_version}/nova/dnsmasq-nova.conf.erb"),
 owner   => 'root',
diff --git a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb 
b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
 <% end -%>
 
 #Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
 
 dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%= 
scope.function_ipresolve([@tftp_host, 4]) %>
 
diff --git a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb 
b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
 <% end -%>
 
 #Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
 
 dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%= 
scope.function_ipresolve([@tftp_host, 4]) %>
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
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] operations/puppet[production]: Revert "eventlogging_sync: By pass ssl check on localhost"

2016-12-05 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: Revert "eventlogging_sync: By pass ssl check on localhost"
..

Revert "eventlogging_sync: By pass ssl check on localhost"

This reverts commit b6a8100080559648d07a554e8ee2e39bf751fff0.

Change-Id: Iae16a1cea9343b8bf186bd258d115ac9402241ca
---
M files/mariadb/eventlogging_sync.sh
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/325279/1

diff --git a/files/mariadb/eventlogging_sync.sh 
b/files/mariadb/eventlogging_sync.sh
index 339e026..8dc433f 100755
--- a/files/mariadb/eventlogging_sync.sh
+++ b/files/mariadb/eventlogging_sync.sh
@@ -19,9 +19,9 @@
 mhost='m4-master.eqiad.wmnet'
 shost="localhost"
 
-slave="mysql -h $shost --compress --skip-column-names --skip-ssl"
-master="mysql -h $mhost --compress --skip-column-names --skip-ssl"
-dump="mysqldump --skip-ssl -h $mhost --skip-opt --single-transaction --quick 
--skip-triggers"
+slave="mysql -h $shost --compress --skip-column-names"
+master="mysql -h $mhost --compress --skip-column-names"
+dump="mysqldump -h $mhost --skip-opt --single-transaction --quick 
--skip-triggers"
 dumpdata="$dump --no-create-info --insert-ignore --extended-insert --compress 
--hex-blob"
 querytables="select table_name from information_schema.tables where 
table_schema = '$db' and table_name"
 # select this many rows per table at a time

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Lockdown[master]: Convert to use "Extension Registration" (MW 1.25+)

2016-12-05 Thread FreedomFighterSparrow (Code Review)

FreedomFighterSparrow has uploaded a new change for review.

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

Change subject: Convert to use "Extension Registration" (MW 1.25+)
..

Convert to use "Extension Registration" (MW 1.25+)

https://www.mediawiki.org/wiki/Manual:Extension_registration#Migration_for_extension_developers

Change-Id: I1d03c0c07e1094bed1e63c68ea3601f4afa3f626
---
D Lockdown.i18n.php
D Lockdown.php
A LockdownHooks.php
M README
A extension.json
M install.settings
6 files changed, 257 insertions(+), 260 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lockdown 
refs/changes/81/325281/1

diff --git a/Lockdown.i18n.php b/Lockdown.i18n.php
deleted file mode 100644
index 816658b..000
--- a/Lockdown.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( 'wfJsonI18nShimc61c7aea6122cc77' ) ) {
-   function wfJsonI18nShimc61c7aea6122cc77( $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'][] = 
'wfJsonI18nShimc61c7aea6122cc77';
-}
diff --git a/Lockdown.php b/Lockdown.php
deleted file mode 100644
index 3632364..000
--- a/Lockdown.php
+++ /dev/null
@@ -1,222 +0,0 @@
- may work in some versions of 
mediawiki. Same with diff, etc.
-*
-* NOTE: you cannot GRANT access to things forbidden by $wgGroupPermissions. 
You can only DENY access
-* granted there.
-*/
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This file is an extension to the MediaWiki software and cannot 
be used standalone.\n" );
-   die( 1 );
-}
-
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'Lockdown',
-   'author' => array(
-   'Daniel Kinzler',
-   'Platonides'
-   ),
-   'url' => 'https://mediawiki.org/wiki/Extension:Lockdown',
-   'descriptionmsg' => 'lockdown-desc',
-   'license-name' => 'GPL-2.0+'
-);
-
-$wgMessagesDirs['Lockdown'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Lockdown'] = __DIR__ . '/Lockdown.i18n.php';
-$wgNamespacePermissionLockdown = array();
-$wgSpecialPageLockdown = array();
-$wgActionLockdown = array();
-
-$wgHooks['getUserPermissionsErrors'][] = 'lockdownUserPermissionsErrors';
-$wgHooks['MediaWikiPerformAction'][] = 'lockdownMediawikiPerformAction';
-$wgHooks['SearchableNamespaces'][] = 'lockdownSearchableNamespaces';
-$wgHooks['SearchGetNearMatchComplete'][] = 
'lockdownSearchGetNearMatchComplete';
-
-/**
- * @param Title $title
- * @param User $user
- * @param string $action
- * @param MessageSpecifier|array|string|bool|null $result
- * @return bool
- */
-function lockdownUserPermissionsErrors(
-   Title $title,
-   User $user,
-   $action,
-   &$result = null
-) {
-   global $wgNamespacePermissionLockdown, $wgSpecialPageLockdown, 
$wgWhitelistRead, $wgLang;
-
-   $result = null;
-
-   // don't impose extra restrictions on UI pages
-   if ( $title->isCssJsSubpage() ) {
-   return true;
-   }
-
-   if ( $action == 'read' && is_array( $wgWhitelistRead ) ) {
-   // don't impose read restrictions on whitelisted pages
-   if ( in_array( $title->getPrefixedText(), $wgWhitelistRead ) ) {
-   return true;
-   }
-   }
-
-   $groups = null;
-   $ns = $title->getNamespace();
-   if ( NS_SPECIAL == $ns ) {
-   foreach ( $wgSpecialPageLockdown as $page => $g ) {
-   if (

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Avoid using CONTENT_MODEL_FLOW_BOARD

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Avoid using CONTENT_MODEL_FLOW_BOARD
..


Avoid using CONTENT_MODEL_FLOW_BOARD

This constant won't be defined any more once Flow switches to extension.json

Change-Id: I7f2a2bad53023a53415487e9340fcd7b8a81501f
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 187a03d..2e311e6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2749,7 +2749,7 @@
}
 
foreach ( $wmgFlowNamespaces as $namespace ) {
-   $wgNamespaceContentModels[$namespace] = 
CONTENT_MODEL_FLOW_BOARD;
+   $wgNamespaceContentModels[$namespace] = 'flow-board'; // 
CONTENT_MODEL_FLOW_BOARD
}
// Requires that Parsoid is available for all wikis using Flow.
$wgFlowContentFormat = 'html';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f2a2bad53023a53415487e9340fcd7b8a81501f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/private[master]: Add fake passwords for labspuppet and labsdbaccounts databases

2016-12-05 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged.

Change subject: Add fake passwords for labspuppet and labsdbaccounts databases
..


Add fake passwords for labspuppet and labsdbaccounts databases

Bug: T152377
Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
---
M modules/passwords/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 9c3f016..a5398f8 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -484,3 +484,11 @@
 $user = 'notsecret'
 $db_pass = 'notsecret'
 }
+
+class passwords::labspuppet {
+$db_password = 'notsecret'
+}
+
+class passwords::labsdbaccounts {
+$db_password = 'notsecret'
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Use camel case for statsd metric names

2016-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Use camel case for statsd metric names
..

Use camel case for statsd metric names

Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
---
M includes/specials/SpecialCreateTopicPage.php
M 
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
M 
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder 
refs/changes/82/325282/1

diff --git a/includes/specials/SpecialCreateTopicPage.php 
b/includes/specials/SpecialCreateTopicPage.php
index 167bd83..2288a40 100644
--- a/includes/specials/SpecialCreateTopicPage.php
+++ b/includes/specials/SpecialCreateTopicPage.php
@@ -28,7 +28,7 @@
$this->setHeaders();
if ( $this->getRequest()->getVal( 'ref' ) === 'button' ) {
$statsd = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   $statsd->increment( 
'wikibase.articleplaceholder.button.create-article' );
+   $statsd->increment( 
'wikibase.articleplaceholder.button.createArticle' );
}
$page = $this->getRequest()->getVal( 'wptitleinput', $par );
if ( $page === '' || $page === null ) {
diff --git 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
index bd8f55d..7ed4baa 100644
--- 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
+++ 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
@@ -41,7 +41,7 @@
return 
CreateArticleTranslationDialog.super.prototype.onSubmit.apply( this );
}
 
-   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.translate-article' );
+   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.translateArticle' );
 
mw.loader.using( 'ext.cx.sitemapper' ).then( function () {
document.location.href = 
mw.cx.SiteMapper.prototype.getCXUrl(
diff --git 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
index 4ea6b57..b0264d4 100644
--- 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
+++ 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
@@ -19,7 +19,7 @@
windowManager.addWindows( [ dialog ] );
 
OO.ui.infuse( 'new-article-button' ).on( 'click', function () {
-   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.create-article' );
+   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.createArticle' );
windowManager.openWindow( dialog );
} );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Update oozie articleplaceholder_metrics to refinery-job-0.0....

2016-12-05 Thread Joal (Code Review)

Joal has submitted this change and it was merged.

Change subject: Update oozie articleplaceholder_metrics to 
refinery-job-0.0.38.jar
..


Update oozie articleplaceholder_metrics to refinery-job-0.0.38.jar

Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
---
M oozie/wikidata/articleplaceholder_metrics/coordinator.properties
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties 
b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
index ca6e187..0d202eb 100644
--- a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
+++ b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
@@ -49,7 +49,7 @@
 spark_master  = yarn
 spark_deploy  = cluster
 spark_assembly_jar= 
${name_node}/user/spark/share/lib/spark-assembly.jar
-spark_job_jar = 
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.33.jar
+spark_job_jar = 
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.38.jar
 spark_job_class   = 
org.wikimedia.analytics.refinery.job.WikidataArticlePlaceholderMetrics
 spark_job_name= wikidata_articleplaceholder_metrics
 spark_additional_files= ${name_node}/user/hive/hive-site.xml

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Joal 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Update check private data script to handle BINARY f...

2016-12-05 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged.

Change subject: mariadb: Update check private data script to handle BINARY 
fields
..


mariadb: Update check private data script to handle BINARY fields

We need to trim \0 (unicode/asci code 0), as BINARY fields store
empty string values as \0\0\0... n times, being n the width of the
binary field.

Bug: T152194
Change-Id: I744ba0fd8c1448760b9a71f7b1dc4af75aba22b1
---
M modules/role/files/mariadb/check_private_data.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/files/mariadb/check_private_data.py 
b/modules/role/files/mariadb/check_private_data.py
index 341505b..769be5a 100644
--- a/modules/role/files/mariadb/check_private_data.py
+++ b/modules/role/files/mariadb/check_private_data.py
@@ -120,8 +120,8 @@
 query = ("SELECT count(*)"
  " FROM `{}`.`{}`"
  " WHERE IF(`{}` IS NULL, 0,"
- "  `{}` NOT IN ('0', ''))").format(database, table,
-column, column)
+ "  TRIM(LEADING '\0' FROM `{}`) NOT IN ('0', ''))")
+query = query.format(database, table, column, column)
 cursor.execute(query)
 result = cursor.fetchall()
 if int(result[0][0]) > 0:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I744ba0fd8c1448760b9a71f7b1dc4af75aba22b1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Improving CSS linting

2016-12-05 Thread Jdrewniak (Code Review)

Jdrewniak has uploaded a new change for review.

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

Change subject: Improving CSS linting
..

Improving CSS linting

[WIP] should throw stylelint errors in CI.

Catching all postCSS compile errors
now in addition to stylelint errors.

Removing the tests/lint.js script and trying
to run gulp from packages.json instead.

Change-Id: Id728d96e0935bdc2125fdcb78f7272d6a23a9090
---
M gulpfile.js
M package.json
D tests/lint.js
3 files changed, 18 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals 
refs/changes/80/325280/1

diff --git a/gulpfile.js b/gulpfile.js
index 9b56a63..c48a570 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,6 +14,8 @@
sprity = require( 'sprity' ),
postCSSNext = require( 'postcss-cssnext' ),
postCSSImport = require( 'postcss-import' ),
+   postCSSReporter = require( 'postcss-reporter' ),
+   gulpStylelint = require( 'gulp-stylelint' ),
del = require( 'del' );
 
 var plugins = gulpLoadPlugins(),
@@ -297,8 +299,18 @@
.pipe( plugins.jscs.reporter( 'fail' ) );
 } );
 
-gulp.task( 'lint-css', function lintCssTask() {
-   const gulpStylelint = require( 'gulp-stylelint' );
+gulp.task( 'validate-postCSS', function () {
+   return gulp
+   .src( [ 'dev/**/postcss/*.css', '!dev/**/postcss/_*.css' ] )
+   .pipe( plugins.postcss( [
+   postCSSImport(),
+   postCSSNext( { browsers: [ 'last 5 versions', 
'ie 6-8', 'Firefox >= 3.5', 'iOS >= 4', 'Android >= 2.3' ] } ),
+   postCSSReporter( { clearMessages: true, 
throwError: true } )
+   ], { map: { inline: true } }
+   ) );
+} );
+
+gulp.task( 'lint-css', [ 'validate-postCSS' ], function () {
 
return gulp
.src( 'dev/**/postcss/*.css' )
diff --git a/package.json b/package.json
index 25a393c..91c0b64 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "scripts": {
-"test": "node ./tests/lint.js",
+"gulp": "gulp",
+"test": "npm run gulp -- lint",
 "casperjs": "casperjs test ./tests/casper.js",
 "elbucketing": "casperjs test ./tests/elbucketing.js",
 "el-abtest3": "casperjs test ./tests/el-abtest3.js",
@@ -29,7 +30,7 @@
 "gulp-rename": "^1.2.2",
 "gulp-rev": "^6.0.1",
 "gulp-rev-replace": "^0.4.3",
-"gulp-stylelint": "^3.0.0",
+"gulp-stylelint": "^3.5.0",
 "gulp-uglify": "^1.4.2",
 "gulp-useref": "^3.0.5",
 "handlebars": "^4.0.4",
@@ -40,6 +41,7 @@
 "moment": "^2.10.6",
 "postcss-cssnext": "^2.4.0",
 "postcss-import": "^8.0.2",
+"postcss-reporter": "^2.0.0",
 "preq": "^0.4.6",
 "sprity": "^1.0.8",
 "stylelint-config-wikimedia": "^0.3.0",
diff --git a/tests/lint.js b/tests/lint.js
deleted file mode 100644
index 834ae04..000
--- a/tests/lint.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var gulp = require( 'gulp' ),
-   jshint = require( 'gulp-jshint' ),
-   jscs = require( 'gulp-jscs' ),
-   stylelint = require( 'gulp-stylelint' );
-
-gulp.task( 'lint-js', function () {
-   var devFolder = 'dev/**/*.js';
-
-   gulp.src( [ '*.js', devFolder ] )
-   .pipe( jshint( '.jshintrc' ) )
-   .pipe( jshint.reporter( 'default' ) )
-   .pipe( jshint.reporter( 'fail' ) )
-   .pipe( jscs() )
-   .pipe( jscs.reporter() )
-   .pipe( jscs.reporter( 'fail' ) );
-} );
-
-gulp.task( 'lint-css', function lintCssTask() {
-   return gulp
-   .src( 'dev/**/postcss/*.css' )
-   .pipe( stylelint( {
-   reporters: [
-   { formatter: 'string', console: true }
-   ]
-   } ) );
-} );
-
-gulp.task ( 'lint', [ 'lint-js', 'lint-css' ] );
-
-gulp.start( 'lint' );
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id728d96e0935bdc2125fdcb78f7272d6a23a9090
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add user and passwords for labspuppet and labsdbaccounts

2016-12-05 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: Add user and passwords for labspuppet and labsdbaccounts
..

Add user and passwords for labspuppet and labsdbaccounts

Bug: T152377
Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7
---
M modules/role/manifests/mariadb.pp
M templates/mariadb/production-grants-m5.sql.erb
2 files changed, 21 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/325271/1

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index e391b6c..9472360 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -28,6 +28,8 @@
 include passwords::prometheus
 include passwords::servermon
 include passwords::striker
+include passwords::labspuppet
+include passwords::labsdbaccounts
 
 $root_pass   = $passwords::misc::scripts::mysql_root_pass
 $repl_pass   = $passwords::misc::scripts::mysql_repl_pass
@@ -60,6 +62,8 @@
 $servermon_pass  = $passwords::servermon::db_password
 $striker_pass= $passwords::striker::application_db_password
 $striker_admin_pass  = $passwords::striker::admin_db_password
+$labspuppet_pass = $passwords::labspuppet::db_password
+$labsdbaccounts_pass = $passwords::labsdbaccounts::db_password
 
 file { '/etc/mysql/production-grants-shard.sql':
 ensure  => present,
diff --git a/templates/mariadb/production-grants-m5.sql.erb 
b/templates/mariadb/production-grants-m5.sql.erb
index bef362d..f8947b7 100644
--- a/templates/mariadb/production-grants-m5.sql.erb
+++ b/templates/mariadb/production-grants-m5.sql.erb
@@ -1,6 +1,5 @@
 -- haproxy
 CREATE USER 'haproxy'@'10.64.16.155';
-CREATE USER 'haproxy'@'10.64.48.97';
 
 -- designate, labservices1002
 
@@ -140,4 +139,20 @@
 -- labspuppetbackend user, will run on the labs puppetmaster host --
 
 GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
-ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92';
+ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92'
+IDENTIFIED BY '<%= @labspuppet_pass' %>';
+
+GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
+ON `labspuppet`.* TO 'labspuppet'@'10.64.16.155'
+IDENTIFIED BY '<%= @labspuppet_pass' %>';
+
+-- labsdbaccounts user, will run from labstore1004 and 1005
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.19'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.20'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.16.155'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Renew expired TLS certificate for eventlogging hosts

2016-12-05 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: Renew expired TLS certificate for eventlogging hosts
..

Renew expired TLS certificate for eventlogging hosts

Bug: T152364
Bug: T152188
Change-Id: I93e6084d3a2981482ba7ace70525eef8e1d8394e
---
M modules/role/manifests/mariadb.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/325273/1

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index e391b6c..640ac11 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -388,7 +388,7 @@
 datadir   => '/srv/sqldata',
 tmpdir=> '/srv/tmp',
 read_only => $read_only,
-ssl   => 'on',
+ssl   => 'puppet-cert',
 p_s   => 'off',
 binlog_format => 'MIXED',
 }

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

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

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

[MediaWiki-commits] [Gerrit] labs/private[master]: Add fake passwords for labspuppet and labsdbaccounts databases

2016-12-05 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: Add fake passwords for labspuppet and labsdbaccounts databases
..

Add fake passwords for labspuppet and labsdbaccounts databases

Bug: T152377
Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
---
M modules/passwords/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/74/325274/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 9c3f016..a5398f8 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -484,3 +484,11 @@
 $user = 'notsecret'
 $db_pass = 'notsecret'
 }
+
+class passwords::labspuppet {
+$db_password = 'notsecret'
+}
+
+class passwords::labsdbaccounts {
+$db_password = 'notsecret'
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
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] operations/puppet[production]: elasticsearch - upgrade codfw cluster to Java 8

2016-12-05 Thread Gehel (Code Review)

Gehel has uploaded a new change for review.

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

Change subject: elasticsearch - upgrade codfw cluster to Java 8
..

elasticsearch - upgrade codfw cluster to Java 8

Bug: T151325
Change-Id: I7091ccee1c6b3e002ffc528e46866066e7aceeff
---
M hieradata/role/codfw/elasticsearch/cirrus.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/325276/1

diff --git a/hieradata/role/codfw/elasticsearch/cirrus.yaml 
b/hieradata/role/codfw/elasticsearch/cirrus.yaml
index 2948f15..8fe6970 100644
--- a/hieradata/role/codfw/elasticsearch/cirrus.yaml
+++ b/hieradata/role/codfw/elasticsearch/cirrus.yaml
@@ -51,3 +51,5 @@
 
 elasticsearch::https::certificate_name: 'search.svc.codfw.wmnet'
 base::puppet::dns_alt_names:'search.svc.codfw.wmnet'
+
+elasticsearch::java_package: 'openjdk-8-jdk'

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1082"

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db1082"
..


Revert "db-eqiad.php: Depool db1082"

db1082 finished the ALTER table and it is ready to go back in the pool

This reverts commit 0881436365874ead7134427e149d09e7409147e8.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d29353e..c9d6a52 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -144,7 +144,7 @@
'db1045' => 0,   # 1.4TB  64GB, vslow, dump
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
-#  'db1082' => 500, # 3.6TB 512GB  #T148967
+   'db1082' => 500, # 3.6TB 512GB
'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcdff4b21002357f9b43aa16ad674a78450c6313
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1087

2016-12-05 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review.

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

Change subject: db-eqiad.php: Depool db1087
..

db-eqiad.php: Depool db1087

db1087 needs an ALTER table, so needs to be depooled

Bug: T148967
Change-Id: Ib4c96d38bb2bd7d7ffbbc2ef7ce85fd9e289831a
---
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/94/325294/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index c9d6a52..2b4f30d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
'db1082' => 500, # 3.6TB 512GB
-   'db1087' => 500, # 3.6TB 512GB
+#  'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],
's6' => [

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix up seb35 email

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix up seb35 email
..


Fix up seb35 email

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cfadaa3..a40eb27 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -189,7 +189,7 @@
 | santhosh\.thottingal@gmail\.com
 | saper@saper\.info
 | se4598@gmx\.de
-| seb35@seb35\.fr
+| seb35wikipedia@gmail\.com
 | sebastian\.berlin@wikimedia\.se
 | shahyar@gmail\.com
 | siebrand@kitano\.nl
@@ -418,7 +418,7 @@
- ^vogel@hallowelt\.biz$ # Robert Vogel
- ^saper@saper\.info$
- ^se4598@gmx\.de$
-   - ^seb35@seb35\.fr$
+   - ^seb35wikipedia@gmail\.com$
- ^skizzerz@skizzerz\.net$
- ^strigiwm@gmail\.com$ # MarcoAurelio
- ^s7eph4n@gmail\.org$ # Foxtrott

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSMWConnector[REL1_27]: Set default review branch

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Set default review branch
..


Set default review branch

Change-Id: I5116dcf3218e10bc9f40cc3235baf8ae88ec3349
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
index 359839e..adad360 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,6 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/BlueSpiceSMWConnector.git
+defaultbranch=REL1_27
 track=1
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5116dcf3218e10bc9f40cc3235baf8ae88ec3349
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSMWConnector
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceCategoryManager[REL1_27]: Set default review branch

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Set default review branch
..


Set default review branch

Change-Id: I2410e0c1c960da10d402a8a322db4d682d16a607
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
index 76fa075..eacb7d5 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,6 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/BlueSpiceCategoryManager.git
+defaultbranch=REL1_27
 track=1
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2410e0c1c960da10d402a8a322db4d682d16a607
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceCategoryManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Set default review branch

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Set default review branch
..


Set default review branch

Change-Id: I51d1b8b9c444c8c120a353e479940d598c5744e8
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
index dca4900..6cf8fd3 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/BlueSpiceExtensions.git
+defaultbranch=REL1_27
 track=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51d1b8b9c444c8c120a353e479940d598c5744e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add inflected forms of sitename on Finnish Wikivoyage

2016-12-05 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Add inflected forms of sitename on Finnish Wikivoyage
..

Add inflected forms of sitename on Finnish Wikivoyage

Bug: T152376
Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10
---
M WikimediaMessages.hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 61282b3..f7442ea 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -825,26 +825,31 @@
'Wikiuutiset' => 'Wikiuutisten',
'Wikisitaatit' => 'Wikisitaattien',
'Wikimedia Suomi' => 'Wikimedia Suomen',
+   'Wikimatkat' => 'Wikimatkojen',
),
'partitive' => array(
'Wikiuutiset' => 'Wikiuutisia',
'Wikisitaatit' => 'Wikisitaatteja',
'Wikimedia Suomi' => 'Wikimedia Suomea',
+   'Wikimatkat' => 'Wikimatkoja',
),
'elative' => array(
'Wikiuutiset' => 'Wikiuutisista',
'Wikisitaatit' => 'Wikisitaateista',
'Wikimedia Suomi' => 'Wikimedia Suomesta',
+   'Wikimatkat' => 'Wikimatkoista',
),
'inessive' => array(
'Wikiuutiset' => 'Wikiuutisissa',
'Wikisitaatit' => 'Wikisitaateissa',
'Wikimedia Suomi' => 'Wikimedia Suomessa',
+   'Wikimatkat' => 'Wikimatkoissa',
),
'illative' => array(
'Wikiuutiset' => 'Wikiuutisiin',
'Wikisitaatit' => 'Wikisitaatteihin',
'Wikimedia Suomi' => 'Wikimedia Suomeen',
+   'Wikimatkat' => 'Wikimatkoihin',
),
); # fi
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Use camel case for statsd metric names

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Use camel case for statsd metric names
..


Use camel case for statsd metric names

Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
---
M includes/specials/SpecialCreateTopicPage.php
M 
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
M 
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialCreateTopicPage.php 
b/includes/specials/SpecialCreateTopicPage.php
index 167bd83..2288a40 100644
--- a/includes/specials/SpecialCreateTopicPage.php
+++ b/includes/specials/SpecialCreateTopicPage.php
@@ -28,7 +28,7 @@
$this->setHeaders();
if ( $this->getRequest()->getVal( 'ref' ) === 'button' ) {
$statsd = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   $statsd->increment( 
'wikibase.articleplaceholder.button.create-article' );
+   $statsd->increment( 
'wikibase.articleplaceholder.button.createArticle' );
}
$page = $this->getRequest()->getVal( 'wptitleinput', $par );
if ( $page === '' || $page === null ) {
diff --git 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
index bd8f55d..7ed4baa 100644
--- 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
+++ 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
@@ -41,7 +41,7 @@
return 
CreateArticleTranslationDialog.super.prototype.onSubmit.apply( this );
}
 
-   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.translate-article' );
+   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.translateArticle' );
 
mw.loader.using( 'ext.cx.sitemapper' ).then( function () {
document.location.href = 
mw.cx.SiteMapper.prototype.getCXUrl(
diff --git 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
index 4ea6b57..b0264d4 100644
--- 
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
+++ 
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
@@ -19,7 +19,7 @@
windowManager.addWindows( [ dialog ] );
 
OO.ui.infuse( 'new-article-button' ).on( 'click', function () {
-   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.create-article' );
+   mw.track( 
'counter.MediaWiki.wikibase.articleplaceholder.button.createArticle' );
windowManager.openWindow( dialog );
} );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
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] mediawiki...Gadgets[master]: Gadgets.alias.php translation for bengali

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Gadgets.alias.php translation for bengali
..


Gadgets.alias.php translation for bengali

Change-Id: I843615496190fb22babae751d58805b73904e4ea
---
M Gadgets.alias.php
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gadgets.alias.php b/Gadgets.alias.php
index d6b8d2d..c4688f6 100644
--- a/Gadgets.alias.php
+++ b/Gadgets.alias.php
@@ -55,6 +55,12 @@
'Gadgets' => array( 'Pakakas' ),
 );
 
+/** Bengali (বাংলা) */
+$specialPageAliases['bn'] = array(
+   'Gadgets' => array( 'গ্যাজেট' ),
+   'GadgetUsage' => array( 'গ্যাজেট_ব্যবহার' ),
+);
+
 /** Breton (brezhoneg) */
 $specialPageAliases['br'] = array(
'Gadgets' => array( 'Bitrakoù' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I843615496190fb22babae751d58805b73904e4ea
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Aftab 
Gerrit-Reviewer: Raimond Spekking 
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] integration/config[master]: Fix up seb35 email

2016-12-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Fix up seb35 email
..

Fix up seb35 email

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/96/325296/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cfadaa3..a40eb27 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -189,7 +189,7 @@
 | santhosh\.thottingal@gmail\.com
 | saper@saper\.info
 | se4598@gmx\.de
-| seb35@seb35\.fr
+| seb35wikipedia@gmail\.com
 | sebastian\.berlin@wikimedia\.se
 | shahyar@gmail\.com
 | siebrand@kitano\.nl
@@ -418,7 +418,7 @@
- ^vogel@hallowelt\.biz$ # Robert Vogel
- ^saper@saper\.info$
- ^se4598@gmx\.de$
-   - ^seb35@seb35\.fr$
+   - ^seb35wikipedia@gmail\.com$
- ^skizzerz@skizzerz\.net$
- ^strigiwm@gmail\.com$ # MarcoAurelio
- ^s7eph4n@gmail\.org$ # Foxtrott

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update Semantic extensions part 1

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Update Semantic extensions part 1
..


Update Semantic extensions part 1

Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
---
M translatewiki-composer.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/translatewiki-composer.json b/translatewiki-composer.json
index d9e4451..ca6ad15 100644
--- a/translatewiki-composer.json
+++ b/translatewiki-composer.json
@@ -1,8 +1,8 @@
 {
"require": {
-   "mediawiki/semantic-maps": "~3.4",
-"mediawiki/maps": "~3.8",
-"mediawiki/semantic-media-wiki": "~2.4",
+"mediawiki/maps": "~4.0",
+"mediawiki/page-forms": "~4.0",
+   "mediawiki/semantic-media-wiki": "~2.4",
"romaricdrigon/metayaml": "~1.0"
},
"extra": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: Set default review branch

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Set default review branch
..


Set default review branch

Change-Id: I95648c5104da5aa48777ce879f2ac37564fd1779
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
index ed8d8db..22e2acc 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/BlueSpiceFoundation.git
+defaultbranch=REL1_27
 track=1

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Move all init code over to target

2016-12-05 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Move all init code over to target
..

Move all init code over to target

Change-Id: I9ba06bb3a57a7683e246461341c67462cab465d0
---
M extension.json
M modules/ext.templateDataGenerator.editPage.js
M modules/ext.templateDataGenerator.target.js
D modules/ext.templateDataGenerator.ui.js
4 files changed, 280 insertions(+), 333 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/90/325290/1

diff --git a/extension.json b/extension.json
index a946024..ad6d70a 100644
--- a/extension.json
+++ b/extension.json
@@ -74,7 +74,6 @@
"styles": "modules/ext.templateDataGenerator.ui.css",
"scripts": [
"modules/ext.templateDataGenerator.target.js",
-   "modules/ext.templateDataGenerator.ui.js",

"modules/widgets/ext.templateDataGenerator.paramSelectWidget.js",

"modules/widgets/ext.templateDataGenerator.paramWidget.js",

"modules/widgets/ext.templateDataGenerator.paramImportWidget.js",
diff --git a/modules/ext.templateDataGenerator.editPage.js 
b/modules/ext.templateDataGenerator.editPage.js
index 521b04d..30d7fb0 100644
--- a/modules/ext.templateDataGenerator.editPage.js
+++ b/modules/ext.templateDataGenerator.editPage.js
@@ -10,7 +10,7 @@
/* global ve */
 
$( function () {
-   var pieces, isDocPage,
+   var pieces, isDocPage, target,
pageName = mw.config.get( 'wgPageName' ),
config = {
pageName: pageName,
@@ -43,21 +43,15 @@
// Textbox wikitext editor
if ( $textbox.length ) {
// Prepare the editor
-   mw.libs.tdgUi.init(
-   $( '#mw-content-text' ),
-   new mw.TemplateData.TextareaTarget( $textbox ),
-   config
-   );
+   target = new mw.TemplateData.TextareaTarget( $textbox, 
config );
+   $( '#mw-content-text' ).prepend( target.$element );
}
// Visual editor source mode
mw.hook( 've.activationComplete' ).add( function () {
var surface = ve.init.target.getSurface();
if ( surface.getMode() === 'source' ) {
-   mw.libs.tdgUi.init(
-   $( 
'.ve-init-mw-desktopArticleTarget-originalContent' ),
-   new mw.TemplateData.VETarget( surface ),
-   config
-   );
+   target = new mw.TemplateData.VETarget( surface, 
config );
+   $( 
'.ve-init-mw-desktopArticleTarget-originalContent' ).prepend( target.$element );
}
} );
mw.hook( 've.deactivate' ).add( function () {
diff --git a/modules/ext.templateDataGenerator.target.js 
b/modules/ext.templateDataGenerator.target.js
index dc4d45f..50d1a81 100644
--- a/modules/ext.templateDataGenerator.target.js
+++ b/modules/ext.templateDataGenerator.target.js
@@ -7,16 +7,94 @@
  * @mixin OO.EventEmitter
  *
  * @constructor
+ * @param {Object} config Configuration options
  */
-mw.TemplateData.Target = function mwTemplateDataTarget() {
+mw.TemplateData.Target = function mwTemplateDataTarget( config ) {
+   var $helpLink, relatedPage,
+   target = this;
+
// Parent constructor
mw.TemplateData.Target.super.apply( this, arguments );
 
// Mixin constructor
OO.EventEmitter.call( this );
 
-   this.$element.addClass( 'tdg-editscreen-main' );
-   // TODO: Move more init code into this class
+   this.pageName = config.pageName;
+   this.parentPage = config.parentPage;
+   this.isPageSubLevel = !!config.isPageSubLevel;
+   this.isDocPage = !!config.isDocPage;
+
+   this.editOpenDialogButton = new OO.ui.ButtonWidget( {
+   label: mw.msg( 'templatedata-editbutton' )
+   } );
+
+   this.editNoticeLabel = new OO.ui.LabelWidget( {
+   classes: [ 'tdg-editscreen-error-msg' ]
+   } )
+   .toggle( false );
+
+   $helpLink = $( '' )
+   .attr( {
+   href: mw.msg( 'templatedata-helplink-target' ),
+   target: '_blank'
+   } )
+   .addClass( 'tdg-editscreen-main-helplink' )
+   .text( mw.msg( 'templatedata-helplink' ) );
+
+   this.windowManager = OO.ui.getWindowManager();
+
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Add db structure for keeping info about labsdb accounts

2016-12-05 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: labs: Add db structure for keeping info about labsdb accounts
..


labs: Add db structure for keeping info about labsdb accounts

Bug: T149933
Change-Id: If98e7877151173623b96b168d44a82464b6e59e0
---
A modules/role/files/labs/db/maintain-dbusers.sql
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/files/labs/db/maintain-dbusers.sql 
b/modules/role/files/labs/db/maintain-dbusers.sql
new file mode 100644
index 000..da867b7
--- /dev/null
+++ b/modules/role/files/labs/db/maintain-dbusers.sql
@@ -0,0 +1,20 @@
+-- Keep state about tool / user accounts on tool labs and their mysql
+-- account counterparts. This is the canonical store of this information.
+-- Schema is set up to be able to trivially query the following things:
+--  1. What labsdb hosts does this tool / user *not* have an account on.
+--  2. What's the mysql username / password for this tool / user.
+CREATE TABLE accounts(
+id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+mysql_username VARCHAR(255) NOT NULL,
+type enum('tool', 'user') NOT NULL,
+username VARCHAR(255) NOT NULL,
+password VARCHAR(255) NOT NULL,
+) CHARSET=utf8mb4;
+CREATE UNIQUE INDEX account_type ON accounts(type, username);
+
+CREATE TABLE account_hosts(
+id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+account_id INT UNSIGNED NOT NULL,
+hostname VARCHAR(255) NOT NULL,
+) CHARSET=utf8mb4;
+CREATE INDEX account_host_status ON accounts(account_id, hostname);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If98e7877151173623b96b168d44a82464b6e59e0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: StringHelper: Added return statement with boolean

2016-12-05 Thread Mglaser (Code Review)

Mglaser has submitted this change and it was merged.

Change subject: StringHelper: Added return statement with boolean
..


StringHelper: Added return statement with boolean

Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af
---
M includes/utility/StringHelper.class.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/utility/StringHelper.class.php 
b/includes/utility/StringHelper.class.php
index 11a22f8..744a457 100644
--- a/includes/utility/StringHelper.class.php
+++ b/includes/utility/StringHelper.class.php
@@ -167,6 +167,7 @@
case self::FILTER_EQUALSNOT:
return $sHaystack !== $sNeedle;
}
+   return false;
}
 
 }
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update semantic extensions part 2

2016-12-05 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Update semantic extensions part 2
..

Update semantic extensions part 2

Change-Id: I3e04e8bad2dd69814f115d6d6c426daaa3a91da6
---
M TranslatewikiSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/97/325297/1

diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 5cdc993..b7e6093 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -272,7 +272,7 @@
 $smwgNamespacesWithSemanticLinks[92/*NS_LQT_SUMMARY*/] = true;
 $smwgEnabledEditPageHelp = false;
 
-wfLoadExtension( 'SemanticForms' );
+wfLoadExtension( 'PageForms' );
 $sfgRedLinksCheckOnlyLocalProps = true;
 
 $wgNoFollowDomainExceptions = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e04e8bad2dd69814f115d6d6c426daaa3a91da6
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Include user's edit count in BOOT action

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Include user's edit count in BOOT action
..

Include user's edit count in BOOT action

Action changes:
* Group user-related data in the user property, rather than repeating
  "isUser" and "user" prefixes.
* Include user's edit count in the user property of the action.

Reducer changes:
* Make the preview reducer handle the action's new shape.
* Make the eventLogging reducer add the bucketed user's edit count to
  the state tree.

Bug: T152223
Change-Id: I8fae9e2d0f6889ffdd30bb5192513d194f791967
---
M extension.json
M resources/ext.popups/actions.js
A resources/ext.popups/counts.js
M resources/ext.popups/reducers.js
M tests/qunit/ext.popups/actions.test.js
A tests/qunit/ext.popups/counts.test.js
M tests/qunit/ext.popups/reducers.eventLogging.test.js
M tests/qunit/ext.popups/reducers.test.js
8 files changed, 105 insertions(+), 11 deletions(-)


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

diff --git a/extension.json b/extension.json
index 888fd10..264ae1b 100644
--- a/extension.json
+++ b/extension.json
@@ -63,6 +63,7 @@
"resources/ext.popups/experiment.js",
"resources/ext.popups/actions.js",
"resources/ext.popups/processLinks.js",
+   "resources/ext.popups/counts.js",
"resources/ext.popups/gateway.js",
"resources/ext.popups/reducers.js",
"resources/ext.popups/changeListener.js",
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 239aa91..450e023 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -43,9 +43,10 @@
 *  i.e. `mw.config`
 */
actions.boot = function ( isUserInCondition, user, generateToken, 
config ) {
+   var editCount = config.get( 'wgUserEditCount' );
+
return {
type: types.BOOT,
-   isUserInCondition: isUserInCondition(),
sessionToken: user.sessionId(),
pageToken: generateToken(),
page: {
@@ -53,7 +54,11 @@
namespaceID: config.get( 'wgNamespaceNumber' ),
id: config.get( 'wgArticleId' )
},
-   isUserAnon: user.isAnon()
+   user: {
+   isInCondition: isUserInCondition(),
+   isAnon: user.isAnon(),
+   editCount: editCount
+   }
};
};
 
diff --git a/resources/ext.popups/counts.js b/resources/ext.popups/counts.js
new file mode 100644
index 000..47fed15
--- /dev/null
+++ b/resources/ext.popups/counts.js
@@ -0,0 +1,34 @@
+( function ( mw ) {
+
+   mw.popups.counts = {};
+
+   /**
+* Return count bucket for the number of edits a user has made.
+*
+* The buckets are defined as part of
+* [the Popups schema](https://meta.wikimedia.org/wiki/Schema:Popups).
+*
+* Extracted from `mw.popups.schemaPopups.getEditCountBucket`.
+*
+* @param {Number} count
+* @return {String}
+*/
+   mw.popups.counts.getEditCountBucket = function ( count ) {
+   var bucket;
+
+   if ( count === 0 ) {
+   bucket = '0';
+   } else if ( count >= 1 && count <= 4 ) {
+   bucket = '1-4';
+   } else if ( count >= 5 && count <= 99 ) {
+   bucket = '5-99';
+   } else if ( count >= 100 && count <= 999 ) {
+   bucket = '100-999';
+   } else if ( count >= 1000 ) {
+   bucket = '1000+';
+   }
+
+   return bucket + ' edits';
+   };
+
+}( mediaWiki ) );
diff --git a/resources/ext.popups/reducers.js b/resources/ext.popups/reducers.js
index 7e4e0c7..9a80a77 100644
--- a/resources/ext.popups/reducers.js
+++ b/resources/ext.popups/reducers.js
@@ -1,4 +1,8 @@
 ( function ( mw, $ ) {
+
+   // Sugar for the mw.popups.reducers.eventLogging reducer.
+   var counts = mw.popups.counts;
+
mw.popups.reducers = {};
 
/**
@@ -56,7 +60,7 @@
switch ( action.type ) {
case mw.popups.actionTypes.BOOT:
return nextState( state, {
-   enabled: action.isUserInCondition
+   enabled: action.user.isInCondition
} );
case

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Increment preview count

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Increment preview count
..

Increment preview count

Action changes:
* Add the PREVIEW_SHOW action.

Reducer changes:
* Increment the user's preview count in the eventLogging reducer.

Changes:
* Add the previewCount change listener, which is responsible for
  persisting the user's preview count to storage.
* Call the change listener factories individually in
  #registerChangeListeners as their signatures aren't consistent.

Bug: T152223
Change-Id: Ifb493c5bff66712a25614ebb905251e43375420a
---
M extension.json
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
A resources/ext.popups/previewCountChangeListener.js
M resources/ext.popups/reducers.js
M resources/ext.popups/renderChangeListener.js
A tests/qunit/ext.popups/previewCountChangeListener.test.js
M tests/qunit/ext.popups/reducers.eventLogging.test.js
A tests/qunit/ext.popups/renderChangeListener.test.js
9 files changed, 219 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/87/325287/1

diff --git a/extension.json b/extension.json
index 264ae1b..9408bd2 100644
--- a/extension.json
+++ b/extension.json
@@ -71,6 +71,7 @@

"resources/ext.popups/linkTitleChangeListener.js",
"resources/ext.popups/renderer.js",
"resources/ext.popups/renderChangeListener.js",
+   
"resources/ext.popups/previewCountChangeListener.js",
"resources/ext.popups/boot.js"
],
"templates": {
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 838f901..bea886a 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -15,6 +15,7 @@
PREVIEW_ABANDON_END: 'PREVIEW_ABANDON_END',
PREVIEW_ANIMATING: 'PREVIEW_ANIMATING',
PREVIEW_INTERACTIVE: 'PREVIEW_INTERACTIVE',
+   PREVIEW_SHOW: 'PREVIEW_SHOW',
PREVIEW_CLICK: 'PREVIEW_CLICK',
COG_CLICK: 'COG_CLICK',
SETTINGS_DIALOG_RENDERED: 'SETTINGS_DIALOG_RENDERED',
@@ -174,7 +175,7 @@
};
 
/**
-* Represents the user dwelling on a preivew with their mouse.
+* Represents the user dwelling on a preview with their mouse.
 *
 * @return {Object}
 */
@@ -206,6 +207,20 @@
};
 
/**
+* Represents a preview being shown to the user.
+*
+* This action is dispatched by the `mw.popups.changeListeners.render` 
change
+* listener.
+*
+* @return {Object}
+*/
+   actions.previewShow = function () {
+   return {
+   type: 'PREVIEW_SHOW'
+   };
+   };
+
+   /**
 * Represents the user clicking either the "Enable previews" footer 
menu link,
 * or the "cog" icon that's present on each preview.
 *
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index 05c077e..6729599 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -1,4 +1,4 @@
-( function ( mw, Redux, ReduxThunk, $ ) {
+( function ( mw, Redux, ReduxThunk ) {
var BLACKLISTED_LINKS = [
'.extiw',
'.image',
@@ -28,13 +28,19 @@
 * `mw.popups.changeListeners`.
 *
 * @param {Redux.Store} store
+* @param {Object} actions
+* @param {ext.popups.UserSettings} userSettings
 */
-   function registerChangeListeners( store, actions ) {
-   $.each( mw.popups.changeListeners, function ( _, 
changeListenerFactory ) {
-   var changeListener = changeListenerFactory( actions );
+   function registerChangeListeners( store, actions, userSettings ) {
 
-   mw.popups.registerChangeListener( store, changeListener 
);
-   } );
+   // Sugar.
+   var changeListeners = mw.popups.changeListeners,
+   registerChangeListener = 
mw.popups.registerChangeListener;
+
+   registerChangeListener( store, changeListeners.footerLink( 
actions ) );
+   registerChangeListener( store, changeListeners.linkTitle() );
+   registerChangeListener( store, changeListeners.render( actions 
) );
+   registerChangeListener( store, changeListeners.previewCount( 
userSettings ) );
}
 
/**
@@ -84,7 +90,7 @@
) )
);
actions = createBoundActions( store );
-   registerChangeListeners( store, actions );
+

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Add minimal eventLogging reducer

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Add minimal eventLogging reducer
..

Add minimal eventLogging reducer

Action changes:
* Include whether the user is logged in/out and information about the
  current page in the BOOT action.

Reducer changes:
* Move all tokens and timing information from the preview reducer to the
  eventLogging reducer.

Bug: T152223
Change-Id: I8a3f58358b211cc55417dcda7e796fe538e3d910
---
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
M resources/ext.popups/reducers.js
M tests/qunit/ext.popups/actions.test.js
A tests/qunit/ext.popups/reducers.eventLogging.test.js
M tests/qunit/ext.popups/reducers.test.js
6 files changed, 140 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/83/325283/1

diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 98213b5..239aa91 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -37,15 +37,23 @@
 * so as not to impact latency-critical events.
 *
 * @param {Function} isUserInCondition See `mw.popups.createExperiment`
-* @param {String} sessionToken
+* @param {mw.user} user
 * @param {Function} generateToken
+* @param {mw.Map} config The config of the MediaWiki client-side 
application,
+*  i.e. `mw.config`
 */
-   actions.boot = function ( isUserInCondition, sessionToken, 
generateToken ) {
+   actions.boot = function ( isUserInCondition, user, generateToken, 
config ) {
return {
type: types.BOOT,
isUserInCondition: isUserInCondition(),
-   sessionToken: sessionToken,
-   pageToken: generateToken()
+   sessionToken: user.sessionId(),
+   pageToken: generateToken(),
+   page: {
+   title: config.get( 'wgTitle' ),
+   namespaceID: config.get( 'wgNamespaceNumber' ),
+   id: config.get( 'wgArticleId' )
+   },
+   isUserAnon: user.isAnon()
};
};
 
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index e9a2f81..a2d9208 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -99,8 +99,9 @@
 
actions.boot(
isUserInCondition(),
-   mw.user.sessionId(),
-   generateToken
+   mw.user,
+   generateToken,
+   mw.config
);
 
mw.hook( 'wikipage.content' ).add( function ( $container ) {
diff --git a/resources/ext.popups/reducers.js b/resources/ext.popups/reducers.js
index cee40f7..7e4e0c7 100644
--- a/resources/ext.popups/reducers.js
+++ b/resources/ext.popups/reducers.js
@@ -46,12 +46,8 @@
if ( state === undefined ) {
state = {
enabled: undefined,
-   sessionToken: undefined,
-   pageToken: undefined,
-   linkInteractionToken: undefined,
activeLink: undefined,
activeEvent: undefined,
-   interactionStarted: undefined,
shouldShow: false,
isUserDwelling: false
};
@@ -60,16 +56,12 @@
switch ( action.type ) {
case mw.popups.actionTypes.BOOT:
return nextState( state, {
-   enabled: action.isUserInCondition,
-   sessionToken: action.sessionToken,
-   pageToken: action.pageToken
+   enabled: action.isUserInCondition
} );
case mw.popups.actionTypes.LINK_DWELL:
return nextState( state, {
activeLink: action.el,
activeEvent: action.event,
-   interactionStarted: 
action.interactionStarted,
-   linkInteractionToken: 
action.linkInteractionToken,
 
// When the user dwells on a link with 
their keyboard, a preview is
// renderered, and then dwells on 
another link, the LINK_ABANDON_END
@@ -89,8 +81,6 @@

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Include user's preview count in BOOT action

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Include user's preview count in BOOT action
..

Include user's preview count in BOOT action

Action changes:
* Include user's preview count in the user property of the action.

Changes:
* Extract mw.popups.UserSettings#getPreviewCount and #setPreviewCount
  and associated tests from the ext.popups.core module.

Bug: T152223
Change-Id: I6b7afef31311be8fede685deb536f577845cb9cf
---
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
M resources/ext.popups/counts.js
M resources/ext.popups/userSettings.js
M tests/qunit/ext.popups/actions.test.js
M tests/qunit/ext.popups/counts.test.js
M tests/qunit/ext.popups/reducers.eventLogging.test.js
M tests/qunit/ext.popups/userSettings.test.js
8 files changed, 195 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/86/325286/1

diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 450e023..838f901 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -38,12 +38,20 @@
 *
 * @param {Function} isUserInCondition See `mw.popups.createExperiment`
 * @param {mw.user} user
+* @param {ext.popups.UserSettings} userSettings
 * @param {Function} generateToken
 * @param {mw.Map} config The config of the MediaWiki client-side 
application,
 *  i.e. `mw.config`
 */
-   actions.boot = function ( isUserInCondition, user, generateToken, 
config ) {
-   var editCount = config.get( 'wgUserEditCount' );
+   actions.boot = function (
+   isUserInCondition,
+   user,
+   userSettings,
+   generateToken,
+   config
+   ) {
+   var editCount = config.get( 'wgUserEditCount' ),
+   previewCount = userSettings.getPreviewCount();
 
return {
type: types.BOOT,
@@ -57,7 +65,8 @@
user: {
isInCondition: isUserInCondition(),
isAnon: user.isAnon(),
-   editCount: editCount
+   editCount: editCount,
+   previewCount: previewCount
}
};
};
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index a2d9208..05c077e 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -10,23 +10,6 @@
];
 
/**
-* Creates an experiment with sensible values for the depenencies.
-*
-* See `mw.popups.createExperiment`.
-*
-* @return {Function}
-*/
-   function isUserInCondition() {
-   var userSettings = mw.popups.createUserSettings( mw.storage, 
mw.user );
-
-   return mw.popups.createExperiment(
-   mw.config,
-   mw.user,
-   userSettings
-   );
-   }
-
-   /**
 * Creates a gateway with sensible values for the dependencies.
 *
 * See `mw.popups.createGateway`.
@@ -80,8 +63,14 @@
var compose = Redux.compose,
store,
actions,
+
+   // So-called "services"
generateToken = mw.user.generateRandomSessionId,
-   gateway = createGateway();
+   gateway = createGateway(),
+   userSettings = mw.popups.createUserSettings( 
mw.storage, mw.user ),
+   isUserInCondition;
+
+   isUserInCondition = mw.popups.createExperiment( mw.config, 
mw.user, userSettings );
 
// If debug mode is enabled, then enable Redux DevTools.
if ( mw.config.get( 'debug' ) === true ) {
@@ -98,8 +87,9 @@
registerChangeListeners( store, actions );
 
actions.boot(
-   isUserInCondition(),
+   isUserInCondition,
mw.user,
+   userSettings,
generateToken,
mw.config
);
diff --git a/resources/ext.popups/counts.js b/resources/ext.popups/counts.js
index 47fed15..0c19281 100644
--- a/resources/ext.popups/counts.js
+++ b/resources/ext.popups/counts.js
@@ -31,4 +31,38 @@
return bucket + ' edits';
};
 
+   /**
+* Return count bucket for the number of previews a user has seen.
+*
+* If local storage isn't available - because the user has disabled it
+* or the browser doesn't support it - then then "unknown" is returned.
+*
+*

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Hygiene: Extract shared stub user object

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Hygiene: Extract shared stub user object
..

Hygiene: Extract shared stub user object

Changes:
* Extract the various shapes of stub user object into the shared
  mw.popups.tests.stubs#createStubUser factory method.
* Register the ext.popups.tests.stubs module in
  PopupsHooks#onResourceLoaderTestModules and make the test suite depend
  on it.

Bug: T152223
Change-Id: I893b11461d8484bcaabfd950c2fa0dc672454a9d
---
M Popups.hooks.php
M tests/qunit/ext.popups/actions.test.js
M tests/qunit/ext.popups/experiment.test.js
A tests/qunit/ext.popups/stubs/index.js
A tests/qunit/ext.popups/stubs/user.js
M tests/qunit/ext.popups/userSettings.test.js
6 files changed, 50 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/84/325284/1

diff --git a/Popups.hooks.php b/Popups.hooks.php
index c3559d9..ccc5512 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -102,10 +102,23 @@
return substr( $script, $start );
}, $scripts );
 
+   $testModules['qunit']['ext.popups.tests.stubs'] = [
+   'scripts' => [
+   'tests/qunit/ext.popups/stubs/index.js',
+   'tests/qunit/ext.popups/stubs/user.js',
+   ],
+   'dependencies' => [
+   'ext.popups', // The mw.popups is required.
+   ],
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'Popups',
+   ];
+
$testModules['qunit']['ext.popups.tests'] = [
'scripts' => $scripts,
'dependencies' => [
'ext.popups',
+   'ext.popups.tests.stubs',
],
'localBasePath' => __DIR__,
'remoteExtPath' => 'Popups',
diff --git a/tests/qunit/ext.popups/actions.test.js 
b/tests/qunit/ext.popups/actions.test.js
index 0907426..ff49db7 100644
--- a/tests/qunit/ext.popups/actions.test.js
+++ b/tests/qunit/ext.popups/actions.test.js
@@ -10,22 +10,13 @@
return '9876543210';
},
config = new mw.Map(),
-   stubUser;
+   stubUser = mw.popups.tests.stubs.createStubUser( /* 
isAnon = */ true );
 
config.set( {
wgTitle: 'Foo',
wgNamespaceNumber: 1,
wgArticleId: 2
} );
-
-   stubUser = {
-   sessionId: function () {
-   return '0123456789';
-   },
-   isAnon: function () {
-   return true;
-   }
-   };
 
assert.expect( 1 );
 
diff --git a/tests/qunit/ext.popups/experiment.test.js 
b/tests/qunit/ext.popups/experiment.test.js
index 7dd8085..793da46 100644
--- a/tests/qunit/ext.popups/experiment.test.js
+++ b/tests/qunit/ext.popups/experiment.test.js
@@ -1,13 +1,5 @@
 ( function ( mw ) {
 
-   function createStubUser( isAnon ) {
-   return {
-   isAnon: function () {
-   return isAnon;
-   }
-   };
-   }
-
function createStubUserSettings( hasIsEnabled ) {
return {
getToken: function () {
@@ -25,7 +17,7 @@
QUnit.module( 'ext.popups/experiment', {
setup: function () {
this.config = new mw.Map();
-   this.user = createStubUser( /* isAnon = */ true );
+   this.user = mw.popups.tests.stubs.createStubUser( /* 
isAnon = */ true );
this.userSettings = createStubUserSettings( /* 
hasIsEnabled = */ false );
this.isUserInCondition = mw.popups.createExperiment( 
this.config, this.user, this.userSettings );
}
@@ -38,7 +30,7 @@
} );
 
QUnit.test( '#isUserInCondition', 2, function ( assert ) {
-   var user = createStubUser( /* isAnon = */ false ),
+   var user = mw.popups.tests.stubs.createStubUser( /* isAnon = */ 
false ),
isUserInCondition = mw.popups.createExperiment( 
this.config, user, this.userSettings );
 
this.config.set( {
diff --git a/tests/qunit/ext.popups/stubs/index.js 
b/tests/qunit/ext.popups/stubs/index.js
new file mode 100644
index 000..6c415fb
--- /dev/null
+++ b/tests/qunit/ext.popups/stubs/index.js
@@ -0,0 +1,9 @@
+( function ( mw ) {
+
+   // TODO:

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[REL1_27]: Set default review branch

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Set default review branch
..


Set default review branch

Change-Id: I5cb5501cb974db48d272e83bd59e3353752f9042
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
index 64b0efd..b60d89c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/BlueSpiceSkin.git
+defaultbranch=REL1_27
 track=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5cb5501cb974db48d272e83bd59e3353752f9042
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceEditNotifyConnector[REL1_27]: Set default review branch

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Set default review branch
..


Set default review branch

Change-Id: Ib044c8ecf05edef8461ef598403d7a8f2143f981
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
index bf3c4c4..d847644 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,6 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/BlueSpiceEditNotifyConnector.git
+defaultbranch=REL1_27
 track=1
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib044c8ecf05edef8461ef598403d7a8f2143f981
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceEditNotifyConnector
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add ElectronPdfService to extension-list

2016-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Add ElectronPdfService to extension-list
..

Add ElectronPdfService to extension-list

Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265
---
M wmf-config/extension-list
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 7c5ab66..1754e05 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -37,6 +37,7 @@
 $IP/extensions/Echo/Echo.php
 $IP/extensions/EducationProgram/EducationProgram.php
 $IP/extensions/Elastica/extension.json
+$IP/extensions/ElectronPdfService/extension.json
 $IP/extensions/EventBus/extension.json
 $IP/extensions/EventLogging/extension.json
 $IP/extensions/ExtensionDistributor/extension.json

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add ElectronPdfService to extension-list

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add ElectronPdfService to extension-list
..


Add ElectronPdfService to extension-list

Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265
---
M wmf-config/extension-list
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 7c5ab66..1754e05 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -37,6 +37,7 @@
 $IP/extensions/Echo/Echo.php
 $IP/extensions/EducationProgram/EducationProgram.php
 $IP/extensions/Elastica/extension.json
+$IP/extensions/ElectronPdfService/extension.json
 $IP/extensions/EventBus/extension.json
 $IP/extensions/EventLogging/extension.json
 $IP/extensions/ExtensionDistributor/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Add Insertables to Wikimedia iOS app

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add Insertables to Wikimedia iOS app
..


Add Insertables to Wikimedia iOS app

Bug: T150255
Change-Id: Ia5e34a4a8ed0216ad711d7d4b04a8060eb4e51b8
---
M groups/Wikimedia/WikimediaMobile-ios.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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

Objections:
  John Vandenberg: There's a problem with this change, please improve



diff --git a/groups/Wikimedia/WikimediaMobile-ios.yaml 
b/groups/Wikimedia/WikimediaMobile-ios.yaml
index b787035..8d8c4cd 100644
--- a/groups/Wikimedia/WikimediaMobile-ios.yaml
+++ b/groups/Wikimedia/WikimediaMobile-ios.yaml
@@ -10,6 +10,9 @@
 patterns:
   - "*"
 
+  INSERTABLES:
+class: MediaWikiInsertablesSuggester
+
 ---
 BASIC:
   icon: wiki://Wikipedia-logo-v2.svg

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e34a4a8ed0216ad711d7d4b04a8060eb4e51b8
Gerrit-PatchSet: 4
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: SacredWKnight 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...varnish4[debian-wmf]: Release 4.1.4-1wm1

2016-12-05 Thread Ema (Code Review)

Ema has uploaded a new change for review.

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

Change subject: Release 4.1.4-1wm1
..

Release 4.1.4-1wm1

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish4 
refs/changes/89/325289/1

diff --git a/debian/changelog b/debian/changelog
index 319edd8..ff68cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+varnish (4.1.4-1wm1) jessie-wikimedia; urgency=medium
+
+  * New upstream release.
+
+ -- Emanuele Rocca   Mon, 05 Dec 2016 13:19:31 +0100
+
 varnish (4.1.3-1wm4) jessie-wikimedia; urgency=medium
 
   * Make extrachance upper bound configurable.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9499a10edd97f41b5c7b6dcc486d1509fc3eb17
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish4
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use single quotes

2016-12-05 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Use single quotes
..

Use single quotes

Follow-up to Icc9bc096

Change-Id: I4863e0e7946fd59022846198e86302f556fee617
---
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/325292/1

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 23720a8..b2fac3c 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -50,7 +50,7 @@
mw.config.set( 'wgUserLanguage', 'en' );
 
assert.equal( mw.language.convertNumber( 1800 ), '1.800', 
'formatting' );
-   assert.equal( mw.language.convertNumber( "1.800", true ), 
'1800', 'unformatting' );
+   assert.equal( mw.language.convertNumber( '1.800', true ), 
'1800', 'unformatting' );
} );
 
function grammarTest( langCode, test ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: StringHelper: Added return statement with boolean

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: StringHelper: Added return statement with boolean
..


StringHelper: Added return statement with boolean

Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af
(cherry picked from commit f9889a894f9033b0e359bde8618a4cf1ee3eebd9)
---
M includes/utility/StringHelper.class.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/utility/StringHelper.class.php 
b/includes/utility/StringHelper.class.php
index 11a22f8..744a457 100644
--- a/includes/utility/StringHelper.class.php
+++ b/includes/utility/StringHelper.class.php
@@ -167,6 +167,7 @@
case self::FILTER_EQUALSNOT:
return $sHaystack !== $sNeedle;
}
+   return false;
}
 
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
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] mediawiki...ElectronPdfService[wmf/1.29.0-wmf.4]: Use prefixedDbKey when redirecting to Electron

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Use prefixedDbKey when redirecting to Electron
..


Use prefixedDbKey when redirecting to Electron

Bug: T152113
Change-Id: I920834913aec01e5285a9723014463cbc0fc3c16
---
M specials/SpecialElectronPdf.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index e16b070..d9fe326 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -173,7 +173,7 @@
private function getServiceUrl( Title $title ) {
$restBaseUrl = $this->config->get( 
'ElectronPdfServiceRESTbaseURL' );
 
-   return $restBaseUrl . urlencode( $title->getPrefixedText() );
+   return $restBaseUrl . urlencode( $title->getPrefixedDBkey() );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I920834913aec01e5285a9723014463cbc0fc3c16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: wmf/1.29.0-wmf.4
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-05T10:00:01+0000

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: New Wikidata Build - 2016-12-05T10:00:01+
..


New Wikidata Build - 2016-12-05T10:00:01+

Change-Id: Ie530d000496f608ddee2a04d40cfa1a5914e24bd
---
M composer.lock
A extensions/Wikibase/client/i18n/sty.json
M extensions/Wikibase/repo/i18n/ast.json
M vendor/composer/installed.json
4 files changed, 30 insertions(+), 19 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index d188793..f55d5e1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a"
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b946b675e628dcb586bcef000a96a81f652c164a;,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b80daa060e9dc6e6d98920203a128362a9150517;,
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517",
 "shasum": ""
 },
 "require": {
@@ -1662,7 +1662,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-12-02 21:21:23"
+"time": "2016-12-04 21:41:34"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/sty.json 
b/extensions/Wikibase/client/i18n/sty.json
new file mode 100644
index 000..f3b6ea6
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/sty.json
@@ -0,0 +1,11 @@
+{
+   "@metadata": {
+   "authors": [
+   "Khanmarat"
+   ]
+   },
+   "tooltip-t-wikibase": "Мәғлүмәтле репозиторийтағы пәйләнкән элементҡа 
ссылка",
+   "wikibase-dataitem": "{{WBREPONAME}}ның элементы",
+   "wikibase-editlinks": "Ссылкаларны төсәткәле",
+   "wikibase-editlinkstitle": "Пашҡа телләртәге ссылкаларны төсәткәле"
+}
diff --git a/extensions/Wikibase/repo/i18n/ast.json 
b/extensions/Wikibase/repo/i18n/ast.json
index 84c736c..57d639a 100644
--- a/extensions/Wikibase/repo/i18n/ast.json
+++ b/extensions/Wikibase/repo/i18n/ast.json
@@ -386,7 +386,7 @@
"apihelp-wbformatvalue-param-datatype": "El tipu de datu del valor. 
Esto ye diferente del tipu del valor",
"apihelp-wbformatvalue-param-datavalue": "Los datos a los que dar 
formatu. Esto tien que ser la serialización JSON d'un oxetu DataValue.",
"apihelp-wbformatvalue-param-options": "Les opciones que tien d'usar el 
formateador. Daes como oxetu JSON.",
-   "apihelp-wbformatvalue-param-property": "Id de propiedá a la que 
pertenez el valor de los datos, tendría d'usase en llugar del parámetru 
datatype.",
+   "apihelp-wbformatvalue-param-property": "ID de la propiedá a la que 
pertenez el valor de los datos, tendría d'usase en llugar del parámetru 
datatype.",
"apihelp-wbformatvalue-example-1": "Da formatu a un valor simple de 
cadena de testu.",
"apihelp-wbformatvalue-example-2": "Da formatu a un valor de cadena de 
testu como URL en HTML.",
"apihelp-wbgetclaims-description": "Recibe afirmaciones de Wikibase.",
@@ -421,12 +421,12 @@
"apihelp-wbgetentities-example-10": "Algamar l'elementu pa la páxina 
«Berlin» del sitiu \"enwiki\", colos atributos de llingua del idioma inglés",
"apihelp-wbgetentities-example-11": "Algamar l'elementu de la páxina 
«Berlin» del sitiu \"enwiki\" después de normalizar el títulu dende «berlin»",
"apihelp-wbgetentities-example-12": "Algamar los enllaces de sitiu del 
elementu Q42",
-   "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42 
amosando sólo los enllaces d'enwiki",
+   "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42 
amosando sólo los enllaces d'\"enwiki\"",
"apihelp-wblinktitles-description": "Asocia dos artículos de dos wikis 
diferentes con un elementu de Wikibase.",
-   "apihelp-wblinktitles-param-tosite": "Un identificador pal sitiu onde 
ta allugada la páxina.\nÚsalu xunto con 'totitle' pa facer un enllaz completu 
del sitiu.",
-   "apihelp-wblinktitles-param-totitle": "Títulu de la páxina a 
asociar.\nÚsalo xunto con 'tosite' pa crear un enllaz completu del sitiu.",
-   "apihelp-wblinktitles-param-fromsite": "Un identificador pal sitiu nel 
que ta asitiada la páxina.\nÚsalo xunto con 'fromtitle' pa crear un enllaz 
completu del sitiu.",
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ElectronPdfService extension on test wikis & mediawik...

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Enable ElectronPdfService extension on test wikis & 
mediawikiwiki
..


Enable ElectronPdfService extension on test wikis & mediawikiwiki

Bug: T150944
Change-Id: I3ec52bbcd3fd01e32bbf7e81bddccd6d8aa32edb
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 0c39c43..dde7c8d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -257,10 +257,6 @@
$wgCollectionCommandToServeURL[ 'zip_post' ] = 
'https://pediapress.com/wmfup/';
 }
 
-if ( $wmgUseElectronPdfService ) {
-   wfLoadExtension( 'ElectronPdfService' );
-}
-
 if ( $wmgUsePageImages ) {
require_once "$IP/extensions/PageImages/PageImages.php";
$wgPageImagesExpandOpenSearchXml = $wmgPageImagesExpandOpenSearchXml;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2e311e6..887cded 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1796,6 +1796,10 @@
$wgCollectionPortletFormats = $wmgCollectionPortletFormats;
 }
 
+if ( $wmgUseElectronPdfService ) {
+   wfLoadExtension( 'ElectronPdfService' );
+}
+
 # Various system to allow/prevent flooding
 # (including exemptions for scheduled outreach events)
 require( "$wmfConfigDir/throttle.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d81235e..fbbabdd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12045,6 +12045,13 @@
// ta/gu/ml/ne/ur (T39154, T39384, T39672, T39374, T43714).
 ],
 
+'wmgUseElectronPdfService' => [
+   'default' => false,
+   'testwiki' => true, // T150944
+   'test2wiki' => true, // T150944
+   'mediawikiwiki' => true, // T150944
+],
+
 'wmgUseSpamBlacklist' => [
'default' => true,
'private' => false,

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Use Special::MyLanguage when linking to wikis

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Use Special::MyLanguage when linking to wikis
..


Use Special::MyLanguage when linking to wikis

Bug: T85533
Change-Id: I3fd16697c1131362b6a9064d8e6b1e4e4da6b5fb
---
M data/i18n/en.json
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 603a8d8..4d988c4 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -27,16 +27,16 @@
 
"mock": "This is a mock scholarship application site only, use it just 
for testing.",
 
-   "not-open": "The 2017 Wikimania Scholarship process is not yet open. 
For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Main_Page\;>About 
Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Scholarships\;>About 
Scholarships\n",
+   "not-open": "The 2017 Wikimania Scholarship process is not yet open. 
For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>About
 Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\;>About
 Scholarships\n",
 
-   "deadline-passed": "Scholarship application deadline was February 
16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result 
of their application.\nPlease see the scholarships 
page on the wiki for more details.",
+   "deadline-passed": "Scholarship application deadline was February 
16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result 
of their application.\nPlease see the scholarships
 page on the wiki for more details.",
 
-   "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org\;>Wikimania 2017, the annual 
international conference centered on Wikimedia projects. Awardees will receive 
a scholarship which will cover conference registration fees, hotel, and 
roundtrip travel to Wikimania in Montréal, Quebec, Canada , Aug 9-13, 
2017.\nApplications may be submitted in any language, but every 
applicant must provide evidence of English language abilities that are 
at a level which would enable them to participate in Wikimania, a conference 
which is primarily conducted in English. Sufficient English abilities could be 
demonstrated in the application itself or elsewhere.\nThis is not a 
scholarship for university study. Applications not obviously related to the 
conference will be discarded.\nPlease carefully consider your financial 
needs before applying for a scholarship to attend Wikimania. There are limited 
funds available and many applicants do not have the financial means to attend 
Wikimania without this opportunity. Thank you.\nPlease note that 
if you need more then 10 minutes to complete this application, please 
draft your answers in a text editor, reload this page and then 
copy-paste your answers into corresponding fields before submitting. This 
application may give an error (\"Missing or invalid CSRF token\") if it is open 
for more then 15 minutes before submitting.\nThe deadline to apply is 
February 16, 23:59 UTC. ",
+   "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
 2017, the annual international conference centered on Wikimedia projects. 
Awardees will receive a scholarship which will cover conference registration 
fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada , 
Aug 9-13, 2017.\nApplications may be submitted in any language, 
but every applicant must provide evidence of English language abilities 
that are at a level which would enable them to participate in Wikimania, a 
conference which is primarily conducted in English. Sufficient English 
abilities could be demonstrated in the application itself or 
elsewhere.\nThis is not a scholarship for university study. Applications 
not obviously related to the conference will be discarded.\nPlease 
carefully consider your financial needs before applying for a scholarship to 
attend Wikimania. There are limited funds available and many applicants do not 
have the financial means to attend Wikimania without this opportunity. Thank 
you.\nPlease note that if you need more then 10 minutes to 
complete this application, please draft your answers in a text editor, 
reload this page and then copy-paste your answers into corresponding fields 
before submitting. This application may give an error (\"Missing or invalid 
CSRF token\") if it is open for more then 15 minutes before 
submitting.\nThe deadline to apply is February 16, 23:59 
UTC. ",
 
-   "form-intro-faq": "Frequently asked questions",
+   "form-intro-faq": "Frequently asked questions",
 
"form-scholarship-type": "Type of Scholarship",
-   "form-scholarship": "This year for Wikimania 2017, the

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: StringHelper: Added return statement with boolean

2016-12-05 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

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

Change subject: StringHelper: Added return statement with boolean
..

StringHelper: Added return statement with boolean

Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af
(cherry picked from commit f9889a894f9033b0e359bde8618a4cf1ee3eebd9)
---
M includes/utility/StringHelper.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/includes/utility/StringHelper.class.php 
b/includes/utility/StringHelper.class.php
index 11a22f8..744a457 100644
--- a/includes/utility/StringHelper.class.php
+++ b/includes/utility/StringHelper.class.php
@@ -167,6 +167,7 @@
case self::FILTER_EQUALSNOT:
return $sHaystack !== $sNeedle;
}
+   return false;
}
 
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1087

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Depool db1087
..


db-eqiad.php: Depool db1087

db1087 needs an ALTER table, so needs to be depooled

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index c9d6a52..5905050 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
'db1082' => 500, # 3.6TB 512GB
-   'db1087' => 500, # 3.6TB 512GB
+#  'db1087' => 500, # 3.6TB 512GB #T148967
'db1092' => 500, # 3.6TB 512GB
],
's6' => [

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update Semantic extensions part 1

2016-12-05 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Update Semantic extensions part 1
..

Update Semantic extensions part 1

Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
---
M translatewiki-composer.json
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/95/325295/1

diff --git a/translatewiki-composer.json b/translatewiki-composer.json
index d9e4451..ca6ad15 100644
--- a/translatewiki-composer.json
+++ b/translatewiki-composer.json
@@ -1,8 +1,8 @@
 {
"require": {
-   "mediawiki/semantic-maps": "~3.4",
-"mediawiki/maps": "~3.8",
-"mediawiki/semantic-media-wiki": "~2.4",
+"mediawiki/maps": "~4.0",
+"mediawiki/page-forms": "~4.0",
+   "mediawiki/semantic-media-wiki": "~2.4",
"romaricdrigon/metayaml": "~1.0"
},
"extra": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: EditorConfig file

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: EditorConfig file
..


EditorConfig file

EditorConfig format standardizes some formatting properties across different 
editors and simplifies setting up IDE formatting.
For more info see http://editorconfig.org

Change-Id: Iba6f964bf403467c02e8e2cebf32914ac249007b
---
A .editorconfig
1 file changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..452169f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.php]
+max_line_length = 140
+quote_type = single
+spaces_around_operators = true
+spaces_around_brackets = inside
+indent_brace_style = K

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba6f964bf403467c02e8e2cebf32914ac249007b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Special:TranslationStats: start using datetime-local format

2016-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Special:TranslationStats: start using datetime-local format
..


Special:TranslationStats: start using datetime-local format

This should help if we want to migrate to browser native datetime
input which uses this format.

Change-Id: I9185ffe9fa8e991c33c2f5910bfc2c79d9e63f48
---
M resources/js/ext.translate.special.translationstats.js
M specials/SpecialTranslationStats.php
2 files changed, 4 insertions(+), 13 deletions(-)

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



diff --git a/resources/js/ext.translate.special.translationstats.js 
b/resources/js/ext.translate.special.translationstats.js
index 9440e5f..2e55304 100644
--- a/resources/js/ext.translate.special.translationstats.js
+++ b/resources/js/ext.translate.special.translationstats.js
@@ -14,23 +14,14 @@
// Based on UploadWizard, TranslationNotifications
$( '#start' )
.datepicker( {
-   dateFormat: 'yymmdd',
+   dateFormat: 'yy-mm-ddT00:00:00',
constrainInput: false,
showOn: 'focus',
changeMonth: true,
changeYear: true,
showAnim: false,
showButtonPanel: true,
-   maxDate: new Date(),
-   onClose: function ( dateText, inst ) {
-   // TranslationStats works with the 
mmddhhmmss format,
-   // so zeros that represents generic hh:mm:ss 
must be added.
-   // The zeros are added only if a date was 
actually selected
-   // and is not currently displayed.
-   if ( dateText !== '' && inst.input.val().length 
< 14 ) {
-   inst.input.val( dateText + '00' );
-   }
-   }
+   maxDate: new Date()
} )
.attr( 'autocomplete', 'off' );
 } );
diff --git a/specials/SpecialTranslationStats.php 
b/specials/SpecialTranslationStats.php
index 6643f79..2eb7303 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -92,7 +92,7 @@
$opts->validateIntBounds( 'height', 200, 1000 );
 
if ( $opts['start'] !== '' ) {
-   $opts['start'] = (string)( wfTimestamp( TS_MW, 
$opts['start'] ) );
+   $opts['start'] = rtrim( wfTimestamp( TS_ISO_8601, 
$opts['start'] ), 'Z' );
}
 
$validScales = array( 'months', 'weeks', 'days', 'hours' );
@@ -166,7 +166,7 @@
$this->eInput( 'width', $opts ) .
$this->eInput( 'height', $opts ) .
'' .
-   $this->eInput( 'start', $opts, 16 ) . // Should 
fit mmddhhmmss
+   $this->eInput( 'start', $opts, 24 ) .
$this->eInput( 'days', $opts ) .
$this->eRadio( 'scale', $opts, array( 'months', 
'weeks', 'days', 'hours' ) ) .
$this->eRadio( 'count', $opts, 
$this->getGraphTypes() ) .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9185ffe9fa8e991c33c2f5910bfc2c79d9e63f48
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: KartikMistry 
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] mediawiki...PrivateDomains[master]: Remove old PHP entry point in favor of extension.json

2016-12-05 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review.

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

Change subject: Remove old PHP entry point in favor of extension.json
..

Remove old PHP entry point in favor of extension.json

MW 1.25 or newer is now explicitly required

Change-Id: Iae1fca81c9e93d301c1076be66efcdaa0033859c
---
D PrivateDomains.php
1 file changed, 0 insertions(+), 68 deletions(-)


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

diff --git a/PrivateDomains.php b/PrivateDomains.php
deleted file mode 100644
index 1a3ae0e..000
--- a/PrivateDomains.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- * @author Jack Phoenix 
- * @link https://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['specialpage'][] = array(
-   'name' => 'PrivateDomains',
-   'version' => '1.5.0',
-   'author' => array( 'Inez Korczyński', 'Jack Phoenix' ),
-   'description' => 'Allows to restrict editing to users with a certain 
e-mail address',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:PrivateDomains',
-   'license-name' => 'GPL-2.0+',
-);
-
-// Set up the new special page
-$wgAutoloadClasses['PrivateDomains'] = __DIR__ . '/SpecialPrivateDomains.php';
-$wgMessagesDirs['PrivateDomains'] = __DIR__ . '/i18n';
-$wgSpecialPages['PrivateDomains'] = 'PrivateDomains';
-
-$wgAutoloadClasses['PrivateDomainsHooks'] = __DIR__ . 
'/PrivateDomainsHooks.php';
-$wgHooks['AlternateEdit'][] = 'PrivateDomainsHooks::onAlternateEdit';
-$wgHooks['UserLoggedIn'][] = 'PrivateDomainsHooks::onUserLoginComplete';
-$wgHooks['ConfirmEmailComplete'][] = 
'PrivateDomainsHooks::onUserLoginComplete';
-
-# set 'privatedomains' right to users in staff or bureaucrat group
-$wgAvailableRights[] = 'privatedomains';
-$wgGroupPermissions['staff']['privatedomains'] = true;
-$wgGroupPermissions['bureaucrat']['privatedomains'] = true;
-
-# overwrite standard groups permissions
-$wgGroupPermissions['staff']['edit'] = true;
-$wgGroupPermissions['bureaucrat']['edit'] = true;
-$wgGroupPermissions['user']['edit'] = false;
-$wgGroupPermissions['*']['edit'] = false;
-$wgGroupPermissions['privatedomains']['edit'] = true;
-
-$wgGroupPermissions['staff']['upload'] = true;
-$wgGroupPermissions['bureaucrat']['upload'] = true;
-$wgGroupPermissions['user']['upload'] = false;
-$wgGroupPermissions['*']['upload'] = false;
-$wgGroupPermissions['privatedomains']['upload'] = true;
-
-$wgGroupPermissions['staff']['move'] = true;
-$wgGroupPermissions['bureaucrat']['move'] = true;
-$wgGroupPermissions['user']['move'] = false;
-$wgGroupPermissions['*']['move'] = false;
-$wgGroupPermissions['privatedomains']['move'] = true;
-
-$wgGroupPermissions['user']['reupload'] = false;
-$wgGroupPermissions['*']['reupload'] = false;
-$wgGroupPermissions['privatedomains']['reupload'] = true;
-
-$wgGroupPermissions['user']['reupload-shared'] = false;
-$wgGroupPermissions['*']['reupload-shared'] = false;
-$wgGroupPermissions['privatedomains']['reupload-shared'] = true;
-
-$wgGroupPermissions['user']['minoredit'] = false;
-$wgGroupPermissions['*']['minoredit'] = false;
-$wgGroupPermissions['privatedomains']['minoredit'] = true;
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae1fca81c9e93d301c1076be66efcdaa0033859c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PrivateDomains
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker: add package provider

2016-12-05 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: docker: add package provider
..


docker: add package provider

While most of our containers will be managed by kubernetes itself, a few
will be managed by puppet itself; it is therefore convenient using the
package abstraction to manage installation/upgrade of docker images.

Change-Id: I5a016874acb012b651617b03cfe3f09119f04d23
---
A modules/docker/lib/puppet/provider/package/docker.rb
1 file changed, 99 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/docker/lib/puppet/provider/package/docker.rb 
b/modules/docker/lib/puppet/provider/package/docker.rb
new file mode 100644
index 000..70bc545
--- /dev/null
+++ b/modules/docker/lib/puppet/provider/package/docker.rb
@@ -0,0 +1,99 @@
+# Puppet package provider for `docker`.
+#
+# Copyright 2016 Giuseppe Lavagetto, Wikimedia Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide(
+  :docker, :parent => Puppet::Provider::Package) do
+
+  desc 'Puppet package provider for docker.'
+
+  has_feature :installable, :uninstallable, :versionable, :upgradeable
+
+  commands :docker => '/usr/bin/docker'
+
+  DOCKER_IMAGES_FORMAT_STRING = "{{.Repository}}\t{{.Tag}}\t{{.ID}}"
+
+  def self.instances
+packages = []
+docker('images', '--format', DOCKER_IMAGES_FORMAT_STRING).split("\n").each 
do |line|
+  repo, tag, _ = line.split "\t"
+  package = {:ensure => tag, :name => repo,
+  :provider => :docker}
+  packages << new(package)
+end
+
+packages
+  end
+
+  def installed_versions
+docker('images', '--format', '{{.Tag}}', resource[:name]).split("\n")
+  end
+
+  def required_version
+should = resource[:ensure]
+case should
+when true, false, Symbol
+  "#{resource[:name]}:latest"
+else
+  "#{resource[:name]}:#{should}"
+end
+  end
+
+  def install
+docker('pull', required_version)
+installed_versions.each do |version|
+  tag = "#{resource[:name]}:#{version}"
+  next if tag == required_version
+  begin
+docker('rmi', tag)
+  rescue Puppet::ExecutionFailure
+Puppet.warning("Not removing image #{tag} as it is currently in use.")
+  end
+end
+  end
+
+  def uninstall
+installed_versions.each do |version|
+  docker('rmi', "#{resource[:name]}:#{version}")
+end
+  end
+
+  def update
+install
+  end
+
+  def query
+result = { :ensure => :absent, :name => resource[:name] }
+versions = installed_versions
+
+unless versions.empty?
+  if versions.include?('latest')
+result[:ensure] = 'latest'
+  else
+result[:ensure] = versions.sort{ |x, y| Gem::Version.new(x) <=> 
Gem::Version.new(y) }.pop
+  end
+end
+
+result
+  end
+
+  # Ok this is dumb. But, it should do what people would expect when writing
+  # ensure => latest
+  def latest
+'latest'
+  end
+end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a016874acb012b651617b03cfe3f09119f04d23
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

< 1 2 3 4 >

201 - 300 of 367 matches

Mail list logo