date:20170309

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensions: Removed error_log

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

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

Change subject: BSExtensions: Removed error_log
..


BSExtensions: Removed error_log

Change-Id: I882bbe7f421b73ac42b767e580c20d41a13edd78
---
M ContextMenu/includes/api/BSApiContextMenuTasks.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/ContextMenu/includes/api/BSApiContextMenuTasks.php 
b/ContextMenu/includes/api/BSApiContextMenuTasks.php
index 8584b14..5f50471 100644
--- a/ContextMenu/includes/api/BSApiContextMenuTasks.php
+++ b/ContextMenu/includes/api/BSApiContextMenuTasks.php
@@ -10,7 +10,6 @@
}
 
protected function task_getMenuItems ( $oData, $aParams ) {
-   error_log(__LINE__, 0);
$oResult = $this->makeStandardReturn();
 
$aItems = array();

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dbstore2.my.cnf: Add replication ignore filters

2017-03-09 Thread Marostegui (Code Review)

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

Change subject: dbstore2.my.cnf: Add replication ignore filters
..


dbstore2.my.cnf: Add replication ignore filters

x1 has all the production databases but only with the echo tables.
So, for this replication channel, we need to replicate, pretty much
everything. It is easier just to blacklist what we want to ignore rather
than whitelist what we want to replicate.

So we ignore: mysql,ops,trash,sys and percona databases

Bug: T159707
Change-Id: I70d8f7b932a399e5cfb5ec7cee853210cd36
---
M modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
index c95b4b8..b2f9d8c 100644
--- a/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
@@ -113,9 +113,11 @@
 m3.replicate-wild-do-table = heartbeat.%
 m4.replicate-wild-do-table = log.%
 m4.replicate-wild-do-table = heartbeat.%
-x1.replicate-wild-do-table = flowdb.%
-x1.replicate-wild-do-table = wikishared.%
-x1.replicate-wild-do-table = heartbeat.%
+x1.replicate-wild-ignore-table = mysql.%
+x1.replicate-wild-ignore-table = ops.%
+x1.replicate-wild-ignore-table = trash.%
+x1.replicate-wild-ignore-table = sys.%
+x1.replicate-wild-ignore-table = percona.%
 
 <% if @kernelversion < "3.19" %>
 # Until kernel 3.16 http://www.spinics.net/lists/stable/msg61873.html

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70d8f7b932a399e5cfb5ec7cee853210cd36
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
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] pywikibot/core[master]: Add 'application/vnd.php.serialized' to expected content for...

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

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

Change subject: Add 'application/vnd.php.serialized' to expected content 
formats of DataSite
..


Add 'application/vnd.php.serialized' to expected content formats of DataSite

Bug: T129281
Change-Id: Ifef728e940451b60fb04cd4d3d4bae0501548c03
---
M tests/paraminfo_tests.py
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py
index 86236ba..8a8d776 100644
--- a/tests/paraminfo_tests.py
+++ b/tests/paraminfo_tests.py
@@ -12,6 +12,7 @@
 
 from pywikibot.family import WikimediaFamily
 from pywikibot.page import Claim, Property
+from pywikibot.site import DataSite
 from pywikibot.tools import MediaWikiVersion
 
 from tests.aspects import (
@@ -123,6 +124,9 @@
 ]
 if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.24'):
 base.append('application/json')
+if isinstance(self.site, DataSite):
+# It is not clear when this format has been added, see T129281.
+base.append('application/vnd.php.serialized')
 
 self._check_param_values(self.site, 'edit', 'contentformat', base)
 self._check_param_values(self.site, 'parse', 'contentformat', base)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef728e940451b60fb04cd4d3d4bae0501548c03
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: test_allpages_langlinks_enabled: Use project namespace inste...

2017-03-09 Thread Dalba (Code Review)

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

Change subject: test_allpages_langlinks_enabled: Use project namespace instead 
of main
..

test_allpages_langlinks_enabled: Use project namespace instead of main

Pages on the main namespace of wikidata have no language links, therefore
the test timeouts there. Use project namespace (4) instead of the
main (default) to resolve the issue.

Bug: T160148
Change-Id: Ia1a2445f907557aca76c505e74095d881c50069f
---
M tests/site_tests.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/72/342172/1

diff --git a/tests/site_tests.py b/tests/site_tests.py
index c4f1675..080ea02 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -605,10 +605,11 @@
 def test_allpages_langlinks_enabled(self):
 """Test allpages with langlinks enabled."""
 mysite = self.get_site()
-for page in mysite.allpages(filterlanglinks=True, total=5):
+for page in mysite.allpages(
+filterlanglinks=True, total=3, namespace=4):
 self.assertIsInstance(page, pywikibot.Page)
 self.assertTrue(mysite.page_exists(page))
-self.assertEqual(page.namespace(), 0)
+self.assertEqual(page.namespace(), 4)
 self.assertNotEqual(page.langlinks(), [])
 
 def test_allpages_langlinks_disabled(self):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1a2445f907557aca76c505e74095d881c50069f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dbstore2.my.cnf: Add replication filter for wikis

2017-03-09 Thread Marostegui (Code Review)

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

Change subject: dbstore2.my.cnf: Add replication filter for wikis
..

dbstore2.my.cnf: Add replication filter for wikis

x1 has wiki% databases with echo_% tables, so we need the filter to
replicate those

Bug: T159707
Change-Id: I70d8f7b932a399e5cfb5ec7cee853210cd36
---
M modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
index c95b4b8..a7c1a30 100644
--- a/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/dbstore2.my.cnf.erb
@@ -116,6 +116,7 @@
 x1.replicate-wild-do-table = flowdb.%
 x1.replicate-wild-do-table = wikishared.%
 x1.replicate-wild-do-table = heartbeat.%
+x1.replicate-wild-do-table = %wik%.%
 
 <% if @kernelversion < "3.19" %>
 # Until kernel 3.16 http://www.spinics.net/lists/stable/msg61873.html

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

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

___
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: Weight 1 for db1061

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

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

Change subject: db-eqiad.php: Weight 1 for db1061
..


db-eqiad.php: Weight 1 for db1061

Change-Id: If15da3dea0cfade04108ac738f6cd9f0ee6b4162
---
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 e918ad0..7a67408 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -154,7 +154,7 @@
 #  'db1022' => 1,   # B1 1.4TB  64GB, api #T159414
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1037' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-   'db1061' => 0,   # D1 2.8TB 128GB #temporary api #T159414
+   'db1061' => 1,   # D1 2.8TB 128GB #temporary api #T159414
'db1085' => 500, # B3 3.6TB 512GB
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 500, # D2 3.6TB 512GB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If15da3dea0cfade04108ac738f6cd9f0ee6b4162
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
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: Weight 1 for db1061

2017-03-09 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Weight 1 for db1061
..

db-eqiad.php: Weight 1 for db1061

Change-Id: If15da3dea0cfade04108ac738f6cd9f0ee6b4162
---
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/70/342170/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index e918ad0..7a67408 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -154,7 +154,7 @@
 #  'db1022' => 1,   # B1 1.4TB  64GB, api #T159414
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1037' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-   'db1061' => 0,   # D1 2.8TB 128GB #temporary api #T159414
+   'db1061' => 1,   # D1 2.8TB 128GB #temporary api #T159414
'db1085' => 500, # B3 3.6TB 512GB
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 500, # D2 3.6TB 512GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If15da3dea0cfade04108ac738f6cd9f0ee6b4162
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/mediawiki-config[master]: db-eqiad.php: Depool db1022

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

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

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


db-eqiad.php: Depool db1022

db1022 needs an ALTER table.
Pool db1061 for temporary API service

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

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 b2d1acd..e918ad0 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -151,10 +151,10 @@
's6' => [
'db1050' => 0,   # B2 2.8TB  64GB, master
 #  'db1023' => 0,   # B1 1.4TB  64GB, old master
-   'db1022' => 1,   # B1 1.4TB  64GB, api
+#  'db1022' => 1,   # B1 1.4TB  64GB, api #T159414
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1037' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-#  'db1061' => 0,   # D1 2.8TB 128GB
+   'db1061' => 0,   # D1 2.8TB 128GB #temporary api #T159414
'db1085' => 500, # B3 3.6TB 512GB
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 500, # D2 3.6TB 512GB
@@ -391,7 +391,7 @@
'db1030' => 1,
],
'api' => [
-   'db1022' => 1,
+   'db1061' => 1,
],
'watchlist' => [
'db1037' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ed3fdc936e2ade426c9b3769a4f89c1b48427de
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
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 db1022

2017-03-09 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1022

db1022 needs an ALTER table.
Pool db1061 for temporary API service

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index b2d1acd..e918ad0 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -151,10 +151,10 @@
's6' => [
'db1050' => 0,   # B2 2.8TB  64GB, master
 #  'db1023' => 0,   # B1 1.4TB  64GB, old master
-   'db1022' => 1,   # B1 1.4TB  64GB, api
+#  'db1022' => 1,   # B1 1.4TB  64GB, api #T159414
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1037' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-#  'db1061' => 0,   # D1 2.8TB 128GB
+   'db1061' => 0,   # D1 2.8TB 128GB #temporary api #T159414
'db1085' => 500, # B3 3.6TB 512GB
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 500, # D2 3.6TB 512GB
@@ -391,7 +391,7 @@
'db1030' => 1,
],
'api' => [
-   'db1022' => 1,
+   'db1061' => 1,
],
'watchlist' => [
'db1037' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ed3fdc936e2ade426c9b3769a4f89c1b48427de
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] oojs/ui[master]: build: Bump various devDependencies to master

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

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

Change subject: build: Bump various devDependencies to master
..


build: Bump various devDependencies to master

 grunt-banana-checker 0.5.0  →  0.6.0
 grunt-contrib-cssmin 1.0.2  →  2.0.0
 grunt-contrib-less   1.4.0  →  1.4.1
 grunt-contrib-uglify 2.0.0  →  2.2.0

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

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



diff --git a/package.json b/package.json
index d202374..0e6baa8 100644
--- a/package.json
+++ b/package.json
@@ -28,13 +28,13 @@
   "devDependencies": {
 "eslint-config-wikimedia": "0.3.0",
 "grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0",
+"grunt-banana-checker": "0.6.0",
 "grunt-contrib-clean": "1.0.0",
 "grunt-contrib-concat": "1.0.1",
 "grunt-contrib-copy": "1.0.0",
-"grunt-contrib-cssmin": "1.0.2",
-"grunt-contrib-less": "1.4.0",
-"grunt-contrib-uglify": "2.0.0",
+"grunt-contrib-cssmin": "2.0.0",
+"grunt-contrib-less": "1.4.1",
+"grunt-contrib-uglify": "2.2.0",
 "grunt-contrib-watch": "1.0.0",
 "grunt-csscomb": 
"git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1",
 "grunt-cssjanus": "0.3.2",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4d879c5948d8425e62bb915cd8b91175526a3d0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: OOJs UI: Add poem

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

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

Change subject: OOJs UI: Add poem
..


OOJs UI: Add poem

Change-Id: I6df191c4371f01205ec991114b539baaea5e67f0
---
M extension.json
A modules/dm/translationunits/mw.cx.dm.PoemTranslationUnit.js
M modules/dm/translationunits/mw.cx.dm.SectionTranslationUnit.js
M modules/dm/translationunits/mw.cx.dm.SentenceTranslationUnit.js
M modules/dm/translationunits/mw.cx.dm.TemplateTranslationUnit.js
A modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
6 files changed, 83 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index ab310a9..70d18e2 100644
--- a/extension.json
+++ b/extension.json
@@ -1247,6 +1247,7 @@
"mw.cx.dm.ImageTranslationUnit",
"mw.cx.dm.SentenceTranslationUnit",
"mw.cx.dm.LinkTranslationUnit",
+   "mw.cx.dm.PoemTranslationUnit",
"mw.cx.dm.ReferenceTranslationUnit",
"mw.cx.dm.TemplateTranslationUnit",
"mw.cx.dm.SectionTranslationUnit"
@@ -1283,6 +1284,14 @@
],
"dependencies": [
"mw.cx.dm.SectionTranslationUnit"
+   ]
+   },
+   "mw.cx.dm.PoemTranslationUnit": {
+   "scripts": [
+   
"dm/translationunits/mw.cx.dm.PoemTranslationUnit.js"
+   ],
+   "dependencies": [
+   "mw.cx.dm.TranslationUnit"
]
},
"mw.cx.dm.ReferenceTranslationUnit": {
@@ -1627,6 +1636,7 @@
"mw.cx.ui.TranslationUnit",
"mw.cx.ui.ImageTranslationUnit",
"mw.cx.ui.SectionTranslationUnit",
+   "mw.cx.ui.PoemTranslationUnit",
"mw.cx.ui.ReferenceTranslationUnit",
"mw.cx.ui.LinkTranslationUnit",
"mw.cx.ui.TemplateTranslationUnit",
@@ -1662,6 +1672,14 @@
"mw.cx.ui.TranslationUnit"
]
},
+   "mw.cx.ui.PoemTranslationUnit": {
+   "scripts": [
+   
"ui/translationunits/mw.cx.ui.PoemTranslationUnit.js"
+   ],
+   "dependencies": [
+   "mw.cx.ui.TranslationUnit"
+   ]
+   },
"mw.cx.ui.ReferenceTranslationUnit": {
"scripts": [

"ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js"
diff --git a/modules/dm/translationunits/mw.cx.dm.PoemTranslationUnit.js 
b/modules/dm/translationunits/mw.cx.dm.PoemTranslationUnit.js
new file mode 100644
index 000..f77a935
--- /dev/null
+++ b/modules/dm/translationunits/mw.cx.dm.PoemTranslationUnit.js
@@ -0,0 +1,29 @@
+'use strict';
+/**
+ * CX Poem TranslationUnit
+ *
+ * @constructor
+ * @param {Object} config
+ * @param {mw.cx.dm.Translation} translation The translation context
+ * @param {Element} sourceDocument
+ * @param {Element} targetDocument
+ */
+mw.cx.dm.PoemTranslationUnit = function PoemTranslationUnit( config, 
translation, sourceDocument, targetDocument ) {
+   mw.cx.dm.PoemTranslationUnit.super.call( this, config, translation, 
sourceDocument, targetDocument );
+};
+
+/* Inheritance */
+OO.inheritClass( mw.cx.dm.PoemTranslationUnit, mw.cx.dm.TranslationUnit );
+
+mw.cx.dm.PoemTranslationUnit.static.name = 'poem';
+mw.cx.dm.PoemTranslationUnit.static.matchRdfaTypes = [ 'mw:Extension/poem' ];
+
+mw.cx.dm.PoemTranslationUnit.prototype.adapt = function () {
+   // XXX: What exactly should we do here? It seems to work as-is
+};
+
+mw.cx.dm.PoemTranslationUnit.prototype.isEditable = function () {
+   return false;
+};
+
+mw.cx.dm.modelRegistry.register( mw.cx.dm.PoemTranslationUnit );
diff --git a/modules/dm/translationunits/mw.cx.dm.SectionTranslationUnit.js 
b/modules/dm/translationunits/mw.cx.dm.SectionTranslationUnit.js
index 5db688d..6886723 100644
--- a/modules/dm/translationunits/mw.cx.dm.SectionTranslationUnit.js
+++ b/modules/dm/translationunits/mw.cx.dm.SectionTranslationUnit.js
@@ -18,7 +18,6 @@
 OO.inheritClass( mw.cx.dm.SectionTranslationUnit, mw.cx.dm.TranslationUnit );
 
 mw.cx.dm.SectionTranslationUnit.static.name = 'section';
-
 mw.cx.dm.SectionTranslationUnit.static.matchTagNames = 
mw.cx.dm.SourcePage.static.sectionTypes;
 
 mw.cx.dm.SectionTranslationUnit.prototype.init

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Bump various devDependencies to master

2017-03-09 Thread Jforrester (Code Review)

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

Change subject: build: Bump various devDependencies to master
..

build: Bump various devDependencies to master

 grunt-banana-checker 0.5.0  →  0.6.0
 grunt-contrib-cssmin 1.0.2  →  2.0.0
 grunt-contrib-less   1.4.0  →  1.4.1
 grunt-contrib-uglify 2.0.0  →  2.2.0

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


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/68/342168/1

diff --git a/package.json b/package.json
index d202374..0e6baa8 100644
--- a/package.json
+++ b/package.json
@@ -28,13 +28,13 @@
   "devDependencies": {
 "eslint-config-wikimedia": "0.3.0",
 "grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0",
+"grunt-banana-checker": "0.6.0",
 "grunt-contrib-clean": "1.0.0",
 "grunt-contrib-concat": "1.0.1",
 "grunt-contrib-copy": "1.0.0",
-"grunt-contrib-cssmin": "1.0.2",
-"grunt-contrib-less": "1.4.0",
-"grunt-contrib-uglify": "2.0.0",
+"grunt-contrib-cssmin": "2.0.0",
+"grunt-contrib-less": "1.4.1",
+"grunt-contrib-uglify": "2.2.0",
 "grunt-contrib-watch": "1.0.0",
 "grunt-csscomb": 
"git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1",
 "grunt-cssjanus": "0.3.2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4d879c5948d8425e62bb915cd8b91175526a3d0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Upgrade qunit testing tools to latest

2017-03-09 Thread Jforrester (Code Review)

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

Change subject: build: Upgrade qunit testing tools to latest
..

build: Upgrade qunit testing tools to latest

 qunit 0.9.2  →  0.9.3
 qunitjs  1.19.0  →  2.1.1

Change-Id: I246ca9e1c169f4aece04fdf7a7f364f459e935d2
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/67/342167/1

diff --git a/package.json b/package.json
index 9fb36d9..f611d75 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 "karma-firefox-launcher": "1.0.1",
 "karma-qunit": "1.2.1",
 "karma-sauce-launcher": "1.1.0",
-"qunit": "0.9.2",
-"qunitjs": "1.19.0"
+"qunit": "0.9.3",
+"qunitjs": "2.1.1"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I246ca9e1c169f4aece04fdf7a7f364f459e935d2
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Set filter for moved configurations

2017-03-09 Thread GeoffreyT2000 (Code Review)

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

Change subject: Set filter for moved configurations
..

Set filter for moved configurations

This commit sets a filter for moved configurations in Special:Log/stable.

Bug: T154871
Change-Id: Ibb9867e825d242f484b9bd042d110b0d7095bfd5
---
M i18n/flaggedrevs/en.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/i18n/flaggedrevs/en.json b/i18n/flaggedrevs/en.json
index 3bab82f..6d0e936 100644
--- a/i18n/flaggedrevs/en.json
+++ b/i18n/flaggedrevs/en.json
@@ -199,5 +199,6 @@
"log-action-filter-stable": "Type of configuration change:",
"log-action-filter-stable-config": "New configuration",
"log-action-filter-stable-modify": "Modified configuration",
-   "log-action-filter-stable-reset": "Configuration reset"
+"log-action-filter-stable-reset": "Configuration reset",
+"log-action-filter-stable-move_stable": "Moved configuration"
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb9867e825d242f484b9bd042d110b0d7095bfd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: GeoffreyT2000 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Change tooltip for subsetted/included filters

2017-03-09 Thread Catrope (Code Review)

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

Change subject: RCFilters UI: Change tooltip for subsetted/included filters
..

RCFilters UI: Change tooltip for subsetted/included filters

Bug: T156864
Change-Id: Ic97c7c6aae78bb6ddf51f0294eeae4b7f86a1a1d
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
4 files changed, 31 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/342165/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 2816f31..4b02880 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1375,6 +1375,7 @@
"rcfilters-highlightmenu-title": "Select a color",
"rcfilters-highlightmenu-help": "Select a color to highlight this 
property",
"rcfilters-filterlist-noresults": "No filters found",
+   "rcfilters-subset-title": "This filter has no effect because its 
results are already included with those of the following broader 
{{PLURAL:$2|filter|filters}} (try using highlighting to distinguishing this 
property): $1",
"rcfilters-filtergroup-registration": "User registration",
"rcfilters-filter-registered-label": "Registered",
"rcfilters-filter-registered-description": "Logged-in editors.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index ece8262..6ad8bc0 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1562,6 +1562,7 @@
"rcfilters-highlightmenu-title": "Title for the highlight menu used to 
select the highlight color for an individual filter.",
"rcfilters-highlightmenu-help": "Tooltip for the highlight menu for 
individual filters.",
"rcfilters-filterlist-noresults": "Message showing no results found for 
searching a filter.",
+   "rcfilters-subset-title": "Tooltip shown when hovering over a filter 
tag when one or more broader filters that contain the hovered filter are also 
selected. This indicates that the hovered filter has no effect because all the 
results it matches are also matched by the broader filter(s).  Parameters:\n* 
$1 - Comma-separated string of selected broader filters that this filter is a 
subset of\n* $2 - Count of filters in $1, for PLURAL",
"rcfilters-filtergroup-registration": "Title for the filter group for 
editor registration type.",
"rcfilters-filter-registered-label": "Label for the filter for showing 
edits made by logged-in users.\n{{Identical|Registered}}",
"rcfilters-filter-registered-description": "Description for the filter 
for showing edits made by logged-in users.",
diff --git a/resources/Resources.php b/resources/Resources.php
index 7a2ba69..fff6618 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1810,10 +1810,12 @@
'rcfilters-highlightbutton-title',
'rcfilters-highlightmenu-title',
'rcfilters-highlightmenu-help',
+   'rcfilters-subset-title',
'recentchanges-noresult',
],
'dependencies' => [
'oojs-ui',
+   'mediawiki.language',
'mediawiki.rcfilters.filters.dm',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-editing-core',
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index f28523a..3c6f7fc 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -13,15 +13,12 @@
 * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for 
popups
 */
mw.rcfilters.ui.CapsuleItemWidget = function 
MwRcfiltersUiCapsuleItemWidget( controller, model, config ) {
-   var $popupContent = $( '' )
-   .addClass( 
'mw-rcfilters-ui-capsuleItemWidget-popup-content' ),
-   descLabelWidget = new OO.ui.LabelWidget();
-
// Configuration initialization
config = config || {};
 
this.controller = controller;
this.model = model;
+   this.popupLabel = new OO.ui.LabelWidget();
this.$overlay = config.$overlay || this.$element;
this.positioned = false;
this.popupTimeoutShow = null;
@@ -39,15 +36,13 @@
padded: false,
align: 'center',
position: 'above',
-   $content: $popupContent
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: microsites: convert to profile/role-structure

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: microsites: convert to profile/role-structure
..

microsites: convert to profile/role-structure

These are the roles for misc. static websites
used on bromine, a ganeti VM with Apache.

Convert code to profile/role-structure, trying to
follow the new Puppet coding style on:

https://wikitech.wikimedia.org/wiki/Puppet_coding#Profiles

WIP

Change-Id: Id29e32021e41fbff4ac6e3dfe7618a3d09fde720
---
M manifests/site.pp
R modules/profile/manifests/microsites/annualreport.pp
R modules/profile/manifests/microsites/endowment.pp
R modules/profile/manifests/microsites/releases.pp
R modules/profile/manifests/microsites/static_bugzilla.pp
R modules/profile/manifests/microsites/transparency.pp
A modules/role/manifests/webserver_misc_static.pp
7 files changed, 36 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/342164/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ff00393..8e00847 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -191,11 +191,9 @@
 include ::standard
 }
 
-# virtual machine for static misc. services
+# VM with webserver for misc. static sites
 node 'bromine.eqiad.wmnet' {
-role(bugzilla::static, microsites::annualreport, microsites::transparency,
-microsites::releases, microsites::endowment)
-include ::standard
+role('webserver_misc_static')
 }
 
 # Californium hosts openstack-dashboard AKA horizon
diff --git a/modules/role/manifests/microsites/annualreport.pp 
b/modules/profile/manifests/microsites/annualreport.pp
similarity index 74%
rename from modules/role/manifests/microsites/annualreport.pp
rename to modules/profile/manifests/microsites/annualreport.pp
index 93a43e5..9d158c0 100644
--- a/modules/role/manifests/microsites/annualreport.pp
+++ b/modules/profile/manifests/microsites/annualreport.pp
@@ -1,11 +1,13 @@
 # https://annual.wikimedia.org/
 # microsite for the WMF annual report
 # http://wikimediafoundation.org/wiki/Annual_Report
-class role::microsites::annualreport {
+class profile::microsites::annualreport {
 
-system::role { 'role::microsites::annualreport': description => 'WMF 
Annual report server - annual.wikimedia.org' }
+system::role { 'role::microsites::annualreport': description => 'WMF 
annual report site - annual.wikimedia.org' }
 
 include ::annualreport
+
+# Firewalling
 include ::base::firewall
 
 ferm::service { 'annualreport_http':
diff --git a/modules/role/manifests/microsites/endowment.pp 
b/modules/profile/manifests/microsites/endowment.pp
similarity index 84%
rename from modules/role/manifests/microsites/endowment.pp
rename to modules/profile/manifests/microsites/endowment.pp
index 5f1de03..d3597a3 100644
--- a/modules/role/manifests/microsites/endowment.pp
+++ b/modules/profile/manifests/microsites/endowment.pp
@@ -1,10 +1,12 @@
 # https://endowment.wikimedia.org/
 # https://meta.wikimedia.org/wiki/Endowment
-class role::microsites::endowment {
+class profile::microsites::endowment {
 
 system::role { 'role::microsites::endowment': description => 
'endowment.wikimedia.org' }
 
 include ::endowment
+
+# Firewalling
 include ::base::firewall
 
 ferm::service { 'endowment_http':
diff --git a/modules/role/manifests/microsites/releases.pp 
b/modules/profile/manifests/microsites/releases.pp
similarity index 94%
rename from modules/role/manifests/microsites/releases.pp
rename to modules/profile/manifests/microsites/releases.pp
index 1de4aec..0d78ca6 100644
--- a/modules/role/manifests/microsites/releases.pp
+++ b/modules/profile/manifests/microsites/releases.pp
@@ -1,4 +1,4 @@
-class role::microsites::releases {
+class profile::microsites::releases {
 system::role { 'releases': description => 'Releases webserver' }
 
 include ::base::firewall
diff --git a/modules/role/manifests/bugzilla/static.pp 
b/modules/profile/manifests/microsites/static_bugzilla.pp
similarity index 79%
rename from modules/role/manifests/bugzilla/static.pp
rename to modules/profile/manifests/microsites/static_bugzilla.pp
index c09cf96..8ad39e3 100644
--- a/modules/role/manifests/bugzilla/static.pp
+++ b/modules/profile/manifests/microsites/static_bugzilla.pp
@@ -1,25 +1,27 @@
-# manifests/role/bugzilla.pp
-# role for a Bugzilla server
-class role::bugzilla::static {
+# static HTML archive of old Bugzilla tickets
+class profile::microsites::static_bugzilla {
 
-include ::base::firewall
 system::role { 'role::bugzilla_static': description => 'Static HTML 
Bugzilla server' }
 
+include ::bugzilla_static
+
+# Firewalling
+include ::base::firewall
 ferm::service { 'bugzilla_static_http':
 proto => 'tcp',
 port  => '80',
 }
 
+# Backups
 include ::role::backup::host
 
 backup::set { 'bugzilla-static' : }
 backup::set {

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: convert to profile/role-structure

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: planet: convert to profile/role-structure
..

planet: convert to profile/role-structure

Convert from role/module to profile/role/module
structure, trying to follow the new puppet coding
style guide. [https://wikitech.wikimedia.org/wiki/Puppet_coding]

Change-Id: If15d461a46499bcf906af068e668f0b99d3b0d70
---
M manifests/site.pp
A modules/profile/manifests/planet/venus.pp
M modules/role/manifests/planet/venus.pp
3 files changed, 232 insertions(+), 224 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/342163/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ff00393..f327b30 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2354,9 +2354,7 @@
 
 # virtual machines hosting 
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org
 node /^planet[12]001\.(eqiad|codfw)\.wmnet$/ {
-role(planet::venus)
-
-interface::add_ip6_mapped { 'main': interface => 'eth0', }
+role('planet_server')
 }
 
 # LDAP servers relied on by OIT for mail
diff --git a/modules/profile/manifests/planet/venus.pp 
b/modules/profile/manifests/planet/venus.pp
new file mode 100644
index 000..be1c32e
--- /dev/null
+++ b/modules/profile/manifests/planet/venus.pp
@@ -0,0 +1,226 @@
+# sets up a planet RSS feed aggregator (planet-venus aka planet 2.0)
+#
+# $planet_domain_name: domain name used, e.g. wikimedia.org or wmflabs.org
+#
+# $planet_meta_link: protocol-relative link to a meta or index page for all 
planets
+#
+# $planet_http_proxy: since we are on a private IP now we need to proxy to 
fetch external URLs
+#
+# $planet_active_dc: set to the currently active DC. feed updates are only 
running here.
+#
+# $planet_languages: translated strings for the UI in various languages
+#list all planet languages and translations for 
index.html.tmpl here.
+#configurations, directories and cronjobs are auto-created 
from this hash.
+#
+class profile::planet::venus (
+$planet_domain_name = hiera('planet_domain_name'),
+$planet_meta_link = 'meta.wikimedia.org/wiki/Planet_Wikimedia'
+$planet_http_proxy = "http://url-downloader.${::site}.wikimedia.org:8080;
+$planet_active_dc = 'eqiad'
+$planet_languages = {
+ar => {
+'subscribe' => '',
+'subscriptions' => 
'',
+'lastupdated'   => ' 
',
+'alltimesutc'   => ' 
 
 
 
 
',
+'poweredby' => ' ',
+'wikimedia' => 
'',
+'planetarium'   => 
'',
+},
+bg => {
+'subscribe' => 
'',
+'subscriptions' => 
'',
+'lastupdated'   => ' 
  
',
+'alltimesutc'   => 'All times are UTC.',
+'poweredby' => ' 
  
',
+'wikimedia' => 
'',
+'planetarium'   => 
'',
+},
+ca => {
+'subscribe' => 'Subscriure\'s',
+'subscriptions' => 'Subscripcions',
+'lastupdated'   => 'ltima actualitzaci',
+'alltimesutc'   => 'Tots els temps sn UTC.',
+'poweredby' => 'Basat en',
+'wikimedia' => 'Wikimedia',
+'planetarium'   => 'Planetari',
+},
+cs => {
+'subscribe' => 'Pihlsit odbr',
+'subscriptions' => 'Odbry',
+'lastupdated'   => 'Posledn aktualizace',
+'alltimesutc'   => 'Vechny asy jsou v UTC.',
+'poweredby' => 'Provozovno na',
+'wikimedia' => 'Wikimedia',
+'planetarium'   => 'Planetrium',
+},
+de => {
+'subscribe' => 'Abonnieren',
+'subscriptions' => 'Teilnehmer',
+'lastupdated'   => 'Zuletzt aktualisiert',
+'alltimesutc'   => 'Alle Zeiten sind UTC.',
+'poweredby' => 'Betrieben mit',
+'wikimedia' => 'Wikimedia',
+'planetarium'   => 'Planetarium',
+},
+en => {
+'subscribe' => 'Subscribe',
+'subscriptions' => 'Subscriptions',
+'lastupdated'   => 'Last updated',
+'alltimesutc'   => 'All times are UTC.',
+'poweredby' => 'Powered by',
+'wikimedia' => 'Wikimedia',
+'planetarium'   => 'Planetarium',
+},
+es => {
+'subscribe' => 'Suscribirse',
+'subscriptions' => 'Suscripciones',
+'lastupdated'   => 'ltima actualizacin',
+'alltimesutc'   => 'Las horas mostradas son en UTC.',
+'poweredby' => 'Impulsado por',
+'wikimedia' => 'Wikimedia',
+'planetarium'   => 'Planetario',
+},
+fr => {
+'subscribe' => 'S\'abonner',
+'subscriptions' => 'Abonnements',
+

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add 'application/vnd.php.serialized' to expected content for...

2017-03-09 Thread Dalba (Code Review)

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

Change subject: Add 'application/vnd.php.serialized' to expected content 
formats of DataSite
..

Add 'application/vnd.php.serialized' to expected content formats of DataSite

Bug: T129281
Change-Id: Ifef728e940451b60fb04cd4d3d4bae0501548c03
---
M tests/paraminfo_tests.py
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/62/342162/1

diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py
index 86236ba..47bdb4f 100644
--- a/tests/paraminfo_tests.py
+++ b/tests/paraminfo_tests.py
@@ -10,6 +10,7 @@
 __version__ = '$Id$'
 #
 
+from pywikibot.site import DataSite
 from pywikibot.family import WikimediaFamily
 from pywikibot.page import Claim, Property
 from pywikibot.tools import MediaWikiVersion
@@ -123,6 +124,9 @@
 ]
 if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.24'):
 base.append('application/json')
+if isinstance(self.site, DataSite):
+# It is not clear when this format has been added, see T129281.
+base.append('application/vnd.php.serialized')
 
 self._check_param_values(self.site, 'edit', 'contentformat', base)
 self._check_param_values(self.site, 'parse', 'contentformat', base)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifef728e940451b60fb04cd4d3d4bae0501548c03
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: remove precise checks

2017-03-09 Thread BryanDavis (Code Review)

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

Change subject: toolschecker: remove precise checks
..

toolschecker: remove precise checks

The precise OGE exec nodes are being shut down on 2017-03-14. Once they
are down there will be no need to validate that jobs can be started on
them.

Bug: T94792
Change-Id: I682ea213afafab6221fcea36f1ec7c0044d34ae2
---
M modules/toollabs/files/toolschecker.py
M modules/toollabs/manifests/checker.pp
2 files changed, 0 insertions(+), 16 deletions(-)


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

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index a0736fb..87d9deb 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -186,11 +186,6 @@
 return False
 
 
-@check('/continuous/precise')
-def continuous_job_precise():
-return job_running('test-long-running-precise')
-
-
 @check('/continuous/trusty')
 def continuous_job_trusty():
 return job_running('test-long-running-trusty')
@@ -227,11 +222,6 @@
 @check('/grid/start/trusty')
 def grid_check_start_trusty():
 return grid_check_start('trusty')
-
-
-@check('/grid/start/precise')
-def grid_check_start_precise():
-return grid_check_start('precise')
 
 
 def db_read_write_check(host, db):
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index c968e4e..6c9d1ad 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -70,14 +70,8 @@
 'continuous_job_trusty'  => {
 path => '/continuous/trusty',
 },
-'continuous_job_precise' => {
-path => '/continuous/precise',
-},
 'grid_start_trusty'  => {
 path => '/grid/start/trusty',
-},
-'grid_start_precise' => {
-path => '/grid/start/precise',
 },
 'cron'   => {
 path => '/toolscron',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...QuickSurveys[master]: Fix return phpdoc for Survey::getMessages()

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

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

Change subject: Fix return phpdoc for Survey::getMessages()
..


Fix return phpdoc for Survey::getMessages()

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

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



diff --git a/includes/Survey.php b/includes/Survey.php
index 677a2fc..d4e877c 100644
--- a/includes/Survey.php
+++ b/includes/Survey.php
@@ -90,7 +90,7 @@
/**
 * Gets the list of i18n message keys that the survey uses
 *
-* @return string
+* @return string[]
 */
public function getMessages() {
$messages = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55f12215a209ed666356f41c7cff81b1e8a003e5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SiteMatrix[master]: API: Output real booleans for formatversion=2

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

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

Change subject: API: Output real booleans for formatversion=2
..


API: Output real booleans for formatversion=2

...instead of the legacy empty strings. This is technically a breaking
change for formatversion=2 users, however I doubt it'll break any
clients since those that do something like `'private' in wikiinfo` will
still work.

Change-Id: I506226661c23803531cc26961ed08594a7b7ebf6
---
M SiteMatrixApi.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/SiteMatrixApi.php b/SiteMatrixApi.php
index d25e465..85850e8 100644
--- a/SiteMatrixApi.php
+++ b/SiteMatrixApi.php
@@ -1,7 +1,7 @@
 isClosed( 
$lang, $site ) ) {
-   
$site_out['closed'] = '';
+   
$site_out['closed'] = true;
if ( $closed ) {
$skip = 
false;
}
@@ -124,28 +124,28 @@
$skip = false;
}
if ( $matrix->isPrivate( $lang . $site ) ) {
-   $wiki['private'] = '';
+   $wiki['private'] = true;
 
if ( $private ) {
$skip = false;
}
}
if ( $matrix->isFishbowl( $lang . $site ) ) {
-   $wiki['fishbowl'] = '';
+   $wiki['fishbowl'] = true;
 
if ( $fishbowl ) {
$skip = false;
}
}
if ( $matrix->isNonGlobal( $lang . $site ) ) {
-   $wiki['nonglobal'] = '';
+   $wiki['nonglobal'] = true;
 
if ( $nonglobal ) {
$skip = false;
}
}
if ( $matrix->isClosed( $lang, $site ) ) {
-   $wiki['closed'] = '';
+   $wiki['closed'] = true;
 
if ( $closed ) {
$skip = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I506226661c23803531cc26961ed08594a7b7ebf6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SiteMatrix
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Move conditional special page registration to a hook

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

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

Change subject: Move conditional special page registration to a hook
..


Move conditional special page registration to a hook

Use the SpecialPage_initList hook for conditionally registering special
pages since extension functions can run too late depending on what other
extensions are installed.

Bug: T132454
Change-Id: I061bace88d9ce30c8f0799b405357bb579723442
---
M extension.json
M frontend/MWOAuthUI.hooks.php
M frontend/MWOAuthUI.setup.php
3 files changed, 13 insertions(+), 5 deletions(-)

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



diff --git a/extension.json b/extension.json
index 9332b69..fcde189 100644
--- a/extension.json
+++ b/extension.json
@@ -134,7 +134,8 @@
"CentralAuthAbortCentralAuthToken": 
"MediaWiki\\Extensions\\OAuth\\MWOAuthAPISetup::onCentralAuthAbortCentralAuthToken",
"TestCanonicalRedirect": 
"MediaWiki\\Extensions\\OAuth\\MWOAuthAPISetup::onTestCanonicalRedirect",
"SetupAfterCache": 
"MediaWiki\\Extensions\\OAuth\\MWOAuthHooks::onSetupAfterCache",
-   "ApiRsdServiceApis": 
"MediaWiki\\Extensions\\OAuth\\MWOAuthHooks::onApiRsdServiceApis"
+   "ApiRsdServiceApis": 
"MediaWiki\\Extensions\\OAuth\\MWOAuthHooks::onApiRsdServiceApis",
+   "SpecialPage_initList": 
"MediaWiki\\Extensions\\OAuth\\MWOAuthUIHooks::onSpecialPage_initList"
},
"config": {
"MWOAuthCentralWiki": {
diff --git a/frontend/MWOAuthUI.hooks.php b/frontend/MWOAuthUI.hooks.php
index 2c2d9c9..1202351 100644
--- a/frontend/MWOAuthUI.hooks.php
+++ b/frontend/MWOAuthUI.hooks.php
@@ -205,4 +205,14 @@
 
$icons['oauth'] = [ 'path' => 
'OAuth/frontend/assets/echo-icon.png' ];
}
+
+   /**
+* @param array $specialPages
+*/
+   public static function onSpecialPage_initList( array &$specialPages ) {
+   if ( MWOAuthUtils::isCentralWiki() ) {
+   $specialPages['OAuthConsumerRegistration'] = 
SpecialMWOAuthConsumerRegistration::class;
+   $specialPages['OAuthManageConsumers'] = 
SpecialMWOAuthManageConsumers::class;
+   }
+   }
 }
diff --git a/frontend/MWOAuthUI.setup.php b/frontend/MWOAuthUI.setup.php
index ff092e4..14e068f 100644
--- a/frontend/MWOAuthUI.setup.php
+++ b/frontend/MWOAuthUI.setup.php
@@ -10,13 +10,10 @@
 * @return void
 */
public static function conditionalSetup() {
-   global $wgSpecialPages, $wgLogTypes, $wgLogNames,
+   global $wgLogTypes, $wgLogNames,
$wgLogHeaders, $wgLogActionsHandlers;
 
if ( MWOAuthUtils::isCentralWiki() ) {
-   $wgSpecialPages['OAuthConsumerRegistration'] = 
'MediaWiki\Extensions\OAuth\SpecialMWOAuthConsumerRegistration';
-   $wgSpecialPages['OAuthManageConsumers'] = 
'MediaWiki\Extensions\OAuth\SpecialMWOAuthManageConsumers';
-
$wgLogTypes[] = 'mwoauthconsumer';
$wgLogNames['mwoauthconsumer'] = 
'mwoauthconsumer-consumer-logpage';
$wgLogHeaders['mwoauthconsumer'] = 
'mwoauthconsumer-consumer-logpagetext';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I061bace88d9ce30c8f0799b405357bb579723442
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ArticleTarget#switchToVisualEditor: Bail if the server won't...

2017-03-09 Thread Jforrester (Code Review)

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

Change subject: ArticleTarget#switchToVisualEditor: Bail if the server won't 
let you switch
..

ArticleTarget#switchToVisualEditor: Bail if the server won't let you switch

Because otherwise you're just throwing all the user's input on the floor.

Bug: T158692
Change-Id: I5df00842697be11ecde9ea8ba2ab16b0dc90205e
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 7 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index d265457..f08 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -2240,9 +2240,13 @@
var dataPromise, windowManager, switchWindow,
target = this;
 
-   if ( this.section !== null ) {
-   // WT -> VE switching is not yet supported in sections, so
-   // show a discard-only confirm dialog, then reload the whole 
page.
+   // Show a discard-only confirm dialog, and then reload the whole page, 
if:
+   if (
+   // * section editing in WT, as WT -> VE is not yet supported, or
+   this.section !== null ||
+   // * the server can't switch for us because that's not 
supported.
+   !mw.config.get( 'wgVisualEditorConfig' ).fullRestbaseUrl
+   ) {
windowManager = new OO.ui.WindowManager();
switchWindow = new mw.libs.ve.SwitchConfirmDialog();
$( 'body' ).append( windowManager.$element );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5df00842697be11ecde9ea8ba2ab16b0dc90205e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update CSS assets (updates edit pencil styles)

2017-03-09 Thread Mholloway (Code Review)

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

Change subject: Update CSS assets (updates edit pencil styles)
..

Update CSS assets (updates edit pencil styles)

This week's changes include only those resulting from
Ic561a0f52dbc0cca2ff41d21cff54da597427662.

Bug: T158665
Change-Id: Ief9ae53953f2e5846f0e91b9afbf30e795fdf51d
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 0 insertions(+), 16 deletions(-)


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

diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index d2091a6..b4eb8c9 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -1317,12 +1317,4 @@
   font-family: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 
'Liberation Sans', sans-serif;
   font-weight: 700;
   padding: 15px 0 0!important;
-}
-h3.section_heading a.edit_section_button {
-  display: none !important;
-}
-h2.section_heading a.edit_section_button {
-  position: relative;
-  top: -5px;
-  left: 6px;
 }
\ No newline at end of file
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 2f35e6f..e86899c 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -1276,14 +1276,6 @@
   font-weight: 700;
   padding: 15px 0 0!important;
 }
-h3.section_heading a.edit_section_button {
-  display: none !important;
-}
-h2.section_heading a.edit_section_button {
-  position: relative;
-  top: -5px;
-  left: 6px;
-}
 
 div.issues_container {
   margin-top: -0.2em;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TrustedXFF[master]: Use IPSet for matching IPv6 ranges

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

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

Change subject: Use IPSet for matching IPv6 ranges
..


Use IPSet for matching IPv6 ranges

Change-Id: I98ca8943ac9430eaf4690e2fb174fbef7718f966
---
M TrustedXFF.body.php
1 file changed, 10 insertions(+), 5 deletions(-)

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



diff --git a/TrustedXFF.body.php b/TrustedXFF.body.php
index d907ed5..4042400 100644
--- a/TrustedXFF.body.php
+++ b/TrustedXFF.body.php
@@ -1,6 +1,7 @@
 = $start && $hex <= $end ) {
-   return true;
-   }
+   if ( !self::$ipv6Set ) {
+   self::$ipv6Set = new IPSet( self::$ipv6Ranges );
}
+
+   return self::$ipv6Set->match( $ip );
}
 
return false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98ca8943ac9430eaf4690e2fb174fbef7718f966
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TrustedXFF
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Delay post-restart checks for 45 secs

2017-03-09 Thread Ppchelko (Code Review)

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

Change subject: Delay post-restart checks for 45 secs
..


Delay post-restart checks for 45 secs

Bug: T156687
Change-Id: Iac6eb8def811ebe0c5636eb65fe5e3969a443c5f
---
M scap/checks.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 48fe988..199bcd9 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -2,7 +2,8 @@
   delay:
 type: command
 stage: restart_service
-command: sleep 28
+command: sleep 45
+timeout: 60
   endpoints:
 type: nrpe
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac6eb8def811ebe0c5636eb65fe5e3969a443c5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Delay post-restart checks for 45 secs

2017-03-09 Thread Mobrovac (Code Review)

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

Change subject: Delay post-restart checks for 45 secs
..

Delay post-restart checks for 45 secs

Bug: T156687
Change-Id: Iac6eb8def811ebe0c5636eb65fe5e3969a443c5f
---
M scap/checks.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits/deploy 
refs/changes/58/342158/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 48fe988..199bcd9 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -2,7 +2,8 @@
   delay:
 type: command
 stage: restart_service
-command: sleep 28
+command: sleep 45
+timeout: 60
   endpoints:
 type: nrpe
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac6eb8def811ebe0c5636eb65fe5e3969a443c5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

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

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

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

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

+ 3b4798099b65e239b2a56379f54e0d90f30f0924 Normalized subscr_ messages for tests
+ 41826252f5c2fb75c69c1c69eb0a791015d7b79f Remove unchanged insertions of blank 
addresses.
+ aec23907e99cfb4228b6e0333f712a2c54e596e6 Remove obsolete blank address from 
tracking table.
+ 54439c652fe886d53981824bc9bc3d4116300911 Remove bulk update blank addresses 
from being treated as 'updates'.
+ da48b2a9f00c3066159d7c59ecc7d7a4a1c9c057 Add trilogy payment_method to 
foreign checks import
+ a5043f6da76330677d9152b7c39fe8f5986cc727 Add & use Benevity financial type.
+ 2b6b8b851fcfa377849b873821a9444987b852bc Submodule update for CiviCRM 91d02f7 
CRM-20061 Add tables as a parameter on the revert api
+ 86111d242bc9623b793b617323284f6aae652164 Benevity import, still create 
relationship when no individual gift
+ 0b8ab4e43a73b989be6608ad39061015c1da6331 Loosen Benevity matching logic for 
individuals.
+ ea0b2b5c0891e5257c71f012e314405f0ffe5c74 More loosening of benevity matching 
logic.
+ 9d14b17cc3c167522b5e9681213cd8cc6b01d922 Even more loosening of benevity 
matching logic.

Change-Id: Icfd0abbd599115efdefe96ab2fa01f23858d3765
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D 
sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
D sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
D sites/all/modules/queue2civicrm/tests/data/subscr_payment_normalized.json
D sites/all/modules/queue2civicrm/tests/data/subscr_signup_normalized.json
6 files changed, 0 insertions(+), 683 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index f3a138e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,548 +0,0 @@
-<<< HEAD   (d20ed4 Merge master into deployment)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
-  protected $epochtime;
-
-  function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contribution
-  WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contact
-  WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy 
Inc', 'Uncle Scrooge Inc') 
-  OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc', 
'Uncle Scrooge Inc')
-  OR first_name = 'Minnie' AND last_name = 'Mouse'
-  OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' => 
array_keys($countries['values'])));
-
-  }
-
-  /**
-   * Make sure we have the anonymous contact - like the live DB.
-   */
-  protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
-  'first_name' => 'Anonymous',
-  'last_name' => 'Anonymous',
-  'email' => 'fakeem...@wikimedia.org',
-  'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
-  $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
-  }
-
-  /**
-   * Test that all imports fail if the organization has multiple matches.
-   */
-  function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that all imports fail if the organization does not pre-exist.
-   */
-  function testImportFailNoOrganizationContactExists() {
-

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.15]: ArticleTargetLoader: wikitext switch shouldn't require FullR...

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

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

Change subject: ArticleTargetLoader: wikitext switch shouldn't require 
FullRestbaseURL
..


ArticleTargetLoader: wikitext switch shouldn't require FullRestbaseURL

The non-FullRestbaseURL branch didn't handle converting the provided wikitext,
causing data loss when switching from source to visual modes.

Bug: T158692
Change-Id: I283afc4be1e38d6ec572bfa8542ba8fd9ce7
(cherry picked from commit c5bb912e80aa0a046e0b21c039ec41729320e580)
---
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
index 929dc31..def7ed7 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
@@ -173,18 +173,21 @@
}
 
if (
-   conf.fullRestbaseUrl &&
// wikitext can be an empty string
wikitext !== undefined &&
!$( '[name=wpSection]' ).val()
) {
+   if ( conf.fullRestbaseUrl ) {
+   pageHtmlUrl = 
conf.fullRestbaseUrl + 'v1/transform/wikitext/to/html/';
+   } else {
+   pageHtmlUrl = 
conf.restbaseUrl.replace( 'v1/page/html/', 'v1/transform/wikitext/to/html/' );
+   }
switched = true;
fromEditedState = modified;
window.onbeforeunload = null;
$( window ).off( 'beforeunload' );
restbaseXhr = $.ajax( {
-   url: conf.fullRestbaseUrl + 
'v1/transform/wikitext/to/html/' +
-   encodeURIComponent( 
pageName ) +
+   url: pageHtmlUrl + 
encodeURIComponent( pageName ) +
( oldid === undefined ? 
'' : '/' + oldid ),
type: 'POST',
data: {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I283afc4be1e38d6ec572bfa8542ba8fd9ce7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T154709: Honour the "page" option for files

2017-03-09 Thread Arlolra (Code Review)

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

Change subject: T154709: Honour the "page" option for files
..

T154709: Honour the "page" option for files

 * Fixes rendering and roundtripping.

Change-Id: I35c6d6896495ee744a3d2331b9cec902ab139667
---
M lib/html2wt/LinkHandler.js
M lib/mw/ApiRequest.js
M lib/mw/Batcher.js
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
6 files changed, 49 insertions(+), 29 deletions(-)


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

diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index fabe864..fb3f28e 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -809,7 +809,8 @@
 figureHandlerImpl = Promise.method(function(node, state, resource, elt,
linkElt, outerElt, captionElt) {
var nopts = [];
-   var outerDP = (outerElt) ? DU.getDataParsoid(outerElt) : {};
+   var outerDP = outerElt ? DU.getDataParsoid(outerElt) : {};
+   var outerDMW = outerElt ? DU.getDataMw(outerElt) : {};
var mwAliases = state.env.conf.wiki.mwAliases;
var caption, type;
 
@@ -834,11 +835,9 @@
}
 
// Reconstruct the caption
-   if (!captionElt && outerElt &&
-   typeof DU.getDataMw(outerElt).caption === 'string') {
+   if (!captionElt && typeof outerDMW.caption === 'string') {
captionElt = outerElt.ownerDocument.createElement('div');
-   var html = DU.getDataMw(outerElt).caption;
-   DU.ppToDOM(html, { node: captionElt, markNew: true });
+   DU.ppToDOM(outerDMW.caption, { node: captionElt, markNew: true 
});
// Needs a parent node in order for WTS to be happy:
// DocumentFragment to the rescue!

outerElt.ownerDocument.createDocumentFragment().appendChild(captionElt);
@@ -943,21 +942,27 @@
match(/(?:^|\s)(mw:Image\S*)/);
type = type ? type[1] : null;
 
-   var manualthumb = DU.getDataMw(outerElt).thumb;
-   if (manualthumb !== undefined) {
-   return state.serializer
-   .getAttributeValue(outerElt, 
'manualthumb',
-   mwAliases.img_manualthumb)
-   .then(function(ak) {
-   nopts.push({
-   ck: 'manualthumb',
-   ak: ak,
-   v: manualthumb,
+   var paramFromDataMw = function(o) {
+   var v = outerDMW[o.prop];
+   if (v !== undefined) {
+   return 
state.serializer.getAttributeValue(outerElt, o.ck, mwAliases[o.alias])
+   .then(function(ak) {
+   nopts.push({
+   ck: o.ck,
+   ak: ak,
+   v: v,
+   });
});
-   type = null;
-   });
-   }
-   }).then(function() {
+   }
+   };
+
+   return Promise.map([
+   { prop: 'thumb', ck: 'manualthumb', alias: 
'img_manualthumb' },
+   { prop: 'page',  ck: 'page',alias: 'img_page' },
+   ], paramFromDataMw);
+   })
+   .then(function() {
+   if (outerDMW.thumb !== undefined) { type = ''; }
switch (type) {
case 'mw:Image/Thumb':
return 
state.serializer.getAttributeValue(outerElt, 'thumbnail',
@@ -975,7 +980,8 @@
return { ck: 'frameless', ak: ak };
});
}
-   }).then(function(opt) {
+   })
+   .then(function(opt) {
if (opt) { nopts.push(opt); }
return Promise.join(
// Get the user-specified height from wikitext
@@ -983,7 +989,8 @@
// Get the user-specified width from wikitext
state.serializer.serializedImageAttrVal(outerElt, elt, 
'width')
);
-   }).spread(function(wh, ww) {
+   })
+   .spread(function(wh, ww) {
var getOpt = function(key) {
if (!outerDP.optList) {
return null;
diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index e8321e0..c3488fa 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js

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

2017-03-09 Thread Eileen (Code Review)

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

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

+ 3b4798099b65e239b2a56379f54e0d90f30f0924 Normalized subscr_ messages for tests
+ 41826252f5c2fb75c69c1c69eb0a791015d7b79f Remove unchanged insertions of blank 
addresses.
+ aec23907e99cfb4228b6e0333f712a2c54e596e6 Remove obsolete blank address from 
tracking table.
+ 54439c652fe886d53981824bc9bc3d4116300911 Remove bulk update blank addresses 
from being treated as 'updates'.
+ da48b2a9f00c3066159d7c59ecc7d7a4a1c9c057 Add trilogy payment_method to 
foreign checks import
+ a5043f6da76330677d9152b7c39fe8f5986cc727 Add & use Benevity financial type.
+ 2b6b8b851fcfa377849b873821a9444987b852bc Submodule update for CiviCRM 91d02f7 
CRM-20061 Add tables as a parameter on the revert api
+ 86111d242bc9623b793b617323284f6aae652164 Benevity import, still create 
relationship when no individual gift
+ 0b8ab4e43a73b989be6608ad39061015c1da6331 Loosen Benevity matching logic for 
individuals.
+ ea0b2b5c0891e5257c71f012e314405f0ffe5c74 More loosening of benevity matching 
logic.
+ 9d14b17cc3c167522b5e9681213cd8cc6b01d922 Even more loosening of benevity 
matching logic.

Change-Id: Icfd0abbd599115efdefe96ab2fa01f23858d3765
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D 
sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
D sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
4 files changed, 0 insertions(+), 637 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/55/342155/1

diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index f3a138e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,548 +0,0 @@
-<<< HEAD   (d20ed4 Merge master into deployment)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
-  protected $epochtime;
-
-  function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contribution
-  WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
-  DELETE FROM civicrm_contact
-  WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy 
Inc', 'Uncle Scrooge Inc') 
-  OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc', 
'Uncle Scrooge Inc')
-  OR first_name = 'Minnie' AND last_name = 'Mouse'
-  OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' => 
array_keys($countries['values'])));
-
-  }
-
-  /**
-   * Make sure we have the anonymous contact - like the live DB.
-   */
-  protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
-  'first_name' => 'Anonymous',
-  'last_name' => 'Anonymous',
-  'email' => 'fakeem...@wikimedia.org',
-  'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
-  $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
-  }
-
-  /**
-   * Test that all imports fail if the organization has multiple matches.
-   */
-  function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
-  }
-
-  /**
-   * Test that all imports fail if the organization does not pre-exist.
-   */
-  function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-

[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: WIP: Provide debug endpoint

2017-03-09 Thread Jdlrobson (Code Review)

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

Change subject: WIP: Provide debug endpoint
..

WIP: Provide debug endpoint

Change-Id: I7d48ef28db7dd2ff3201e5684623a9dc4cfd2924
---
M lib/processor.js
M routes/trending-v1.js
2 files changed, 40 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits 
refs/changes/54/342154/1

diff --git a/lib/processor.js b/lib/processor.js
index 46f2753..316fe93 100644
--- a/lib/processor.js
+++ b/lib/processor.js
@@ -15,6 +15,17 @@
  * Remove page with id from the store
  *
  * @ignore
+ * @param {Number} id of page
+ * @param {Object} page
+ */
+function getPage(id) {
+return pages.get(id);
+}
+
+/**
+ * Remove page with id from the store
+ *
+ * @ignore
  * @param {Number} id
  */
 function remove(id) {
@@ -96,7 +107,7 @@
 remove(id);
 return true;
 } else if (topic === 'mediawiki.page-move' && pages.has(id)) {
-page = pages.get(id);
+page = getPage(id);
 page.title = edit.page_title;
 // assumption here made that anons cannot move pages so we do not 
touch anonEdits
 page.edits -= 1;
@@ -155,6 +166,7 @@
 
 module.exports = {
 purge: purge,
+getPage: getPage,
 getPages: getPages,
 process: process,
 reset: reset
diff --git a/routes/trending-v1.js b/routes/trending-v1.js
index 39289d1..d07923c 100644
--- a/routes/trending-v1.js
+++ b/routes/trending-v1.js
@@ -43,6 +43,33 @@
 }
 
 /**
+ * GET /feed/debug-trending-edits
+ * Debugging tools for private usage that expose the contents of the processor
+ */
+router.get('/debug-trending-edits/:title?', function(req, res) {
+if ( req.params.title ) {
+  const page = processor.getPage(title);
+  if ( page ) {
+  res.status(200).type('application/json').end(
+JSON.stringify(scorePages([page]))
+  );
+  } else {
+  res.status(404).type('application/json').end('Unknown page title');
+  }
+} else {
+const pages = processor.getPages();
+res.status(200).type('application/json').end(
+  JSON.stringify({
+size: pages.length,
+titles: pages.map((page)=>{
+  return { id: page.id, title: page.title };
+})
+  })
+);
+}
+});
+
+/**
  * GET /feed/trending-edits
  * Gets the body of a given page.
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d48ef28db7dd2ff3201e5684623a9dc4cfd2924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [noop] Move NavigationTiming config to EventLogging section

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

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

Change subject: [noop] Move NavigationTiming config to EventLogging section
..


[noop] Move NavigationTiming config to EventLogging section

Change-Id: Id7f2fcdb3bda8448a499d2aeed62ca5b6f870eae
---
M wmf-config/CommonSettings.php
1 file changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 20c16e9..ff3d807 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2926,7 +2926,7 @@
// Temporary hack for 'jsonschema' API module migration
$wgEventLoggingSchemaIndexUri = $wgEventLoggingSchemaApiUri;
 
-   // Extensions dependent on EventLogging
+   // Depends on EventLogging
if ( $wmgUseCampaigns ) {
wfLoadExtension( 'Campaigns' );
}
@@ -2934,16 +2934,17 @@
wfLoadExtension( 'WikimediaEvents' );
$wgWMEStatsdBaseUri = '/beacon/statsv';
$wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
-}
 
-if ( $wmgUseEventLogging && $wmgUseNavigationTiming ) {
-   wfLoadExtension( 'NavigationTiming' );
-   // Careful! The LOWER the value, the MORE requests will be logged. A
-   // sampling factor of 1 means log every request. This should not be
-   // lowered without careful coordination with ops.
-   $wgNavigationTimingSamplingFactor = 1000;
+   // Depends on EventLogging
+   if ( $wmgUseNavigationTiming ) {
+   wfLoadExtension( 'NavigationTiming' );
+   // Careful! The LOWER the value, the MORE requests will be 
logged. A
+   // sampling factor of 1 means log every request. This should 
not be
+   // lowered without careful coordination with ops.
+   $wgNavigationTimingSamplingFactor = 1000;
 
-   $wgPercentHHVM = 0;
+   $wgPercentHHVM = 0;
+   }
 }
 
 wfLoadExtension( 'XAnalytics' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7f2fcdb3bda8448a499d2aeed62ca5b6f870eae
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Dereckson 
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] operations/mediawiki-config[master]: (no-op) Remove setting of unused $wgPercentHHVM (no longer e...

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

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

Change subject: (no-op) Remove setting of unused $wgPercentHHVM (no longer 
exists)
..


(no-op) Remove setting of unused $wgPercentHHVM (no longer exists)

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ff3d807..1257c70 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2942,8 +2942,6 @@
// sampling factor of 1 means log every request. This should 
not be
// lowered without careful coordination with ops.
$wgNavigationTimingSamplingFactor = 1000;
-
-   $wgPercentHHVM = 0;
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4d3f8a64f017cca8cc195a7169a2e7915496f89
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Dereckson 
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] mediawiki...trending-edits[master]: Purge based on current timestamp

2017-03-09 Thread Ppchelko (Code Review)

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

Change subject: Purge based on current timestamp
..


Purge based on current timestamp

To process old events correctly we shouldnt use
the current timestamp as it will lead to incorrect
calculations of speed as well as inactivity.

Bug: T160136
Change-Id: If27b50bb4dbc3d6090f14d31d4c4ed8bdd431171
---
M app.js
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/app.js b/app.js
index 0a9cfb3..e61b5b8 100644
--- a/app.js
+++ b/app.js
@@ -196,19 +196,21 @@
  */
 function createEditStream(app) {
 var eventsSincePurge = 0;
+let lastEventDate;
 const editStream = new EditStream(app.conf);
 editStream.on('edit', (message) => {
 if (processor.process(message)) {
+lastEventDate = new Date(message.meta.dt);
 app.logger.log('trace/event', () => ({
 msg: 'Event processed',
 event: JSON.stringify(message)
 }));
-app.metrics.endTiming(`${message.meta.topic}.delay`, new 
Date(message.meta.dt));
+app.metrics.endTiming(`${message.meta.topic}.delay`, 
lastEventDate);
 eventsSincePurge++;
 }
 if (eventsSincePurge > app.conf.purge_period) {
 eventsSincePurge = 0;
-processor.purge(new Date(), app.conf.purge_strategy);
+processor.purge(lastEventDate, app.conf.purge_strategy);
 app.metrics.increment('purge');
 }
 });

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If27b50bb4dbc3d6090f14d31d4c4ed8bdd431171
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Purge based on current timestamp

2017-03-09 Thread Jdlrobson (Code Review)

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

Change subject: Purge based on current timestamp
..

Purge based on current timestamp

To process old events correctly we shouldnt use
the current timestamp as it will lead to incorrect
calculations of speed as well as inactivity.

Bug: T160136
Change-Id: If27b50bb4dbc3d6090f14d31d4c4ed8bdd431171
---
M app.js
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits 
refs/changes/52/342152/1

diff --git a/app.js b/app.js
index 0a9cfb3..0653c44 100644
--- a/app.js
+++ b/app.js
@@ -196,19 +196,21 @@
  */
 function createEditStream(app) {
 var eventsSincePurge = 0;
+let last_event_ts;
 const editStream = new EditStream(app.conf);
 editStream.on('edit', (message) => {
 if (processor.process(message)) {
+last_event_ts = new Date(message.meta.dt);
 app.logger.log('trace/event', () => ({
 msg: 'Event processed',
 event: JSON.stringify(message)
 }));
-app.metrics.endTiming(`${message.meta.topic}.delay`, new 
Date(message.meta.dt));
+app.metrics.endTiming(`${message.meta.topic}.delay`, 
last_event_ts);
 eventsSincePurge++;
 }
 if (eventsSincePurge > app.conf.purge_period) {
 eventsSincePurge = 0;
-processor.purge(new Date(), app.conf.purge_strategy);
+processor.purge(last_event_ts, app.conf.purge_strategy);
 app.metrics.increment('purge');
 }
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If27b50bb4dbc3d6090f14d31d4c4ed8bdd431171
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RemexDriver: optional decoding of character references

2017-03-09 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342151 )

Change subject: RemexDriver: optional decoding of character references
..

RemexDriver: optional decoding of character references

Decoding character references takes time, but may avoid some whitespace
changes in visual diff testing. The terminology here matches RemexHtml.

Change-Id: I1df165c6be277098b0993f333432e0e28815e49f
---
M includes/tidy/RemexCompatFormatter.php
M includes/tidy/RemexDriver.php
2 files changed, 16 insertions(+), 5 deletions(-)


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

diff --git a/includes/tidy/RemexCompatFormatter.php 
b/includes/tidy/RemexCompatFormatter.php
index 3dc727b..dd8c610 100644
--- a/includes/tidy/RemexCompatFormatter.php
+++ b/includes/tidy/RemexCompatFormatter.php
@@ -19,10 +19,16 @@
 
public function __construct( $options = [] ) {
parent::__construct( $options );
+   $options += [
+   'ignoreCharRefs' => true
+   ];
+
$this->attributeEscapes["\xc2\xa0"] = '';
-   unset( $this->attributeEscapes["&"] );
$this->textEscapes["\xc2\xa0"] = '';
-   unset( $this->textEscapes["&"] );
+   if ( $options['ignoreCharRefs'] ) {
+   unset( $this->attributeEscapes["&"] );
+   unset( $this->textEscapes["&"] );
+   }
}
 
public function startDocument( $fragmentNamespace, $fragmentName ) {
diff --git a/includes/tidy/RemexDriver.php b/includes/tidy/RemexDriver.php
index e02af88..57aa5cb 100644
--- a/includes/tidy/RemexDriver.php
+++ b/includes/tidy/RemexDriver.php
@@ -11,19 +11,24 @@
 class RemexDriver extends TidyDriverBase {
private $trace;
private $pwrap;
+   private $ignoreCharRefs;
 
public function __construct( array $config ) {
$config += [
'treeMutationTrace' => false,
-   'pwrap' => true
+   'pwrap' => true,
+   'ignoreCharRefs' => true,
];
$this->trace = $config['treeMutationTrace'];
$this->pwrap = $config['pwrap'];
+   $this->ignoreCharRefs = $config['ignoreCharRefs'];
parent::__construct( $config );
}
 
public function tidy( $text ) {
-   $formatter = new RemexCompatFormatter;
+   $formatter = new RemexCompatFormatter( [
+   'ignoreCharRefs' => $this->ignoreCharRefs
+   ] );
$serializer = new Serializer( $formatter );
if ( $this->pwrap ) {
$munger = new RemexCompatMunger( $serializer );
@@ -44,7 +49,7 @@
$dispatcher = new Dispatcher( $treeBuilder );
$tokenizer = new Tokenizer( $dispatcher, $text, [
'ignoreErrors' => true,
-   'ignoreCharRefs' => true,
+   'ignoreCharRefs' => $this->ignoreCharRefs,
'ignoreNulls' => true,
'skipPreprocess' => true,
] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1df165c6be277098b0993f333432e0e28815e49f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: (no-op) Remove setting of unused $wgPercentHHVM (no longer e...

2017-03-09 Thread Krinkle (Code Review)

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

Change subject: (no-op) Remove setting of unused $wgPercentHHVM (no longer 
exists)
..

(no-op) Remove setting of unused $wgPercentHHVM (no longer exists)

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 77d8e18..1b5c8a5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2942,8 +2942,6 @@
// sampling factor of 1 means log every request. This should 
not be
// lowered without careful coordination with ops.
$wgNavigationTimingSamplingFactor = 1000;
-
-   $wgPercentHHVM = 0;
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable WikimediaEvents extension on closed wikis

2017-03-09 Thread Krinkle (Code Review)

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

Change subject: Disable WikimediaEvents extension on closed wikis
..

Disable WikimediaEvents extension on closed wikis

Deployment:
- InitialiseSettings.php must sync before CommonSettings.php!

Bug: T158721
Change-Id: Ib9e99cb6490d3fa7bb85a1485c17ac132f64102d
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 12 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 77d8e18..d5caeca 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2931,9 +2931,13 @@
wfLoadExtension( 'Campaigns' );
}
 
-   wfLoadExtension( 'WikimediaEvents' );
-   $wgWMEStatsdBaseUri = '/beacon/statsv';
-   $wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
+
+   // Dependens on EventLogging
+   if ( $wmgUseWikimediaEvents ) {
+   wfLoadExtension( 'WikimediaEvents' );
+   $wgWMEStatsdBaseUri = '/beacon/statsv';
+   $wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
+   }
 
// Dependens on EventLogging
if ( $wmgUseNavigationTiming ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 035959a..bd59710 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16897,6 +16897,11 @@
'default' => true,
 ],
 
+'wmgUseWikimediaEvents' => [
+   'default' => true,
+   'closed' => false, // T158721
+],
+
 'wmgUseNavigationTiming' => [
'default' => true,
'wikitech' => false,

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: (no-op) Move NavigationTiming config to EventLogging section

2017-03-09 Thread Krinkle (Code Review)

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

Change subject: (no-op) Move NavigationTiming config to EventLogging section
..

(no-op) Move NavigationTiming config to EventLogging section

Change-Id: Id7f2fcdb3bda8448a499d2aeed62ca5b6f870eae
---
M wmf-config/CommonSettings.php
1 file changed, 10 insertions(+), 9 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 20c16e9..77d8e18 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2926,7 +2926,7 @@
// Temporary hack for 'jsonschema' API module migration
$wgEventLoggingSchemaIndexUri = $wgEventLoggingSchemaApiUri;
 
-   // Extensions dependent on EventLogging
+   // Dependens on EventLogging
if ( $wmgUseCampaigns ) {
wfLoadExtension( 'Campaigns' );
}
@@ -2934,16 +2934,17 @@
wfLoadExtension( 'WikimediaEvents' );
$wgWMEStatsdBaseUri = '/beacon/statsv';
$wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
-}
 
-if ( $wmgUseEventLogging && $wmgUseNavigationTiming ) {
-   wfLoadExtension( 'NavigationTiming' );
-   // Careful! The LOWER the value, the MORE requests will be logged. A
-   // sampling factor of 1 means log every request. This should not be
-   // lowered without careful coordination with ops.
-   $wgNavigationTimingSamplingFactor = 1000;
+   // Dependens on EventLogging
+   if ( $wmgUseNavigationTiming ) {
+   wfLoadExtension( 'NavigationTiming' );
+   // Careful! The LOWER the value, the MORE requests will be 
logged. A
+   // sampling factor of 1 means log every request. This should 
not be
+   // lowered without careful coordination with ops.
+   $wgNavigationTimingSamplingFactor = 1000;
 
-   $wgPercentHHVM = 0;
+   $wgPercentHHVM = 0;
+   }
 }
 
 wfLoadExtension( 'XAnalytics' );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Create fixtures of analysis config builder results

2017-03-09 Thread EBernhardson (Code Review)

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

Change subject: Create fixtures of analysis config builder results
..

Create fixtures of analysis config builder results

The goal here is to make reviewing changes to analysis changes
as easy as possible, by being able to see what exactly is changing
in the result, in addition to seeing the code changes.

Change-Id: I7a813a7a21dcc57468fa4d84e3685dcc455fd54b
---
M tests/unit/Maintenance/AnalysisConfigBuilderTest.php
A tests/unit/fixtures/languageAnalysis/ar.config
A tests/unit/fixtures/languageAnalysis/ar.expected
A tests/unit/fixtures/languageAnalysis/bg.config
A tests/unit/fixtures/languageAnalysis/bg.expected
A tests/unit/fixtures/languageAnalysis/bo.config
A tests/unit/fixtures/languageAnalysis/bo.expected
A tests/unit/fixtures/languageAnalysis/bug.config
A tests/unit/fixtures/languageAnalysis/bug.expected
A tests/unit/fixtures/languageAnalysis/ca.config
A tests/unit/fixtures/languageAnalysis/ca.expected
A tests/unit/fixtures/languageAnalysis/cdo.config
A tests/unit/fixtures/languageAnalysis/cdo.expected
A tests/unit/fixtures/languageAnalysis/ckb.config
A tests/unit/fixtures/languageAnalysis/ckb.expected
A tests/unit/fixtures/languageAnalysis/cr.config
A tests/unit/fixtures/languageAnalysis/cr.expected
A tests/unit/fixtures/languageAnalysis/cs.config
A tests/unit/fixtures/languageAnalysis/cs.expected
A tests/unit/fixtures/languageAnalysis/da.config
A tests/unit/fixtures/languageAnalysis/da.expected
A tests/unit/fixtures/languageAnalysis/de.config
A tests/unit/fixtures/languageAnalysis/de.expected
A tests/unit/fixtures/languageAnalysis/dz.config
A tests/unit/fixtures/languageAnalysis/dz.expected
A tests/unit/fixtures/languageAnalysis/el.config
A tests/unit/fixtures/languageAnalysis/el.expected
A tests/unit/fixtures/languageAnalysis/en-ca.config
A tests/unit/fixtures/languageAnalysis/en-ca.expected
A tests/unit/fixtures/languageAnalysis/en-gb.config
A tests/unit/fixtures/languageAnalysis/en-gb.expected
A tests/unit/fixtures/languageAnalysis/en.config
A tests/unit/fixtures/languageAnalysis/en.expected
A tests/unit/fixtures/languageAnalysis/es.config
A tests/unit/fixtures/languageAnalysis/es.expected
A tests/unit/fixtures/languageAnalysis/eu.config
A tests/unit/fixtures/languageAnalysis/eu.expected
A tests/unit/fixtures/languageAnalysis/fa.config
A tests/unit/fixtures/languageAnalysis/fa.expected
A tests/unit/fixtures/languageAnalysis/fi.config
A tests/unit/fixtures/languageAnalysis/fi.expected
A tests/unit/fixtures/languageAnalysis/fr.config
A tests/unit/fixtures/languageAnalysis/fr.expected
A tests/unit/fixtures/languageAnalysis/ga.config
A tests/unit/fixtures/languageAnalysis/ga.expected
A tests/unit/fixtures/languageAnalysis/gan.config
A tests/unit/fixtures/languageAnalysis/gan.expected
A tests/unit/fixtures/languageAnalysis/gl.config
A tests/unit/fixtures/languageAnalysis/gl.expected
A tests/unit/fixtures/languageAnalysis/hak.config
A tests/unit/fixtures/languageAnalysis/hak.expected
A tests/unit/fixtures/languageAnalysis/he.config
A tests/unit/fixtures/languageAnalysis/he.expected
A tests/unit/fixtures/languageAnalysis/hi.config
A tests/unit/fixtures/languageAnalysis/hi.expected
A tests/unit/fixtures/languageAnalysis/hu.config
A tests/unit/fixtures/languageAnalysis/hu.expected
A tests/unit/fixtures/languageAnalysis/hy.config
A tests/unit/fixtures/languageAnalysis/hy.expected
A tests/unit/fixtures/languageAnalysis/id.config
A tests/unit/fixtures/languageAnalysis/id.expected
A tests/unit/fixtures/languageAnalysis/it.config
A tests/unit/fixtures/languageAnalysis/it.expected
A tests/unit/fixtures/languageAnalysis/ja.config
A tests/unit/fixtures/languageAnalysis/ja.expected
A tests/unit/fixtures/languageAnalysis/jv.config
A tests/unit/fixtures/languageAnalysis/jv.expected
A tests/unit/fixtures/languageAnalysis/km.config
A tests/unit/fixtures/languageAnalysis/km.expected
A tests/unit/fixtures/languageAnalysis/ko.config
A tests/unit/fixtures/languageAnalysis/ko.expected
A tests/unit/fixtures/languageAnalysis/lo.config
A tests/unit/fixtures/languageAnalysis/lo.expected
A tests/unit/fixtures/languageAnalysis/lt.config
A tests/unit/fixtures/languageAnalysis/lt.expected
A tests/unit/fixtures/languageAnalysis/lv.config
A tests/unit/fixtures/languageAnalysis/lv.expected
A tests/unit/fixtures/languageAnalysis/lzh.config
A tests/unit/fixtures/languageAnalysis/lzh.expected
A tests/unit/fixtures/languageAnalysis/my.config
A tests/unit/fixtures/languageAnalysis/my.expected
A tests/unit/fixtures/languageAnalysis/nan.config
A tests/unit/fixtures/languageAnalysis/nan.expected
A tests/unit/fixtures/languageAnalysis/nb.config
A tests/unit/fixtures/languageAnalysis/nb.expected
A tests/unit/fixtures/languageAnalysis/nl.config
A tests/unit/fixtures/languageAnalysis/nl.expected
A tests/unit/fixtures/languageAnalysis/nn.config
A

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Don't reuse repo connection, this seems to lead to disconnec...

2017-03-09 Thread Smalyshev (Code Review)

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

Change subject: Don't reuse repo connection, this seems to lead to disconnects 
and errors
..

Don't reuse repo connection, this seems to lead to disconnects and errors

Change-Id: I84aee1ee6d64fceaf042bef5d59b1bc5c04e0642
---
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index 5af831f..88b 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -31,6 +31,7 @@
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.NoConnectionReuseStrategy;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicHeader;
@@ -79,6 +80,7 @@
  * Http connection pool for the rdf repository.
  */
 private final CloseableHttpClient client = 
HttpClients.custom().setMaxConnPerRoute(100).setMaxConnTotal(100)
+.setConnectionReuseStrategy(new NoConnectionReuseStrategy())
 .build();
 /**
  * URI for the wikibase rdf repository.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84aee1ee6d64fceaf042bef5d59b1bc5c04e0642
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Speed up PHP mw.ustring.gcodepoint

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

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

Change subject: Speed up PHP mw.ustring.gcodepoint
..


Speed up PHP mw.ustring.gcodepoint

It seems to be over 200 times faster to iterate over the array instead
of shifting off the front.

Change-Id: Id29a4739ae2bd5dac4197e110ea73f74794e6d9f
---
M engines/LuaCommon/lualib/mw.ustring.lua
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/engines/LuaCommon/lualib/mw.ustring.lua 
b/engines/LuaCommon/lualib/mw.ustring.lua
index 33e5e39..0825a73 100644
--- a/engines/LuaCommon/lualib/mw.ustring.lua
+++ b/engines/LuaCommon/lualib/mw.ustring.lua
@@ -29,8 +29,13 @@
checkType( 'gcodepoint', 2, i, 'number', true )
checkType( 'gcodepoint', 3, j, 'number', true )
local cp = gcodepoint_init( s, i, j or -1 )
+   local pos, len = 1, #cp
return function ()
-   return table.remove( cp, 1 )
+   if pos <= len then
+   local tmp = cp[pos]
+   pos = pos + 1
+   return tmp
+   end
end
 end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id29a4739ae2bd5dac4197e110ea73f74794e6d9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: [WIP] Draft v2.0 release notes

2017-03-09 Thread Krinkle (Code Review)

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

Change subject: [WIP] Draft v2.0 release notes
..

[WIP] Draft v2.0 release notes

Change-Id: I7a8d55d622c1dbfeb4db16766d50509cee5b50e8
---
M History.md
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/44/342144/1

diff --git a/History.md b/History.md
index 8e48467..04500ec 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,26 @@
 # OOjs Release History
 
+## v2.0.0 / Unreleased
+
+This release drops support for ES3 environments. Where previously OOjs was
+supported in IE 6-8 with an ES5 shim, it is no longer.
+
+* [BREAKING CHANGE] core: Drop support for ES3 environments (James D. 
Forrester)
+* core: Add OO.isSubclass, to test class inheritance (David Chan)
+* core: Guard OO.setProp() against insufficient arguments (Ed Sanders)
+* core: Implement OO.deleteProp (Ed Sanders)
+* core: Improve error message for inheritClass/mixinClass called with 
undefined (Bartosz Dziewoński)
+* core: Switch from .parent hack to use .super directly (James D. Forrester)
+* EmitterList: Change insertItem from @private to @protected (Moriel 
Schottlender)
+* SortedEmitterList: Emit the actual inserted index (Ed Sanders)
+* doc: Make OO uppercase (Prateek Saxena)
+* doc: Update Phabricator URL (James D. Forrester)
+* doc: Replace git.wikimedia.org URL with Phabricator one (Paladox)
+* tests: Correct order of expected/actual in setProp tests (Ed Sanders)
+* build: Bump development dependencies to latest (James D. Forrester)
+* build: Bump file copyright notices for 2016 (James D. Forrester)
+* build: Replace jscs+jshint with eslint (Ed Sanders)
+
 ## v1.1.10 / 2015-11-11
 * EventEmitter: Allow disconnecting event handlers given by array (Moriel 
Schottlender)
 * Add EmitterList class (Moriel Schottlender)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a8d55d622c1dbfeb4db16766d50509cee5b50e8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Update devDendencies (node-qunit)

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

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

Change subject: build: Update devDendencies (node-qunit)
..


build: Update devDendencies (node-qunit)

This fixes the build warning about unsupported node engine.

> npm WARN engine qunit@0.9.1: wanted: {"node":">=0.6.0 < 5.0"}
>  (current: {"node":"6.9.1"})

node-qunit v0.9.2 adds support for Node 6 and Node 7.

Release notes:


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

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



diff --git a/package.json b/package.json
index c688d2c..9fb36d9 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 "karma-firefox-launcher": "1.0.1",
 "karma-qunit": "1.2.1",
 "karma-sauce-launcher": "1.1.0",
-"qunit": "0.9.1",
+"qunit": "0.9.2",
 "qunitjs": "1.19.0"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I631dc615ff3b315757c2aa8288184b785dd8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: DesktopArticleTarget: Clear stored summary value after save ...

2017-03-09 Thread DLynch (Code Review)

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

Change subject: DesktopArticleTarget: Clear stored summary value after save 
completes
..

DesktopArticleTarget: Clear stored summary value after save completes

Bug: T160130
Change-Id: Id906da69c743f3a966d4182862cd173b26017059
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index d110ba1..c6749ef 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1007,6 +1007,7 @@
mw.config.set( jsconfigvars );
mw.loader.load( modules );
 
+   this.editSummaryValue = undefined;
this.saveDialog.reset();
this.replacePageContent(
html,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: LuaStandalone: Fix signal handling

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

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

Change subject: LuaStandalone: Fix signal handling
..


LuaStandalone: Fix signal handling

I252ec046 noticeably broke things by adding a dependency on the pcntl
functions, which tend not to be present under Apache.

It also subtly broke exit handling by using proc_close()'s return value,
which PHP mangles in such a way that we can't tell the difference
between an actual XCPU kill and exit( SIGXCPU ). This one wasn't noticed
because the pcntl functions interpret everything proc_close() is going
to return as a signal kill and we didn't test the 'exited' code path.

I'm not sure what was going on in I57cdf8aa since it provides no details
about what it was trying to fix, but that would have broken signal
handling in the other way: Ibf5f4656 worked because proc_open() on Linux
executes the command by passing it to /bin/sh -c, and that shell is
going to turn any signal that kills Lua (e.g. the SIGXCPU) into an exit
status of 128+signum.

To avoid proc_close()'s broken return value while also avoiding the
race, we can loop on proc_get_status() until $status['running'] is
false.

To have signals that kill Lua actually be interpreted as signals, we
have two options: add an "exec" in front of the command so proc_open()'s
/bin/sh -c is execed away, or detect shell-style signal reporting and
convert it. We may as well do both.

Bug: T128048
Change-Id: I8a62e1660fe1694e9ba5de77d01960c1ab4580aa
---
M engines/LuaStandalone/LuaStandaloneEngine.php
M engines/LuaStandalone/MWServer.lua
M engines/LuaStandalone/protocol.txt
M tests/engines/LuaStandalone/LuaStandaloneInterpreterTest.php
4 files changed, 72 insertions(+), 8 deletions(-)

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



diff --git a/engines/LuaStandalone/LuaStandaloneEngine.php 
b/engines/LuaStandalone/LuaStandaloneEngine.php
index ba565e9..0abf7eb 100644
--- a/engines/LuaStandalone/LuaStandaloneEngine.php
+++ b/engines/LuaStandalone/LuaStandaloneEngine.php
@@ -226,6 +226,7 @@
if ( php_uname( 's' ) == 'Linux' ) {
// Limit memory and CPU
$cmd = wfEscapeShellArg(
+   'exec', # proc_open() passes $cmd to 'sh -c' on 
Linux, so add an 'exec' to bypass it
'/bin/sh',
__DIR__ . '/lua_ulimit.sh',
$options['cpuLimit'], # soft limit (SIGXCPU)
@@ -328,6 +329,14 @@
return;
}
$this->dispatch( array( 'op' => 'quit' ) );
+   proc_close( $this->proc );
+   }
+
+   public function testquit() {
+   if ( !$this->proc ) {
+   return;
+   }
+   $this->dispatch( array( 'op' => 'testquit' ) );
proc_close( $this->proc );
}
 
@@ -647,22 +656,41 @@
 */
protected function handleIOError() {
$this->checkValid();
+
+   // Terminate, fetch the status, then close. proc_close()'s 
return
+   // value isn't helpful here because there's no way to 
differentiate a
+   // signal-kill from a normal exit.
proc_terminate( $this->proc );
-   $wstatus = proc_close( $this->proc );
-   $signaled = pcntl_wifsignaled( $wstatus );
-   $termsig = pcntl_wtermsig( $wstatus );
-   $exitcode = pcntl_wexitstatus( $wstatus );
+   while ( true ) {
+   $status = proc_get_status( $this->proc );
+   if ( $status === false ) {
+   // WTF? Let the caller throw an appropriate 
error.
+   return;
+   }
+   if ( !$status['running'] ) {
+   break;
+   }
+   usleep( 1 ); // Give the killed process a chance to 
be scheduled
+   }
+   proc_close( $this->proc );
$this->proc = false;
-   if ( $signaled ) {
-   if ( defined( 'SIGXCPU' ) && $termsig == SIGXCPU ) {
+
+   // proc_open() sometimes uses a shell, check for shell-style 
signal reporting.
+   if ( !$status['signaled'] && ( $status['exitcode'] & 0x80 ) === 
0x80 ) {
+   $status['signaled'] = true;
+   $status['termsig'] = $status['exitcode'] - 128;
+   }
+
+   if ( $status['signaled'] ) {
+   if ( defined( 'SIGXCPU' ) && $status['termsig'] === 
SIGXCPU ) {
$this->exitError = $this->engine->newException( 
'scribunto-common-timeout' );
} else {

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Benevity import, still create relationship when no individua...

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

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

Change subject: Benevity import, still create relationship when no individual 
gift
..


Benevity import, still create relationship when no individual gift

Bug: T115044
Change-Id: I9f00f1d74a9ba8ecf680089d0cc0ad557489e160
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
A 
sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
3 files changed, 47 insertions(+), 1 deletion(-)

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



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index 13d01a6..01f7a08 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -160,6 +160,11 @@
   // soft credit it.
   wmf_civicrm_message_create_contact($msg);
 }
+if (isset($msg['employer_id']) && $msg['contact_id'] != 
$this->getAnonymousContactID()) {
+  // This is done in the import but if we have no donation let's still do 
this update.
+  civicrm_api3('Contact', 'create', array('contact_id' => 
$msg['contact_id'],'employer_id' => $msg['employer_id']));
+}
+
 
 if (!empty($msg['matching_amount']) && $msg['matching_amount'] > 0) {
   $matchedMsg = $msg;
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index bf170b4..89f2347 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -135,6 +135,45 @@
*/
   function testImportSucceedIndividualNoExistingMatchOnlyMatchingGift() {
 $thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$relationships = $this->callAPISuccess('Relationship', 'get', array(
+'contact_id_b' => $thaMouseMeister['id'])
+);
+$this->assertEquals(0, $relationships['count']);
+
+$importer = new BenevityFile( __DIR__ . "/data/benevity_only_match.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('All rows were imported', $messages['Result']);
+$contribution = $this->callAPISuccessGetSingle('Contribution', 
array('trxn_id' => 'BENEVITY TRXN-SQUEAK_MATCHED'));
+$relationship = $this->callAPISuccessGetSingle('Relationship', array(
+'contact_id_b' => $thaMouseMeister['id'])
+);
+$this->assertEquals( $relationship['contact_id_a'], 
$contribution['soft_credit_to']);
+  }
+
+  /**
+   * Test when creating a contact just for the matching gift on a soft credit 
match.
+   *
+   * In this scenario the contact is matched based on a prior soft credit. 
Their
+   * email is ignored to make this match.
+   *
+   * The contact does not make a donation but is soft credited the 
organisation's donation.
+   *
+   * We are checking the relationship is created.
+   */
+  function testImportSucceedIndividualSofCreditMatchMatchingGiftNoDonorGift() {
+$thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'minnie@mouse_home.org'
+));
+// Create a contribution on the organisation, soft credited to Better 
Minnie.
+$this->callAPISuccess('Contribution', 'create', array(
+  'total_amount' => 4,
+  'financial_type_id' => 'Donation',
+  'soft_credit_to' => $minnie['id'],
+  'contact_id' => $thaMouseMeister['id'],
+));
+
 $importer = new BenevityFile( __DIR__ . "/data/benevity_only_match.csv" );
 $importer->import();
 $messages = $importer->getMessages();
@@ -257,7 +296,6 @@
 $this->assertEquals(0, $emails['values'][1]['is_primary']);
 $this->assertEquals('min...@mouse.org', $emails['values'][1]['email']);
   }
-
 
   /**
* Check that without an email the match is only accepted with an employer 
connection.
diff --git 
a/sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
 
b/sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
new file mode 100644
index 000..c06a645
--- /dev/null
+++ 
b/sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
@@ -0,0 +1,3 @@
+Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last 
Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction 
ID,Donation Frequency,Donation Amount,Matched Amount,Total
+Mickey Mouse Inc,,2015-11-02,Minnie,Mouse,Not shared by

[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Update devDendencies (node-qunit)

2017-03-09 Thread Krinkle (Code Review)

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

Change subject: build: Update devDendencies (node-qunit)
..

build: Update devDendencies (node-qunit)

This fixes the build warning about unsupported node engine.

> npm WARN engine qunit@0.9.1: wanted: {"node":">=0.6.0 < 5.0"}
>  (current: {"node":"6.9.1"})

node-qunit v0.9.2 adds support for Node 6 and Node 7.

Release notes:


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


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/42/342142/1

diff --git a/package.json b/package.json
index c688d2c..9fb36d9 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 "karma-firefox-launcher": "1.0.1",
 "karma-qunit": "1.2.1",
 "karma-sauce-launcher": "1.1.0",
-"qunit": "0.9.1",
+"qunit": "0.9.2",
 "qunitjs": "1.19.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I631dc615ff3b315757c2aa8288184b785dd8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Even more loosening of benevity matching logic.

2017-03-09 Thread Eileen (Code Review)

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

Change subject: Even more loosening of benevity matching logic.
..


Even more loosening of benevity matching logic.

Create a new contact when we can't decide between multiple existing. Changes 
this rule

| First Name |Last Name|email|Matches found in DB|Action|rejection possible|
|No|Yes|No|2+|Check for an employer match, otherwise create|No|

to
|Yes|Yes|No|2+|Check for an employer match, otherwise create|No|

Bug: T115044

Change-Id: I7eb9b9fdce5b2a0180845acb61cdbe98204d3e53
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
2 files changed, 32 insertions(+), 5 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index e5c06c3..89653af 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -276,12 +276,8 @@
 $contactID = $contact['id'];
   }
 }
-if (!$contactID && empty($params['email'])) {
-  // Do not create a contact - error out & let importer ensure a 
contact exists.
-  throw new WmfException('IMPORT_CONTRIB', 'Ambiguous contact');
-}
 
-return $contactID;
+return $contactID ? $contactID : FALSE;
   }
   return FALSE;
 }
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index db3c49e..36affbd 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -170,6 +170,37 @@
   }
 
   /**
+   * Test that import creates new contacts when it can't resolve to a single 
contact.
+   */
+  function testImportSucceedIndividualTooManyChoicesCantDecideSpamTheDB() {
+$organization = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
+));
+$doppelgangerMinnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
+));
+$importer = new BenevityFile( __DIR__ . "/data/benevity_mice_no_email.csv" 
);
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('All rows were imported', $messages['Result']);
+
+// All you Minnie's are not the real Minnie
+$contributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $minnie['id']));
+$this->assertEquals(0, $contributions['count']);
+$contributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $doppelgangerMinnie['id']));
+$this->assertEquals(0, $contributions['count']);
+
+// Will the Real Minnie Mouse Please stand up.
+$relationship = $this->callAPISuccessGetSingle('Relationship', 
array('contact_id_b' => $organization['id']));
+$this->assertNotEquals($minnie['id'], $relationship['contact_id_a']);
+$this->assertNotEquals($doppelgangerMinnie['id'], 
$relationship['contact_id_a']);
+
+$contributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $relationship['contact_id_a']));
+$this->assertEquals(2, $contributions['count']);
+  }
+
+  /**
* Test that import resolves ambiguous individuals by choosing based on the 
employer where nick_name match in play.
*/
   function testImportSucceedIndividualDismabiguateByEmployerNickName() {

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: More loosening of benevity matching logic.

2017-03-09 Thread Eileen (Code Review)

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

Change subject: More loosening of benevity matching logic.
..


More loosening of benevity matching logic.

Create a new contact rather than bottling out commit changes this rule

First Name  Last Name   email   Matches found in DB Action  rejection 
possible
Yes Yes No 1 only import if the match is an employer match, otherwise no import 
Yes

to
First Name Last Name email   Matches found in DB Action  rejection possible
Yes Yes No 1 Create contact if not employer match, else match No

Bug: T115044
Change-Id: I118448b88104c9095e4e8f83b2ca05667c7c5c34
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
2 files changed, 32 insertions(+), 7 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index d15e2b0..e5c06c3 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -264,7 +264,7 @@
 if (!empty($params['email']) || 
$this->isContactEmployedByOrganization($msg['matching_organization_name'], 
$contacts['values'][$contacts['id']])) {
   return $contacts['id'];
 }
-throw new WmfException('IMPORT_CONTRIB', 'Did not find an unambiguous 
match for ' . implode(',', $params));
+return false;
   }
   elseif ($contacts['count'] > 1) {
 $contactID = NULL;
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index 9023756..db3c49e 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -259,17 +259,14 @@
 
 
   /**
-   * Check that without an email the match is only accepted with an employer 
connection.
+   * Check that without an email the match is accepted with an employer 
connection.
+   *
*/
-  function testImportSucceedIndividualOneMatchNoEmail() {
+  function testImportSucceedIndividualOneMatchNoEmailEmployerMatch() {
 $organization = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
 $minnie = $this->callAPISuccess('Contact', 'create', array(
   'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
 ));
-$importer = new BenevityFile( __DIR__ . "/data/benevity_mice_no_email.csv" 
);
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 2 rows were imported.', $messages['Result']);
 
 $betterMinnie = $this->callAPISuccess('Contact', 'create', array(
   'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual',
@@ -319,7 +316,35 @@
   $this->assertEquals('Restricted - Foundation', 
$contribution[wmf_civicrm_get_custom_field_name('Fund')]);
   $this->assertEquals('Matching Gift', 
$contribution[wmf_civicrm_get_custom_field_name('Campaign')]);
 }
+  }
 
+  /**
+   * Check that without an email & no employer connection a match is not made.
+   *
+   * If there is no employer connection a new contact should be created.
+   */
+  function testImportSucceedIndividualOneMatchNoEmailNoEmployerMatch() {
+$organization = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
+));
+
+$importer = new BenevityFile( __DIR__ . "/data/benevity_mice_no_email.csv" 
);
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('All rows were imported', $messages['Result']);
+
+$contributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $minnie['id']));
+$this->assertEquals(0, $contributions['count']);
+$relationships = $this->callAPISuccess('Relationship', 'get', 
array('contact_id_b' => $organization['id']));
+$this->assertEquals(1, $relationships['count']);
+$individualID = 
$relationships['values'][$relationships['id']]['contact_id_a'];
+$contributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => $individualID));
+// Note that both importees have been matched up. They are both legit 
matches based on our rules.
+// It feels weird because one has less data than the other. But single 
name contacts should be
+// very rare & single name contacts that match a different double-name 
contact in the same
+// org seems

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: [WIP] Alternate fix for swedish folding

2017-03-09 Thread EBernhardson (Code Review)

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

Change subject: [WIP] Alternate fix for swedish folding
..

[WIP] Alternate fix for swedish folding

Reworks the swedish analysis chain to introduce asciifolding. Depending
on Cirrus config this might be switched from asciifolding to icu
normalization.

The problem with this approach is that it is a much larger change, in
terms of changes to result sets.  A different approach might be to add a
char filter only for specific changes we want to make, like ä => a.
After we downgrade relforge to 5.1.2 will load some indices and see how
big of a change this actually is, and if we should consider the more
limited approach.

Bug: T155822
Change-Id: I47fb0377b0090e096a657d6d9a8d3029bea9d6af
---
M includes/Maintenance/AnalysisConfigBuilder.php
1 file changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/41/342141/1

diff --git a/includes/Maintenance/AnalysisConfigBuilder.php 
b/includes/Maintenance/AnalysisConfigBuilder.php
index a42f87e..4b4eb82 100644
--- a/includes/Maintenance/AnalysisConfigBuilder.php
+++ b/includes/Maintenance/AnalysisConfigBuilder.php
@@ -803,6 +803,33 @@
case 'turkish':
$config[ 'filter' ][ 'lowercase' ][ 'language' ] = 
'turkish';
break;
+   case 'swedish':
+   // Add asciifolding_preserve to filters
+   $config[ 'analyzer' ][ 'lowercase_keyword' ][ 'filter' 
][] = 'asciifolding_preserve';
+
+   // Unpack built-in swedish analyzer to add 
asciifolding_preserve
+   $config['filter']['swedish_stop'] = [
+   'type' => 'stop',
+   'stopwords' => '_swedish_',
+   ];
+   $config['filter']['swedish_stemmer'] = [
+   'type' => 'stemmer',
+   'language' => 'swedish',
+   ];
+
+   $config['analyzer']['text'] = [
+   'tokenizer' => 'standard',
+   'filter' => [
+   'lowercase',
+   'swedish_stop',
+   'swedish_stemmer',
+   'asciifolding_preserve',
+   ],
+   ];
+
+   // In Swedish text_search is just a copy of text
+   $config['analyzer']['text_search'] = 
$config['analyzer']['text'];
+   break;
}
if ( $this->icu ) {
foreach ( $config[ 'analyzer' ] as &$analyzer ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Add README

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

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

Change subject: Add README
..


Add README

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

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



diff --git a/README.md b/README.md
new file mode 100644
index 000..3abbf09
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+The LoginNotify extension notifies you when someone logs into your account. It 
can be configured to give warnings after a certain number of failed login 
attempts (The number is configurable, and can be different between unknown 
IPs/devices and known IP/devices). It can also give echo/email notices for 
successful logins from IPs you don't normally use. It can optionally integrate 
into the CheckUser extension in order to determine if the login is from an IP 
address you don't normally use. It can also set a cookie to try and determine 
if the login is from a device you normally use.
+
+ Installation
+* This extension requires the Echo extension to be installed. This extension 
can optionally integrate with the CheckUser extension if it is installed, but 
does not require it.
+* Download and place the file(s) in a directory called LoginNotify in your 
extensions/ folder.
+* Add the following code at the bottom of your LocalSettings.php: 
`wfLoadExtension( 'LoginNotify' );`
+* Navigate to Special:Version on your wiki to verify that the extension is 
successfully installed.
+
+ Configuration parameters
+   "LoginNotifyAttemptsKnownIP": 10
+   "LoginNotifyExpiryKnownIP": 604800,
+   "LoginNotifyAttemptsNewIP": 3,
+   "LoginNotifyExpiryNewIP": 1209600,
+   "LoginNotifyCheckKnownIPs": true,
+   "LoginNotifyEnableOnSuccess": true,
+   "@doc": "Enable notification for users with certain rights. To disable 
set to false",
+   "LoginNotifyEnableForPriv": [ "editinterface", "userrights" ],
+   "@doc": "Override this to use a different secret than $wgSecretKey",
+   "LoginNotifySecretKey": null,
+   "@doc": "Expiry in seconds. Default is 180 days",
+   "LoginNotifyCookieExpire": 15552000,
+   "@doc": "Override to allow sharing login cookies between sites on 
different subdomains",
+   "LoginNotifyCookieDomain": null,
+   "LoginNotifyMaxCookieRecords": 6,
+   "@doc": "Set to false to disable caching IPs in memcache. Set to 0 to 
cache forever. Default 60 days.",
+   "LoginNotifyCacheLoginIPExpiry": 5184000

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11a0592eeb59a8c4876ac1e01f421fb1aa8decde
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Kaldari 
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] operations/puppet[production]: (WIP) contint: migrate git-daemon to systemd

2017-03-09 Thread Hashar (Code Review)

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

Change subject: (WIP) contint: migrate git-daemon to systemd
..

(WIP) contint: migrate git-daemon to systemd

Bug: T157785
Change-Id: Ic23155f6900babba99f9333a797d9bdae31ba6ec
---
M modules/contint/manifests/zuul/git_daemon.pp
D modules/contint/templates/default.git-daemon.erb
A modules/contint/templates/initscripts/git-daemon.systemd.erb
3 files changed, 38 insertions(+), 35 deletions(-)


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

diff --git a/modules/contint/manifests/zuul/git_daemon.pp 
b/modules/contint/manifests/zuul/git_daemon.pp
index de7e8a0..47342a8 100644
--- a/modules/contint/manifests/zuul/git_daemon.pp
+++ b/modules/contint/manifests/zuul/git_daemon.pp
@@ -2,32 +2,32 @@
 class contint::zuul::git_daemon(
 $zuul_git_dir = '/var/lib/zuul/git'
 ) {
-
-  package { 'git-daemon-sysvinit': ensure => present }
-
   # Point both git daemon paths to the same dir, this way we do not have a
   # /git/ prefix in the git:// URLs.
-  $git_daemon_directory = $zuul_git_dir
-  $git_daemon_base_path = $zuul_git_dir
+  $directory = $zuul_git_dir
+  $base_path = $zuul_git_dir
 
+  # Additional options passed to the Daemon.
+  #
   # We dont want to honor `git send-pack` commands so make sure the 
receive-pack
   # service is always disabled.
-  $git_daemon_options = '--export-all --forbid-override=receive-pack'
+  $daemon_options = '--export-all --forbid-override=receive-pack'
 
-  file { '/etc/default/git-daemon':
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
-content => template('contint/default.git-daemon.erb'),
-require => Package['git-daemon-sysvinit'],
+  user { 'gitdaemon':
+system =>  true,
   }
 
-  service { 'git-daemon':
-ensure => 'running',
-enable => true,
-hasrestart => true,
-subscribe  => File['/etc/default/git-daemon'],
-require=> Package['git-daemon-sysvinit'],
+  systemd::syslog { 'git-daemon':
+  base_dir=> '/var/lib/log',
+  owner   => 'gitdaemon',
+  group   => 'gitdaemon',
+  readable_by => 'all',
+  }
+
+  base::service_unit { 'git-daemon':
+ensure  => present,
+systemd => true,
+require =>  User['gitdaemon'],
   }
 
 }
diff --git a/modules/contint/templates/default.git-daemon.erb 
b/modules/contint/templates/default.git-daemon.erb
deleted file mode 100644
index 718ad87..000
--- a/modules/contint/templates/default.git-daemon.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-### THIS FILE IS MANAGED BY PUPPET
-
-# Defaults for git-daemon initscript
-# sourced by /etc/init.d/git-daemon
-# installed at /etc/default/git-daemon by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-GIT_DAEMON_ENABLE=true
-GIT_DAEMON_USER=gitdaemon
-GIT_DAEMON_DIRECTORY=<%= @git_daemon_directory %>
-GIT_DAEMON_BASE_PATH=<%= @git_daemon_base_path %>
-
-# Additional options that are passed to the Daemon.
-GIT_DAEMON_OPTIONS="<%= @git_daemon_options %>"
diff --git a/modules/contint/templates/initscripts/git-daemon.systemd.erb 
b/modules/contint/templates/initscripts/git-daemon.systemd.erb
new file mode 100644
index 000..5de09dd
--- /dev/null
+++ b/modules/contint/templates/initscripts/git-daemon.systemd.erb
@@ -0,0 +1,20 @@
+[Unit]
+Description=Git daemon for Zuul merger
+
+[Service]
+User=gitdaemon
+Environment="PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/git-core"
+Environment="HOME=/var/lib/gitdaemon"
+
+# We dont want to honor `git send-pack` commands so make sure the
+# receive-pack service is always disabled.
+ExecStart=/usr/lib/git-core/git-daemon \
+  --user=gitdaemon \
+  --verbose \
+  --syslog \
+  <%= @daemon_options -%> \
+  --base-path=<%= @base_path -%> \
+  <%= @base_directory -%>
+
+[Install]
+WantedBy=multi-user.target

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Loosen Benevity matching logic for individuals.

2017-03-09 Thread Eileen (Code Review)

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

Change subject: Loosen Benevity matching logic for individuals.
..


Loosen Benevity matching logic for individuals.

Err on side of creating a new contact, rather than bottling out.

This commit changes this rule
First Name  Last Name   email   Matches found in DB Action  
rejection possible
Yes Yes No  0   Do not import (see how this goes, could be 
create)  Yes

to

First Name Last Name email   Matches found in DB Action  rejection possible
Yes Yes No  0 Create, with relationship

Bug: T115044
Change-Id: I83f439c5b4f37d947a40cfceec0f060f5d518ea9
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
2 files changed, 13 insertions(+), 19 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index 13d01a6..d15e2b0 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -96,7 +96,7 @@
 $failed[] = $key;
   }
 }
-if ($failed) {
+if (count($failed) === 3) {
   throw new WmfException('CIVI_REQ_FIELD', t("Missing required fields 
@keys during check import", array("@keys" => implode(", ", $failed;
 }
   }
@@ -228,7 +228,10 @@
* Refer to https://phabricator.wikimedia.org/T115044#3012232 for discussion 
of logic.
*
* @param array $msg
+   *
* @return int|NULL
+   *   Contact ID to use, if no integer is returned a new contact will be 
created
+   *
* @throws \WmfException
*/
   protected function getIndividualID(&$msg) {
@@ -280,15 +283,7 @@
 
 return $contactID;
   }
-  elseif ($contacts['count'] == 0) {
-if (empty($params['email'])) {
-  // Do not create a contact - error out & let importer ensure a 
contact exists.
-  throw new WmfException('IMPORT_CONTRIB', 'Ambiguous contact');
-}
-else {
-  return FALSE;
-}
-  }
+  return FALSE;
 }
 catch (CiviCRM_API3_Exception $e) {
   throw new WmfException('IMPORT_CONTRIB', $e->getMessage());
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index bf170b4..9023756 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -109,8 +109,7 @@
* Test that import passes for the Individual contact when no single match 
is found.
*
* In this scenario an email exists so a contact is created. The 
origanization exists and can be
-   * matched, however the individual does not exist.  Per rules a contact will 
be created if there is an
-   * email but no existing match.
+   * matched, however the individual does not exist & should be created.
*/
   function testImportSucceedIndividualNoExistingMatch() {
 $thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
@@ -380,9 +379,9 @@
   }
 
   /**
-   * Test that all imports fail if the organization has multiple matches.
+   * Test a successful import run.
*/
-  function testImportSucceedOrganizationAll() {
+  function testImportSucceedAll() {
 $mouseOrg = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
 $dogOrg = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Goofy Inc', 'contact_type' => 'Organization'));
 $this->callAPISuccess('Contact', 'create', array('organization_name' => 
'Donald Duck Inc', 'contact_type' => 'Organization'));
@@ -390,10 +389,6 @@
 
 $this->callAPISuccess('Contact', 'create', array(
   'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org', 'employer_id' => $mouseOrg['id'],
-));
-
-$this->callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Pluto', 'contact_type' => 'Individual', 'employer_id' 
=> $dogOrg['id'],
 ));
 
 $importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
@@ -405,12 +400,16 @@
 $this->assertEquals(22, $contribution['total_amount']);
 $this->assertEquals(22, $contribution['net_amount']);
 
+// Our dog has very little details, a new contact will have been created 
for Pluto.
+// It should have an address & a relationship & be soft-credited.
 $dogContact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
 $dogContributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' =>

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix logging in python3 when deprecated_args decorator is used

2017-03-09 Thread Mpaa (Code Review)

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

Change subject: Fix logging in python3 when deprecated_args decorator is used
..

Fix logging in python3 when deprecated_args decorator is used

Remove check on record path, which was failing in python 3.

Remove special treatment between python 2 and 3, leaving the default
behaviour for each version.

Logging out put is slightly different in python 3.6 with respect to the
others, as record.pathname is warnings.py.

Leave indication of original caller module:linenno in message.

Bug: T159077
Change-Id: I0c13551406e709d0082874d383962fd514dcae99
---
M pywikibot/tools/_logging.py
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/22/342122/1

diff --git a/pywikibot/tools/_logging.py b/pywikibot/tools/_logging.py
index 55d4c7d..b318281 100644
--- a/pywikibot/tools/_logging.py
+++ b/pywikibot/tools/_logging.py
@@ -72,27 +72,15 @@
 """Strip trailing newlines before outputting text to file."""
 # Warnings captured from the warnings system are not processed by
 # logoutput(), so the 'context' variables are missing.
-# The same context details are provided by Python 3.X, but need to
-# be extracted from the warning message for Python <= 2.7.
 if record.name == 'py.warnings' and 'caller_file' not in 
record.__dict__:
 assert len(record.args) == 1, \
 'Arguments for record is not correctly set'
 msg = record.args[0]
 
-if PY2:
-record.pathname = msg.partition(':')[0]
-record.lineno = msg.partition(':')[2].partition(':')[0]
-record.module = msg.rpartition('/')[2].rpartition('.')[0]
-else:
-assert msg.startswith(record.pathname + ':'), \
-'Record argument should start with path'
-
 record.__dict__['caller_file'] = record.pathname
 record.__dict__['caller_name'] = record.module
 record.__dict__['caller_line'] = record.lineno
 
-# Remove the path and the line number, and strip the extra space
-msg = msg.partition(':')[2].partition(':')[2].lstrip()
 record.args = (msg,)
 
 text = logging.handlers.RotatingFileHandler.format(self, record)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c13551406e709d0082874d383962fd514dcae99
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Workaround inconsistent search behaviour without asciifolding

2017-03-09 Thread EBernhardson (Code Review)

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

Change subject: Workaround inconsistent search behaviour without asciifolding
..

Workaround inconsistent search behaviour without asciifolding

This is a workaround, really mostly a hack, for full text to return
search results that arn't asciifolded. One of the big downsides
of this approach is that matches will have no text score, relying
only on the QI rescore to give the result it's score.

A more appropriate solution will be to rework the analysis chain
such that some form of folding is applied where necessary.

Bug: T155822
Change-Id: Ia87e456a3f587266acb114dd22a1aa60ac8d4484
---
M 
tests/unit/fixtures/searchText/boost_templates_002.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/boost_templates_002.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_001.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_001.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_002.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_002.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_005.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_005.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_007.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_007.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_010.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_010.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_013.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_013.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_014.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_014.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_015.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_015.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_016.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_016.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_017.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_017.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_019.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_019.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_020.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_020.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_021.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_021.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_023.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_023.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_024.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_024.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_027.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_027.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_028.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_028.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_029.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_029.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_030.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_030.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_031.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_031.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_032.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_032.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_033.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_033.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_038.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_038.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_039.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_039.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_041.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_041.fullyfeatured.expected
M 
tests/unit/fixtures/searchText/browsertest_042.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_042.fullyfeatured.expected
M

[MediaWiki-commits] [Gerrit] maps...deploy[master]: Update tilerator to 6ed2a01

2017-03-09 Thread MaxSem (Code Review)

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

Change subject: Update tilerator to 6ed2a01
..


Update tilerator to 6ed2a01

List of changes:
6ed2a01 Test
xxx Update node module dependencies

Change-Id: Ic8859ab8b421ff93d882bbbf2dcae003eb316414
---
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M node_modules/osm-bright-source/node_modules/postgis-vt-util/package.json
M node_modules/osm-bright-source/package.json
M node_modules/osm-bright-style/node_modules/osm-bright-fonts/package.json
M node_modules/osm-bright-style/package.json
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/node_modules/xmldoc/package.json
M 
node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/package.json
M node_modules/tilerator-jobprocessor/package.json
M src
22 files changed, 26 insertions(+), 26 deletions(-)

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



diff --git a/node_modules/kartotherian-autogen/package.json 
b/node_modules/kartotherian-autogen/package.json
index e9ad7da..73310a7 100644
--- a/node_modules/kartotherian-autogen/package.json
+++ b/node_modules/kartotherian-autogen/package.json
@@ -31,7 +31,7 @@
   "readmeFilename": "README.md",
   "homepage": "https://github.com/kartotherian/kartotherian-autogen#readme;,
   "_id": "kartotherian-autogen@0.0.5",
-  "_shasum": "e6ffbd7aea2e8c8cd83e7f22c297510a051c0642",
+  "_shasum": "949d999c3c2bf6f87d786e97efca57cce93b59f8",
   "_from": 
"git+https://github.com/kartotherian/kartotherian-autogen.git#47b78dd4d8cac71ba6e0516fe147782044801823;,
   "_resolved": 
"git+https://github.com/kartotherian/kartotherian-autogen.git#47b78dd4d8cac71ba6e0516fe147782044801823;
 }
diff --git a/node_modules/kartotherian-cassandra/package.json 
b/node_modules/kartotherian-cassandra/package.json
index dd37b19..7ad43f8 100644
--- a/node_modules/kartotherian-cassandra/package.json
+++ b/node_modules/kartotherian-cassandra/package.json
@@ -34,7 +34,7 @@
   "readmeFilename": "README.md",
   "homepage": "https://github.com/kartotherian/kartotherian-cassandra#readme;,
   "_id": "kartotherian-cassandra@0.0.7",
-  "_shasum": "58e4c56f1e9c12006942005566f65193425c013b",
+  "_shasum": "bc26d633a40ee8685bcb74382c5d07fc765ca82c",
   "_from": 
"git+https://github.com/kartotherian/kartotherian-cassandra.git#cabef6a41c37e24c41cf87e2e441e3d29a26b740;,
   "_resolved": 
"git+https://github.com/kartotherian/kartotherian-cassandra.git#cabef6a41c37e24c41cf87e2e441e3d29a26b740;
 }
diff --git a/node_modules/kartotherian-core/node_modules/xmldoc/package.json 
b/node_modules/kartotherian-core/node_modules/xmldoc/package.json
index 0185c83..5d340d1 100644
--- a/node_modules/kartotherian-core/node_modules/xmldoc/package.json
+++ b/node_modules/kartotherian-core/node_modules/xmldoc/package.json
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/nfarina/xmldoc#readme;,
   "_id": "xmldoc@0.3.1",
-  "_shasum": "df2ab6ff5611fe27f8d59e9ade62a7f369ca2f1a",
+  "_shasum": "7a0b8c7d00e3bb64b937149aea8aadd604372642",
   "_from": 
"git+https://github.com/nyurik/xmldoc.git#3107ca5fe10227539299fb1bb82992d5b824bc37;,
   "_resolved": 
"git+https://github.com/nyurik/xmldoc.git#3107ca5fe10227539299fb1bb82992d5b824bc37;
 }
diff --git a/node_modules/kartotherian-core/package.json 
b/node_modules/kartotherian-core/package.json
index a287a1d..172866f 100644
--- a/node_modules/kartotherian-core/package.json
+++ b/node_modules/kartotherian-core/package.json
@@ -32,7 +32,7 @@
   "readmeFilename": "README.md",
   "homepage": "https://github.com/kartotherian/kartotherian-core#readme;,
   "_id": "kartotherian-core@0.0.17",
-  "_shasum": "4e889d19fc8c3e12db8e8c3987e45c85ee47824e",
+  "_shasum": "aa95c6891b5b1e8499a3ebc38e07552bee8be382",
   "_from": 
"git+https://github.com/kartotherian/kartotherian-core.git#1ae61eb7e9620c1d0123d56c3959795584b2d750;,
   "_resolved": 
"git+https://github.com/kartotherian/kartotherian-core.git#1ae61eb7e9620c1d0123d56c3959795584b2d750;
 }
diff --git a/node_modules/kartotherian-demultiplexer/package.json

[MediaWiki-commits] [Gerrit] maps...deploy[master]: Update tilerator to 6ed2a01

2017-03-09 Thread MaxSem (Code Review)

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

Change subject: Update tilerator to 6ed2a01
..

Update tilerator to 6ed2a01

List of changes:
6ed2a01 Test
xxx Update node module dependencies

Change-Id: Ic8859ab8b421ff93d882bbbf2dcae003eb316414
---
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M node_modules/osm-bright-source/node_modules/postgis-vt-util/package.json
M node_modules/osm-bright-source/package.json
M node_modules/osm-bright-style/node_modules/osm-bright-fonts/package.json
M node_modules/osm-bright-style/package.json
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/node_modules/xmldoc/package.json
M 
node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/package.json
M node_modules/tilerator-jobprocessor/package.json
M src
22 files changed, 26 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/maps/tilerator/deploy 
refs/changes/13/342113/1

diff --git a/node_modules/kartotherian-autogen/package.json 
b/node_modules/kartotherian-autogen/package.json
index e9ad7da..73310a7 100644
--- a/node_modules/kartotherian-autogen/package.json
+++ b/node_modules/kartotherian-autogen/package.json
@@ -31,7 +31,7 @@
   "readmeFilename": "README.md",
   "homepage": "https://github.com/kartotherian/kartotherian-autogen#readme;,
   "_id": "kartotherian-autogen@0.0.5",
-  "_shasum": "e6ffbd7aea2e8c8cd83e7f22c297510a051c0642",
+  "_shasum": "949d999c3c2bf6f87d786e97efca57cce93b59f8",
   "_from": 
"git+https://github.com/kartotherian/kartotherian-autogen.git#47b78dd4d8cac71ba6e0516fe147782044801823;,
   "_resolved": 
"git+https://github.com/kartotherian/kartotherian-autogen.git#47b78dd4d8cac71ba6e0516fe147782044801823;
 }
diff --git a/node_modules/kartotherian-cassandra/package.json 
b/node_modules/kartotherian-cassandra/package.json
index dd37b19..7ad43f8 100644
--- a/node_modules/kartotherian-cassandra/package.json
+++ b/node_modules/kartotherian-cassandra/package.json
@@ -34,7 +34,7 @@
   "readmeFilename": "README.md",
   "homepage": "https://github.com/kartotherian/kartotherian-cassandra#readme;,
   "_id": "kartotherian-cassandra@0.0.7",
-  "_shasum": "58e4c56f1e9c12006942005566f65193425c013b",
+  "_shasum": "bc26d633a40ee8685bcb74382c5d07fc765ca82c",
   "_from": 
"git+https://github.com/kartotherian/kartotherian-cassandra.git#cabef6a41c37e24c41cf87e2e441e3d29a26b740;,
   "_resolved": 
"git+https://github.com/kartotherian/kartotherian-cassandra.git#cabef6a41c37e24c41cf87e2e441e3d29a26b740;
 }
diff --git a/node_modules/kartotherian-core/node_modules/xmldoc/package.json 
b/node_modules/kartotherian-core/node_modules/xmldoc/package.json
index 0185c83..5d340d1 100644
--- a/node_modules/kartotherian-core/node_modules/xmldoc/package.json
+++ b/node_modules/kartotherian-core/node_modules/xmldoc/package.json
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/nfarina/xmldoc#readme;,
   "_id": "xmldoc@0.3.1",
-  "_shasum": "df2ab6ff5611fe27f8d59e9ade62a7f369ca2f1a",
+  "_shasum": "7a0b8c7d00e3bb64b937149aea8aadd604372642",
   "_from": 
"git+https://github.com/nyurik/xmldoc.git#3107ca5fe10227539299fb1bb82992d5b824bc37;,
   "_resolved": 
"git+https://github.com/nyurik/xmldoc.git#3107ca5fe10227539299fb1bb82992d5b824bc37;
 }
diff --git a/node_modules/kartotherian-core/package.json 
b/node_modules/kartotherian-core/package.json
index a287a1d..172866f 100644
--- a/node_modules/kartotherian-core/package.json
+++ b/node_modules/kartotherian-core/package.json
@@ -32,7 +32,7 @@
   "readmeFilename": "README.md",
   "homepage": "https://github.com/kartotherian/kartotherian-core#readme;,
   "_id": "kartotherian-core@0.0.17",
-  "_shasum": "4e889d19fc8c3e12db8e8c3987e45c85ee47824e",
+  "_shasum": "aa95c6891b5b1e8499a3ebc38e07552bee8be382",
   "_from": 
"git+https://github.com/kartotherian/kartotherian-core.git#1ae61eb7e9620c1d0123d56c3959795584b2d750;,
   "_resolved": 
"git+https://github.com/kartotherian/kartotherian-core.git#1ae61eb7e9620c1d0123d56c3959795584b2d750;
 }
diff --git a/node_modules/kartotherian-demultiplexer/package.json

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Move EXTRACT_LENGTH to constants

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

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

Change subject: Hygiene: Move EXTRACT_LENGTH to constants
..


Hygiene: Move EXTRACT_LENGTH to constants

Keep all configuration-like values in one file.
Changes:
 - moved EXTRACT_LENGTH to constants.js file

Change-Id: Ibe5ecfc60f2c09a30a9ecb3586bc5fb6a7365476
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/constants.js
M src/gateway/mediawiki.js
M tests/node-qunit/gateway/mediawiki.test.js
5 files changed, 13 insertions(+), 12 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe5ecfc60f2c09a30a9ecb3586bc5fb6a7365476
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Phuedx 
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]: RESTBase: Send the logs locally to stdout/syslog

2017-03-09 Thread Mobrovac (Code Review)

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

Change subject: RESTBase: Send the logs locally to stdout/syslog
..

RESTBase: Send the logs locally to stdout/syslog

Bug: T112648
Change-Id: Ibf5e7cf7ab843a53360e98b6e64817b685cc4d61
---
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
3 files changed, 2 insertions(+), 5 deletions(-)


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

diff --git a/modules/restbase/manifests/init.pp 
b/modules/restbase/manifests/init.pp
index fba046a..843e0be 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -129,7 +129,6 @@
 
 require ::service::configuration
 $pdfrender_key = $::service::configuration::pdfrender_key
-$local_logfile = "${service::configuration::log_dir}/${title}/main.log"
 
 service::node { 'restbase':
 port=> $port,
diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 421cd2b..ae0ccc8 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -188,8 +188,7 @@
   - type: gelf
 host: <%= @logstash_host %>
 port: <%= @logstash_port %>
-  - type: file
-path: <%= @local_logfile %>
+  - type: stdout
 
 # StatsD metrics collection
 metrics:
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index ada8eb1..b06d96a 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -948,8 +948,7 @@
   - type: gelf
 host: <%= @logstash_host %>
 port: <%= @logstash_port %>
-  - type: file
-path: <%= @local_logfile %>
+  - type: stdout
 
 # StatsD metrics collection
 metrics:

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS:Add production dns for oresrdb2002

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: DNS:Add production dns for oresrdb2002
..


DNS:Add production dns for oresrdb2002

Bug:T160082
Change-Id: I9d0a37b2f9e13c13784522353d80ea4ae58db9a3
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8d306b6..0c98ed8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2878,6 +2878,7 @@
 18  1H IN PTR   ms-be2015.codfw.wmnet.
 19  1H IN PTR   dbstore2002.codfw.wmnet.
 20  1H IN PTR   scb2006.codfw.wmnet.
+21  1H IN PTR   oresrdb2002.codfw.wmnet.
 
 24  1H IN PTR   mc2017.codfw.wmnet.
 25  1H IN PTR   mc2018.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index de1e764..f319138 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2696,6 +2696,7 @@
 mwlog2001   1H  IN A10.192.32.131
 nihal   1H  IN A10.192.16.184 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 oresrdb2001 1H  IN A10.192.16.31 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
+oresrdb2002 1H  IN A10.192.32.21
 planet2001  1H  IN A10.192.16.180
 planet2001  1H  IN  2620:0:860:102:10:192:16:180
 pc2004  1H  IN A10.192.16.170

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d0a37b2f9e13c13784522353d80ea4ae58db9a3
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Update getStashKey() to use $cache parameter

2017-03-09 Thread Krinkle (Code Review)

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

Change subject: Update getStashKey() to use $cache parameter
..

Update getStashKey() to use $cache parameter

Follows-up e4ac1ef. A lot of this class gets its own cache object
in key-generation methods because of legacy compat with public
methods and because of how wfMemcKey used to be.

However where possible, we should encourage passing $cache
so that makeKey() can be used on the same instance that uses
the key.

This is a no-op since it's exactly the same object.

Change-Id: Ib3c31110176659a9175679eb716369e7f0a1d3b2
---
M includes/AbuseFilter.class.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/00/342100/1

diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 87bd653..c857ac1 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -903,7 +903,7 @@
 
// Get the stash key based on the relevant "input" variables
$cache = ObjectCache::getLocalClusterInstance();
-   $stashKey = self::getStashKey( $vars, $group );
+   $stashKey = self::getStashKey( $cache, $vars, $group );
$isForEdit = ( $vars->getVar( 'action' )->toString() === 'edit' 
);
 
$filter_matched = false;
@@ -1018,12 +1018,15 @@
}
 
/**
+* @param BagOStuff $cache
 * @param AbuseFilterVariableHolder $vars
 * @param string $group The filter's group (as defined in 
$wgAbuseFilterValidGroups)
 *
 * @return string
 */
-   private static function getStashKey( AbuseFilterVariableHolder $vars, 
$group ) {
+   private static function getStashKey(
+   BagOStuff $cache, AbuseFilterVariableHolder $vars, $group
+   ) {
$inputVars = $vars->exportNonLazyVars();
// Exclude noisy fields that have superficial changes
unset( $inputVars['old_html'] );
@@ -1034,7 +1037,7 @@
ksort( $inputVars );
$hash = md5( serialize( $inputVars ) );
 
-   return ObjectCache::getLocalClusterInstance()->makeKey(
+   return $cache->makeKey(
'abusefilter',
'check-stash',
$group,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3c31110176659a9175679eb716369e7f0a1d3b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] maps/tilerator[master]: Test

2017-03-09 Thread MaxSem (Code Review)

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

Change subject: Test
..


Test

Change-Id: Ifde25c372aae9cf64fdaf49c3f1be5c1513c662b
---
A TEST!
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git "a/TEST\041" "b/TEST\041"
new file mode 100644
index 000..e69de29
--- /dev/null
+++ "b/TEST\041"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifde25c372aae9cf64fdaf49c3f1be5c1513c662b
Gerrit-PatchSet: 1
Gerrit-Project: maps/tilerator
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Removing purgeBadAssessments.php maintenance script

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

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

Change subject: Removing purgeBadAssessments.php maintenance script
..


Removing purgeBadAssessments.php maintenance script

This is no longer needed.

Change-Id: Icc710c4f54ae78a54b960311dcdc309601a136c5
---
D maintenance/purgeBadAssessments.php
1 file changed, 0 insertions(+), 33 deletions(-)

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



diff --git a/maintenance/purgeBadAssessments.php 
b/maintenance/purgeBadAssessments.php
deleted file mode 100644
index 1da9294..000
--- a/maintenance/purgeBadAssessments.php
+++ /dev/null
@@ -1,33 +0,0 @@
-requireExtension( 'PageAssessments' );
-   $this->addDescription( "Purge bad assessments from the 
page_assessments table" );
-   }
-
-   public function execute() {
-   $dbw = $this->getDB( DB_MASTER );
-   $this->output( "Purging bad assessments from 
page_assessments...\n" );
-   // Delete all assessments with page ID 0
-   $dbw->delete( 'page_assessments', 'pa_page_id = 0' );
-   $this->output( "Done.\n" );
-   $this->output( "Assessments deleted: " . $dbw->affectedRows() . 
"\n" );
-   }
-
-}
-
-$maintClass = "PurgeBadAssessments";
-require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc710c4f54ae78a54b960311dcdc309601a136c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Kaldari 
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]: Apt: Remove an ensure->absent stanza

2017-03-09 Thread Andrew Bogott (Code Review)

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

Change subject: Apt:  Remove an ensure->absent stanza
..


Apt:  Remove an ensure->absent stanza

Change-Id: I357b2abb27d7334bc11db1ac5cde7ed753c8043d
---
M modules/apt/manifests/init.pp
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 8d5553e..b6d2163 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -63,13 +63,6 @@
 key  => 'Acquire::http::Proxy::security-cdn.debian.org',
 value=> $http_proxy,
 }
-# FIXME: remove this
-apt::conf { 'mirantis-mitaka-proxy':
-ensure   => absent,
-priority => '80',
-key  => 
'Acquire::http::Proxy::mitaka-jessie.pkgs.mirantis.com',
-value=> $http_proxy,
-}
 } elsif $::operatingsystem == 'Ubuntu' {
 apt::conf { 'security-ubuntu-proxy':
 ensure   => present,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove pipe separator between cancel and save button in undo...

2017-03-09 Thread Ladsgroup (Code Review)

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

Change subject: Remove pipe separator between cancel and save button in 
undo/restore
..

Remove pipe separator between cancel and save button in undo/restore

Change-Id: I8b95f43b8fbedb89eacab0407498b69fb897b7ab
---
M repo/includes/Actions/EditEntityAction.php
1 file changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/repo/includes/Actions/EditEntityAction.php 
b/repo/includes/Actions/EditEntityAction.php
index 463cb34..4505844 100644
--- a/repo/includes/Actions/EditEntityAction.php
+++ b/repo/includes/Actions/EditEntityAction.php
@@ -501,14 +501,6 @@
$this->getOutput()->addHTML( Html::rawElement( 'br' ) );
$this->getOutput()->addHTML( "\n" );
$this->getOutput()->addHTML( $this->getEditButton() . "\n" );
-
-   $this->getOutput()->addHTML(
-   Html::element(
-   'span',
-   [ 'class' => 'mw-editButtons-pipe-separator' ],
-   $this->msg( 'pipe-separator' )->text()
-   )
-   );
$this->getOutput()->addHTML( $this->getCancelLink() );
 
$this->getOutput()->addHTML( "\n\n" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b95f43b8fbedb89eacab0407498b69fb897b7ab
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/dns[master]: remove fluorine prod IP, keep mgmt

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: remove fluorine prod IP, keep mgmt
..


remove fluorine prod IP, keep mgmt

Bug: T159996
Change-Id: I2a26a13185664764ef48c68bab5a48672b953539
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 4538b24..8d306b6 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -253,7 +253,7 @@
 18  1H IN PTR   conf1001.eqiad.wmnet.
 19  1H IN PTR   db1015.eqiad.wmnet.
 20  1H IN PTR   db1016.eqiad.wmnet.
-21  1H IN PTR   fluorine.eqiad.wmnet.
+
 22  1H IN PTR   tungsten.eqiad.wmnet.
 23  1H IN PTR   ms1003.eqiad.wmnet.
 24  1H IN PTR   rdb1005.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 706129e..de1e764 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -396,7 +396,6 @@
 europium1H  IN A10.64.32.219
 eventlog10011H  IN A10.64.32.167
 eventlog10011H  IN  2620:0:861:103:10:64:32:167
-fluorine1H  IN A10.64.0.21
 francium1H  IN A10.64.32.168
 ganeti1001  1H  IN A10.64.32.169
 ganeti1002  1H  IN A10.64.32.170

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a26a13185664764ef48c68bab5a48672b953539
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump max_pages to 20k

2017-03-09 Thread Mobrovac (Code Review)

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

Change subject: Bump max_pages to 20k
..


Bump max_pages to 20k

Bug: T156411
Change-Id: I8e9724cdcd11351f1d27ab2a15137355da799794
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 3795b38..eaa1be8 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -76,7 +76,7 @@
   # the service's purge strategy parameters
   purge_strategy:
 # maximum number of pages that can be stored at any given time
-max_pages: 5000
+max_pages: 2
 # maximum time in minutes a page can go without edits
 max_inactivity: 1440
 # maximum age allowed in minutes

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: authdns: fix lint warning

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: authdns: fix lint warning
..


authdns: fix lint warning

puppet-lint 2.1.2.pre tells us:

WARNING: optional parameter listed before required parameter on line 9
WARNING: optional parameter listed before required parameter on line 10

Change-Id: I4d48fb902139e76fb73aaf7549a9b08c0f220c4f
---
M modules/authdns/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 6202faf..1f666b9 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -2,12 +2,12 @@
 # A class to implement Wikimedia's authoritative DNS system
 #
 class authdns(
+$lvs_services,
+$discovery_services,
 $nameservers = [ $::fqdn ],
 $gitrepo = undef,
 $monitoring = true,
 $conftool_prefix = hiera('conftool_prefix'),
-$lvs_services,
-$discovery_services,
 ) {
 require ::authdns::account
 require ::authdns::scripts

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d48fb902139e76fb73aaf7549a9b08c0f220c4f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Elastica[master]: Force version of elastica to support php 5.5.x

2017-03-09 Thread EBernhardson (Code Review)

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

Change subject: Force version of elastica to support php 5.5.x
..

Force version of elastica to support php 5.5.x

Some CI things are having problems with the php5 merges
running under 5.5.x. Copy over the workaround used in
mediawiki/vendor to allow Elastica to work with php55.

The actual code of elastica all supports 5.5.x, only the
test suite requires 5.6.

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


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

diff --git a/composer.json b/composer.json
index 720fc45..e719a59 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,32 @@
"name": "Chad Horohoe"
}
],
+   "repositories": [
+   {
+   "type": "package",
+   "package": {
+   "name": "ruflin/elastica",
+   "version": "5.1.0",
+   "dist": {
+   "url": 
"https://github.com/ruflin/Elastica/archive/5.1.0.zip;,
+   "type": "zip"
+   },
+   "source": {
+   "url": 
"https://github.com/ruflin/Elastica.git;,
+   "type": "git",
+   "reference": "tags/5.1.0"
+   },
+   "autoload": {
+   "psr-4": {
+   "Elastica\\": "lib/Elastica/"
+   }
+   },
+   "require": {
+   "php": ">=5.5.0"
+   }
+   }
+   }
+   ],
"require": {
"php": ">=5.5.9",
"ruflin/elastica": "5.1.0"

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Normalized subscr_ messages for tests

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

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

Change subject: Normalized subscr_ messages for tests
..


Normalized subscr_ messages for tests

This is what the messages coming out of the listener should look like
after we move the normalization from RecurringQueueConsumer. It should
be able to handle these without double-normalizing.

Bug: T107372
Change-Id: I1ecf5cbf41bdcb02b2c22fae89ed230c8694c093
---
A sites/all/modules/queue2civicrm/tests/data/subscr_payment_normalized.json
A sites/all/modules/queue2civicrm/tests/data/subscr_signup_normalized.json
2 files changed, 46 insertions(+), 0 deletions(-)

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



diff --git 
a/sites/all/modules/queue2civicrm/tests/data/subscr_payment_normalized.json 
b/sites/all/modules/queue2civicrm/tests/data/subscr_payment_normalized.json
new file mode 100644
index 000..e513314
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/tests/data/subscr_payment_normalized.json
@@ -0,0 +1,22 @@
+{
+"date": 1383346353,
+"subscr_id": null,
+"txn_type": "subscr_payment",
+"contribution_tracking_id": "15017277",
+"email": "test...@wikimedia.org",
+"first_name": "Gen",
+"middle_name": "",
+"last_name": "Russ",
+"street_address": "1211122 132 st",
+"city": "Edmonton",
+"state_province": "Alberta",
+"country": "CA",
+"postal_code": "T4V 2L2",
+"gateway_txn_id": 1765009520,
+"currency": "CAD",
+"gross": "3.00",
+"fee": "0.33",
+"net": 2.67,
+"gateway": "paypal",
+"recurring": true
+}
diff --git 
a/sites/all/modules/queue2civicrm/tests/data/subscr_signup_normalized.json 
b/sites/all/modules/queue2civicrm/tests/data/subscr_signup_normalized.json
new file mode 100644
index 000..cc512f6
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/tests/data/subscr_signup_normalized.json
@@ -0,0 +1,24 @@
+{
+"subscr_id": 2048343366,
+"txn_type": "subscr_signup",
+"contribution_tracking_id": "15028173",
+"email": "test+recur...@wikimedia.org",
+"first_name": "Gen D",
+"middle_name": "",
+"last_name": "Russ",
+"street_address": "5109 Lockwood Rd",
+"city": "Bethel Park",
+"state_province": "PA",
+"country": "US",
+"postal_code": "15110-1232",
+"frequency_interval": "1",
+"frequency_unit": "month",
+"installments": 0,
+"gross": "3.00",
+"currency": "CAD",
+"create_date": 1383347225,
+"start_date": 1383347225,
+"date": 1383347225,
+"gateway": "paypal",
+"recurring": true
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: composer.json: Make ext-curl a suggested package for MediaWi...

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

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

Change subject: composer.json: Make ext-curl a suggested package for MediaWiki 
core
..


composer.json: Make ext-curl a suggested package for MediaWiki core

curl is the preferred HTTP implementation as far as I'm a aware and the
only implementation used by MultiHttpClient, a requirement for
something like VisualEditor

Change-Id: I40a015339d4a3f92cfadcd92dfd70425639d0412
---
M composer.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/composer.json b/composer.json
index ce38914..af8635a 100644
--- a/composer.json
+++ b/composer.json
@@ -64,6 +64,7 @@
},
"suggest": {
"ext-apc": "Local data and opcode cache",
+   "ext-curl": "Improved http communication abilities",
"ext-fileinfo": "Improved mime magic detection",
"ext-intl": "ICU integration",
"ext-wikidiff2": "Diff accelerator",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40a015339d4a3f92cfadcd92dfd70425639d0412
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Improve scrolling behavior of AddToReadingListDialog.

2017-03-09 Thread Dbrant (Code Review)

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

Change subject: Improve scrolling behavior of AddToReadingListDialog.
..

Improve scrolling behavior of AddToReadingListDialog.

This rearranges some elements in the dialog into a NestedScrollView, so
that the top header (the "Save to reading list" message) remains fixed,
but everything else scrolls.

Bug: T159339
Change-Id: I0833a758a7c3a2ee8656e8d0acff2c7d0d0751ba
---
M app/src/main/res/layout/dialog_add_to_reading_list.xml
1 file changed, 73 insertions(+), 69 deletions(-)


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

diff --git a/app/src/main/res/layout/dialog_add_to_reading_list.xml 
b/app/src/main/res/layout/dialog_add_to_reading_list.xml
index 7a0a6ea..167e007 100644
--- a/app/src/main/res/layout/dialog_add_to_reading_list.xml
+++ b/app/src/main/res/layout/dialog_add_to_reading_list.xml
@@ -3,89 +3,93 @@
 xmlns:android="http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 android:layout_width="match_parent"
-android:layout_height="wrap_content">
+android:layout_height="wrap_content"
+android:background="@color/base50">
 
 
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
+android:orientation="vertical">
 
-
-
-
+android:paddingTop="16dp"
+android:paddingBottom="16dp"
+android:paddingLeft="@dimen/list_item_horizontal_padding"
+android:paddingRight="@dimen/list_item_horizontal_padding"
+android:background="?attr/selectableItemBackground"
+android:clickable="true">
+
+
+
+
+
+
+
+
 
 
-
-
-
+
 
 https://gerrit.wikimedia.org/r/342093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Change docs of extending entities to show support for RdfBui...

2017-03-09 Thread Ladsgroup (Code Review)

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

Change subject: Change docs of extending entities to show support for RdfBuilder
..

Change docs of extending entities to show support for RdfBuilder

Bug: T157311
Change-Id: I8403a07561a309969ae79e66271fb060d68804e0
---
M docs/extending-entities.wiki
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/docs/extending-entities.wiki b/docs/extending-entities.wiki
index 71b04fa..8c3379b 100644
--- a/docs/extending-entities.wiki
+++ b/docs/extending-entities.wiki
@@ -15,11 +15,11 @@
 * Add a ChangeOp for the new field, e.g. NewThingyChangeOp
 * Add support in FooValidatorFactory
 * Add support in FooChangeOpDeserializer
+* Add support in FooRdfBuilder
 
 CAVEAT (as of January 2017): For the below parts of Wikibase, there are no 
extension
 interfaces yet for handling additional fields of entities. Fields of entity 
types known
 to Wikibase itself can be hardcoded here, but for supporting entity types 
defined in
 other extensions, plug-in interfaces still need to be added.
 
-* Add to RDF mapping (not currently pluggable!)
 * Add handling (or suppression) to EntityChangeFactory (not currently 
pluggable)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8403a07561a309969ae79e66271fb060d68804e0
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]: site.pp: remove fluorine (decom)

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: site.pp: remove fluorine (decom)
..


site.pp: remove fluorine (decom)

Bug: T159996

Change-Id: I541541a5f9f70e504a3d00dae1ce5313d026fa91
---
M manifests/site.pp
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index f608f98..ff00393 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1088,10 +1088,6 @@
 interface::add_ip6_mapped { 'main': interface => 'eth0' }
 }
 
-node 'fluorine.eqiad.wmnet' {
-role(spare::system)
-}
-
 # ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)
 node 'francium.eqiad.wmnet' {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I541541a5f9f70e504a3d00dae1ce5313d026fa91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Ensure review_site is owned by gerrit2:gerrit

2017-03-09 Thread Paladox (Code Review)

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

Change subject: Gerrit: Ensure review_site is owned by gerrit2:gerrit
..

Gerrit: Ensure review_site is owned by gerrit2:gerrit

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


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


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow fields to define their own merge strategy via callback.

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

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

Change subject: Allow fields to define their own merge strategy via callback.
..


Allow fields to define their own merge strategy via callback.

Change-Id: Ic1cc1581f07381224d3f4fcba4feb1eac7085057
---
M includes/search/SearchIndexFieldDefinition.php
M tests/phpunit/includes/search/SearchIndexFieldTest.php
2 files changed, 39 insertions(+), 6 deletions(-)

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



diff --git a/includes/search/SearchIndexFieldDefinition.php 
b/includes/search/SearchIndexFieldDefinition.php
index 910fd77..04344fd 100644
--- a/includes/search/SearchIndexFieldDefinition.php
+++ b/includes/search/SearchIndexFieldDefinition.php
@@ -34,6 +34,11 @@
protected $subfields = [];
 
/**
+* @var callable
+*/
+   private $mergeCallback;
+
+   /**
 * SearchIndexFieldDefinition constructor.
 * @param string $name Field name
 * @param int$type Index type
@@ -91,6 +96,9 @@
 * @return SearchIndexField|false New definition or false if not 
mergeable.
 */
public function merge( SearchIndexField $that ) {
+   if ( !empty( $this->mergeCallback ) ) {
+   return call_user_func( $this->mergeCallback, $this, 
$that );
+   }
// TODO: which definitions may be compatible?
if ( ( $that instanceof self ) && $this->type === $that->type &&
$this->flags === $that->flags && $this->type !== 
self::INDEX_TYPE_NESTED
@@ -125,4 +133,11 @@
 */
abstract public function getMapping( SearchEngine $engine );
 
+   /**
+* Set field-specific merge strategy.
+* @param callable $callback
+*/
+   public function setMergeCallback( $callback ) {
+   $this->mergeCallback = $callback;
+   }
 }
diff --git a/tests/phpunit/includes/search/SearchIndexFieldTest.php 
b/tests/phpunit/includes/search/SearchIndexFieldTest.php
index 9c10e49..a5a1b7a 100644
--- a/tests/phpunit/includes/search/SearchIndexFieldTest.php
+++ b/tests/phpunit/includes/search/SearchIndexFieldTest.php
@@ -18,14 +18,23 @@
 
/**
 * @dataProvider getMergeCases
+* @param $t1
+* @param $n1
+* @param $t2
+* @param $n2
+* @param $result
 */
public function testMerge( $t1, $n1, $t2, $n2, $result ) {
-   $field1 = $this->getMockBuilder( 'SearchIndexFieldDefinition' )
-   ->setMethods( [ 'getMapping' ] )
-   ->setConstructorArgs( [ $n1, $t1 ] )->getMock();
-   $field2 = $this->getMockBuilder( 'SearchIndexFieldDefinition' )
-   ->setMethods( [ 'getMapping' ] )
-   ->setConstructorArgs( [ $n2, $t2 ] )->getMock();
+   $field1 =
+   $this->getMockBuilder( 
SearchIndexFieldDefinition::class )
+   ->setMethods( [ 'getMapping' ] )
+   ->setConstructorArgs( [ $n1, $t1 ] )
+   ->getMock();
+   $field2 =
+   $this->getMockBuilder( 
SearchIndexFieldDefinition::class )
+   ->setMethods( [ 'getMapping' ] )
+   ->setConstructorArgs( [ $n2, $t2 ] )
+   ->getMock();
 
if ( $result ) {
$this->assertNotFalse( $field1->merge( $field2 ) );
@@ -35,5 +44,14 @@
 
$field1->setFlag( 0xFF );
$this->assertFalse( $field1->merge( $field2 ) );
+
+   $field1->setMergeCallback(
+   function ( $this, $that ) {
+   return "test";
+   }
+   );
+   $this->assertEquals( "test", $field1->merge( $field2 ) );
+
}
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1cc1581f07381224d3f4fcba4feb1eac7085057
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update CREDITS and .mailmap files

2017-03-09 Thread EddieGP (Code Review)

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

Change subject: Update CREDITS and .mailmap files
..

Update CREDITS and .mailmap files

Update the CREDITS file using maintenance/updateCredits.php script that
uses `git log` to identify contributors. For each added user it was
checked by hand that no user with the same mail adress but an other
"Real Name" was already in the CREDITS file. This is the case with one
entry, prevent this using .mailmap. Also remove (WMDE) at end of real
name in one case using .mailmap file.

Change-Id: I4c3bb8c3e5f0c1317ea8711efc4f88e571b0c5c6
---
M .mailmap
M CREDITS
2 files changed, 44 insertions(+), 1 deletion(-)


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

diff --git a/.mailmap b/.mailmap
index 232824d..f056219 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@
 Aditya Sastry 
 Adrian Heine 
 Alex Z.  
+Aleksey Bekh-Ivanov 
 Alexandre Emsenhuber 
 Alexandre Emsenhuber  
 Alexandre Emsenhuber  
@@ -131,6 +132,7 @@
 Derk-Jan Hartman 
 Derk-Jan Hartman  
 Derk-Jan Hartman  
+Devi Krishnan 
 Diederik van Liere  
 Domas Mituzas  
 Douglas Gardner 
diff --git a/CREDITS b/CREDITS
index e8af23c..e1c02fb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -23,12 +23,14 @@
 * Adrian Heine
 * Adrian Lang
 * Ævar Arnfjörð Bjarmason
+* Aftab
 * Agbad
 * Ahmad Sherif
 * Ajayrahul P
 * Alangi Derick
 * Albert221
 * Alejandro Mery
+* Aleksey Bekh-Ivanov
 * AlephNull
 * Alex Ivanov
 * Alex Shih-Han Lin
@@ -42,6 +44,7 @@
 * Amalthea
 * Amir E. Aharoni
 * Amir Sarabadani
+* amritsreekumar
 * ananay
 * Anders Wegge Jakobsen
 * Andre Engels
@@ -70,6 +73,7 @@
 * Aryeh Gregor
 * Asher Feldman
 * Asier Lostalé
+* awu42
 * ayush_garg
 * Azliq7
 * Bagariavivek
@@ -86,6 +90,7 @@
 * Bill Traynor
 * Billinghurst
 * billm
+* blackspirit96
 * blotmandroid
 * Bogdan Stancescu
 * Boris Nagaev
@@ -116,9 +121,11 @@
 * Chris McMahon
 * Chris Seaton
 * Chris Steipp
+* Chrisludt
 * Christian Aistleitner
 * Christian List
 * Christian Neubauer
+* Christoph Jauera
 * Christopher Johnson
 * church of emacs
 * Cindy Cicalese
@@ -145,7 +152,9 @@
 * Darian Anthony Patrick
 * Darkdragon09
 * DaSch
+* datguy
 * David Baumgarten
+* David Causse
 * David Chan
 * David E. Narváez
 * David Lynch
@@ -161,18 +170,20 @@
 * Dévai Tamás
 * Devi Krishnan
 * Diederik van Liere
+* divadsn
 * Domas Mituzas
 * Douglas Gardner
 * DPStokesNZ
 * dr0ptp4kt
 * Ebrahim Byagowi
 * Ed Sanders
+* Eddie Greiner-Petter
 * Edward Chernenko
 * Edward Z. Yang
-* Eddie Greiner-Petter
 * Elisabeth Bauer
 * Elliott Eggleston
 * Elvis Stansvik
+* Emad Elwany
 * Emil Podlaszewski
 * Emmanuel Engelhart
 * Emmanuel Gil Peyrot
@@ -208,6 +219,7 @@
 * georggi
 * Gergő Tisza
 * Gero Scholz
+* Ghybu
 * gicode
 * Giftpflanze
 * Gilles Dubuc
@@ -221,6 +233,7 @@
 * Grunny
 * Guillaume Blanchard
 * Guy Van den Broeck
+* Haikal Izzuddin
 * Happy-melon
 * haritha28
 * Harry Burt
@@ -260,6 +273,7 @@
 * Jaska Zedlik
 * Jason Richey
 * jeblad
+* Jeff Hobson
 * Jeff Janes
 * jeff303
 * Jens Frank
@@ -276,12 +290,15 @@
 * Jidanni
 * Jimmy Collins
 * Jimmy Xu
+* jo12bar
 * joakin
 * Joan Creus
 * Joel Natividad
+* Joel Sahleen
 * Joerg
 * Johan Dahlin
 * John Du Hart
+* John Erling Blad
 * John N
 * Jon Harald Søby
 * Jon Robson
@@ -294,6 +311,7 @@
 * JuneHyeon Bae
 * Jure Kajzer
 * Justin Du
+* Kai Nissen
 * Kai_WMDE
 * kaligula
 * Kartik Mistry
@@ -330,6 +348,7 @@
 * Liam Edwards-Playne
 * liangent
 * Lisa Ridley
+* Liuxinyu970226
 * Ljudusika
 * Lojjik Braughler
 * Louperivois
@@ -339,6 +358,7 @@
 * Luigi Corsaro
 * Luis Felipe Schenone
 * Luke Faraone
+* Luke Welling
 * Lupin
 * Lupo
 * lwelling
@@ -367,6 +387,7 @@
 * Martin Urbanec
 * Massaf
 * Matěj Grabovský
+* Matěj Suchánek
 * matejsuchanek
 * Mathias Ertl
 * mati
@@ -376,6 +397,7 @@
 * Matthew Bowker
 * Matthew Britton
 * Matthew Flaschen
+* Matthew Walker
 * Matthias Jordan
 * Matthias Mullie
 * MatthiasDD
@@ -415,6 +437,7 @@
 * Mwalker
 * mwjames
 * mybugs.mail
+* mynk-96
 * MZMcBride
 * nadeesha
 * Nakon
@@ -427,8 +450,10 @@
 * Nicholas Pisarro, Jr
 * Nick Jenkins
 * nicoco007
+* Nicolaie Constantinescu
 * Nicolas Dumazet
 * Nicolas Weeger
+* Niharika Kohli
 * Nik
 * Nik Everett
 * Niklas Laxström
@@ -443,6 +468,7 @@
 * Nuria Ruiz
 * Nx.devnull
 * Ocean behind ears
+* Od1n
 * Olaf Lenz
 * Olivier Finlay Beaton
 * onei
@@ -464,6 +490,7 @@
 * Pavel Selitskas

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: remove fluorine (decom)

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: site.pp: remove fluorine (decom)
..

site.pp: remove fluorine (decom)

Bug: T159996

Change-Id: I541541a5f9f70e504a3d00dae1ce5313d026fa91
---
M manifests/site.pp
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index f608f98..ff00393 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1088,10 +1088,6 @@
 interface::add_ip6_mapped { 'main': interface => 'eth0' }
 }
 
-node 'fluorine.eqiad.wmnet' {
-role(spare::system)
-}
-
 # ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)
 node 'francium.eqiad.wmnet' {
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I541541a5f9f70e504a3d00dae1ce5313d026fa91
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]: WIP: TLS configuration for RESTBase

2017-03-09 Thread Eevans (Code Review)

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

Change subject: WIP: TLS configuration for RESTBase
..

WIP: TLS configuration for RESTBase

Change-Id: I8e7348cd39cf62cac66305c6f29defdaa1341668
---
M hieradata/regex.yaml
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.yaml.erb
3 files changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index c69afa3..cccb5f4 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -201,6 +201,10 @@
   restbase::skip_updates: true
   cassandra::start_rpc: 'true'
   cassandra::target_version: '2.2'
+  cassandra::cassandra_tls:
+key: foo
+cert: bar
+ca: baz
 
 cassandra_test_codfw:
   __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/
diff --git a/modules/restbase/manifests/init.pp 
b/modules/restbase/manifests/init.pp
index fba046a..7740a4c 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -25,6 +25,9 @@
 # [*cassandra_datacenters*]
 #   The full list of member datacenters.
 #
+# [*cassandra_tls*]
+#   An associative array of TLS options for the Cassandra driver.
+#
 # [*port*]
 #   Port where to run the restbase service. Default: 7231
 #
@@ -100,6 +103,7 @@
 $cassandra_default_consistency = 'localQuorum',
 $cassandra_local_dc = 'datacenter1',
 $cassandra_datacenters = [ 'datacenter1' ],
+$cassandra_tls  = undef,
 $port   = 7231,
 $salt_key   = 'secretkey',
 $page_size  = 250,
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index ada8eb1..28a1f22 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -23,6 +23,12 @@
   username: <%= @cassandra_user %>
   password: <%= @cassandra_password %>
   defaultConsistency: <%= @cassandra_default_consistency %>
+  <% if @cassandra_tls.keys.size > 0 %>
+  tls:
+  <% @cassandra_tls.keys.sort.each do |tls_key| -%>
+ <%= tls_key %>: <%= @cassandra_tls[tls_key] %>
+  <% end ->
+  <% end %>
   storage_groups:
 - name: phase0.group.local
   domains:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add MAC address and partman entries for oresrdb2002

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: Add MAC address and partman entries for oresrdb2002
..


Add MAC address and partman entries for oresrdb2002

Bug:T160082
Change-Id: I56aa133a3f9c79b3cad427ce5ce67b683f688865
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index cc5dd3f..99ade61 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -85,7 +85,7 @@
 kafka1013|kafka1014|kafka1020) echo partman/raid1-30G.cfg ;; \
 kafka100[1-3]|kafka200[1-3]|stat1004) echo 
partman/raid10-gpt-srv-ext4.cfg ;; \
 kubernetes100[1-4]) echo partman/docker-host.cfg ;; \
-
auth[1-2]001|contint[12]001|einsteinium|labcontrol100[1-2]|labnodepool1001|mira|neodymium|oresrdb100[1-2]|phab2001|rdb200[1-6])
 echo partman/raid1-lvm-ext4-srv.cfg ;; \
+
auth[1-2]001|contint[12]001|einsteinium|labcontrol100[1-2]|labnodepool1001|mira|neodymium|oresrdb100[1-2]|oresrdb2002|phab2001|rdb200[1-6])
 echo partman/raid1-lvm-ext4-srv.cfg ;; \
 labnet100[1-2]) echo partman/lvm.cfg ;; \
 labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
 labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index cfc0175..01391f6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5453,6 +5453,11 @@
 fixed-address oresrdb2001.codfw.wmnet;
 }
 
+host oresrdb2002 {
+hardware ethernet 94:18:82:81:27:84;
+fixed-address oresrdb2002.codfw.wmnet;
+}
+
 host osmium {
 hardware ethernet F0:1F:AF:E6:72:40;
 fixed-address osmium.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56aa133a3f9c79b3cad427ce5ce67b683f688865
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: racktables: get rid of $realm-case, use Hiera for host name

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: racktables: get rid of $realm-case, use Hiera for host name
..


racktables: get rid of $realm-case, use Hiera for host name

This kind of $realm-check is what we did in the beginning before
we even had Hiera.

Stop using that and use Hiera instead.

Change-Id: I5d6306901cc12253477debd44f7b8c9baa7dffd9
---
M hieradata/role/common/racktables/server.yaml
M modules/role/manifests/racktables/server.pp
2 files changed, 3 insertions(+), 12 deletions(-)

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



diff --git a/hieradata/role/common/racktables/server.yaml 
b/hieradata/role/common/racktables/server.yaml
index 641618f..fb498ee 100644
--- a/hieradata/role/common/racktables/server.yaml
+++ b/hieradata/role/common/racktables/server.yaml
@@ -2,3 +2,5 @@
 debdeploy::grains:
   debdeploy-racktables:
 value: standard
+
+racktables_host: 'racktables.wikimedia.org'
diff --git a/modules/role/manifests/racktables/server.pp 
b/modules/role/manifests/racktables/server.pp
index 246e96c..3378796 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/role/manifests/racktables/server.pp
@@ -13,18 +13,7 @@
 include ::standard
 include ::base::firewall
 
-# be flexible about labs vs. prod
-case $::realm {
-'labs': {
-$racktables_host = $::fqdn
-}
-'production': {
-$racktables_host = 'racktables.wikimedia.org'
-}
-default: {
-fail('unknown realm, should be labs or production')
-}
-}
+$racktables_host = hiera('racktables_host', $::fqdn)
 
 ferm::service { 'racktables-http':
 proto => 'tcp',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d6306901cc12253477debd44f7b8c9baa7dffd9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.15]: ArticleTargetLoader: wikitext switch shouldn't require FullR...

2017-03-09 Thread Jforrester (Code Review)

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

Change subject: ArticleTargetLoader: wikitext switch shouldn't require 
FullRestbaseURL
..

ArticleTargetLoader: wikitext switch shouldn't require FullRestbaseURL

The non-FullRestbaseURL branch didn't handle converting the provided wikitext,
causing data loss when switching from source to visual modes.

Bug: T158692
Change-Id: I283afc4be1e38d6ec572bfa8542ba8fd9ce7
(cherry picked from commit c5bb912e80aa0a046e0b21c039ec41729320e580)
---
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
index 929dc31..def7ed7 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
@@ -173,18 +173,21 @@
}
 
if (
-   conf.fullRestbaseUrl &&
// wikitext can be an empty string
wikitext !== undefined &&
!$( '[name=wpSection]' ).val()
) {
+   if ( conf.fullRestbaseUrl ) {
+   pageHtmlUrl = 
conf.fullRestbaseUrl + 'v1/transform/wikitext/to/html/';
+   } else {
+   pageHtmlUrl = 
conf.restbaseUrl.replace( 'v1/page/html/', 'v1/transform/wikitext/to/html/' );
+   }
switched = true;
fromEditedState = modified;
window.onbeforeunload = null;
$( window ).off( 'beforeunload' );
restbaseXhr = $.ajax( {
-   url: conf.fullRestbaseUrl + 
'v1/transform/wikitext/to/html/' +
-   encodeURIComponent( 
pageName ) +
+   url: pageHtmlUrl + 
encodeURIComponent( pageName ) +
( oldid === undefined ? 
'' : '/' + oldid ),
type: 'POST',
data: {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I283afc4be1e38d6ec572bfa8542ba8fd9ce7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add MAC address and partman entries for oresrdb2002

2017-03-09 Thread Papaul (Code Review)

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

Change subject: Add MAC address and partman entries for oresrdb2002
..

Add MAC address and partman entries for oresrdb2002

Bug:T160082
Change-Id: I56aa133a3f9c79b3cad427ce5ce67b683f688865
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/342086/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index cc5dd3f..99ade61 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -85,7 +85,7 @@
 kafka1013|kafka1014|kafka1020) echo partman/raid1-30G.cfg ;; \
 kafka100[1-3]|kafka200[1-3]|stat1004) echo 
partman/raid10-gpt-srv-ext4.cfg ;; \
 kubernetes100[1-4]) echo partman/docker-host.cfg ;; \
-
auth[1-2]001|contint[12]001|einsteinium|labcontrol100[1-2]|labnodepool1001|mira|neodymium|oresrdb100[1-2]|phab2001|rdb200[1-6])
 echo partman/raid1-lvm-ext4-srv.cfg ;; \
+
auth[1-2]001|contint[12]001|einsteinium|labcontrol100[1-2]|labnodepool1001|mira|neodymium|oresrdb100[1-2]|oresrdb2002|phab2001|rdb200[1-6])
 echo partman/raid1-lvm-ext4-srv.cfg ;; \
 labnet100[1-2]) echo partman/lvm.cfg ;; \
 labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
 labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index cfc0175..01391f6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5453,6 +5453,11 @@
 fixed-address oresrdb2001.codfw.wmnet;
 }
 
+host oresrdb2002 {
+hardware ethernet 94:18:82:81:27:84;
+fixed-address oresrdb2002.codfw.wmnet;
+}
+
 host osmium {
 hardware ethernet F0:1F:AF:E6:72:40;
 fixed-address osmium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ArticleTarget: Improve edit summary behavior when switching

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

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

Change subject: ArticleTarget: Improve edit summary behavior when switching
..


ArticleTarget: Improve edit summary behavior when switching

Distinguish between the initial summary state, and a value stored from the
summary when switching modes. This lets us avoid overwriting a stored value
when section-editing, or assuming a stored value after a switch was never
edited.

Bug: T159686
Change-Id: Ie7640538140a14bbafd539b3a45928f5c55cf804
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 9d88819..d110ba1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1170,7 +1170,7 @@
  */
 ve.init.mw.DesktopArticleTarget.prototype.getSaveDialogOpeningData = function 
() {
var data = 
ve.init.mw.DesktopArticleTarget.super.prototype.getSaveDialogOpeningData.apply( 
this, arguments );
-   data.editSummary = this.initialEditSummary;
+   data.editSummary = this.editSummaryValue || this.initialEditSummary;
return data;
 };
 
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index df94497..d265457 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1578,7 +1578,7 @@
 ve.init.mw.ArticleTarget.prototype.getSaveFields = function () {
var name,
fields = {
-   wpSummary: this.saveDialog ? 
this.saveDialog.editSummaryInput.getValue() : this.initialEditSummary,
+   wpSummary: this.saveDialog ? 
this.saveDialog.editSummaryInput.getValue() : ( this.editSummaryValue || 
this.initialEditSummary ),
wpCaptchaId: this.captcha && this.captcha.id,
wpCaptchaWord: this.captcha && 
this.captcha.input.getValue()
};
@@ -1822,7 +1822,7 @@
this.attachToolbarSaveButton();
 
if ( this.saveDialog ) {
-   this.initialEditSummary = this.initialEditSummary || 
this.saveDialog.editSummaryInput.getValue();
+   this.editSummaryValue = 
this.saveDialog.editSummaryInput.getValue();
this.saveDialog.disconnect( this );
this.saveDialog = null;
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: get rid of $realm-case, use Hiera for domain name

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: planet: get rid of $realm-case, use Hiera for domain name
..


planet: get rid of $realm-case, use Hiera for domain name

This kind of $realm-case is what we did in the beginning before we
even had Hiera.

Get rid of that. Instead just use Hiera to store the domain name and
set the default to wikimedia.org.

In labs it can be added on the Hiera: special wiki project page
or in hierdata/labs. There is no role/common there it looks but also
no Planet is currently running in Labs.

Removing new line before class to fix lint warning about class
not being documented.

Change-Id: I66310363a13a79993afa326df7bb42d53890b29d
---
M hieradata/role/common/planet/venus.yaml
M modules/role/manifests/planet/venus.pp
2 files changed, 3 insertions(+), 13 deletions(-)

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



diff --git a/hieradata/role/common/planet/venus.yaml 
b/hieradata/role/common/planet/venus.yaml
index 774e632..50aa3c0 100644
--- a/hieradata/role/common/planet/venus.yaml
+++ b/hieradata/role/common/planet/venus.yaml
@@ -2,3 +2,5 @@
   debdeploy-planet:
 value: standard
 cluster: misc
+
+planet_domain_name: 'wikimedia.org'
diff --git a/modules/role/manifests/planet/venus.pp 
b/modules/role/manifests/planet/venus.pp
index a22202d..4c7f489 100644
--- a/modules/role/manifests/planet/venus.pp
+++ b/modules/role/manifests/planet/venus.pp
@@ -1,23 +1,11 @@
 # planet RSS feed aggregator 2.0 (planet-venus)
-
 class role::planet::venus {
 
 include ::base::firewall
 
 system::role { 'role::planet::venus': description => 'Planet (venus) 
weblog aggregator' }
 
-# be flexible about labs vs. prod
-case $::realm {
-'labs': {
-$planet_domain_name = 'wmflabs.org'
-}
-'production': {
-$planet_domain_name = 'wikimedia.org'
-}
-default: {
-fail('unknown realm, should be labs or production')
-}
-}
+$planet_domain_name= hiera('planet_domain_name', 'wikimedia.org')
 
 # List all planet languages and translations for
 # index.html.tmpl here. Configurations, directories and

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66310363a13a79993afa326df7bb42d53890b29d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump max_pages to 20k

2017-03-09 Thread Mobrovac (Code Review)

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

Change subject: Bump max_pages to 20k
..

Bump max_pages to 20k

Bug: T156411
Change-Id: I8e9724cdcd11351f1d27ab2a15137355da799794
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits/deploy 
refs/changes/85/342085/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 3795b38..eaa1be8 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -76,7 +76,7 @@
   # the service's purge strategy parameters
   purge_strategy:
 # maximum number of pages that can be stored at any given time
-max_pages: 5000
+max_pages: 2
 # maximum time in minutes a page can go without edits
 max_inactivity: 1440
 # maximum age allowed in minutes

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e9724cdcd11351f1d27ab2a15137355da799794
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Render self-links as if they were s

2017-03-09 Thread Jforrester (Code Review)

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

Change subject: Render self-links as if they were s
..

Render self-links as if they were s

This is a little inelegant, but it works in both CE and transclusion
content. We retain the :hover of s for interaction

Bug: T52497
Change-Id: I88d45aad2aaa45e71b433350986b19764603a1f2
---
M modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
M modules/ve-mw/init/ve.init.mw.LinkCache.js
2 files changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
index 69a1eee..49cf82f 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
@@ -23,3 +23,10 @@
 .ve-init-target-ie .ve-ce-surface h6 {
overflow: visible;
 }
+
+/* Copied from MW CSS to apply to  tags and not just  ones */
+/* TODO: Upstream this? */
+a.mw-selflink {
+   font-weight: bold;
+   color: inherit;
+}
diff --git a/modules/ve-mw/init/ve.init.mw.LinkCache.js 
b/modules/ve-mw/init/ve.init.mw.LinkCache.js
index f859647..c3f0da8 100644
--- a/modules/ve-mw/init/ve.init.mw.LinkCache.js
+++ b/modules/ve-mw/init/ve.init.mw.LinkCache.js
@@ -79,9 +79,16 @@
}
 
promise.done( function ( data ) {
+   var thisPage = 
ve.init.mw.ApiResponseCache.static.normalizeTitle( mw.config.get( 
'wgRelevantPageName' ) );
+
if ( data.missing && !data.known ) {
$element.addClass( 'new' );
} else {
+   // Local copy of MediaWiki's strong.selflink class 
applied to  elements
+   // TODO: Upstream this?
+   if ( data.title === thisPage ) {
+   $element.addClass( 'mw-selflink' );
+   }
// Provided by core MediaWiki, no styles by default.
if ( data.redirect ) {
$element.addClass( 'mw-redirect' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88d45aad2aaa45e71b433350986b19764603a1f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ArticleTarget: Improve edit summary behavior when switching

2017-03-09 Thread DLynch (Code Review)

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

Change subject: ArticleTarget: Improve edit summary behavior when switching
..

ArticleTarget: Improve edit summary behavior when switching

Distinguish between the initial summary state, and a value stored from the
summary when switching modes. This lets us avoid overwriting a stored value
when section-editing, or assuming a stored value after a switch was never
edited.

Bug: T159686
Change-Id: Ie7640538140a14bbafd539b3a45928f5c55cf804
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 9d88819..d110ba1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1170,7 +1170,7 @@
  */
 ve.init.mw.DesktopArticleTarget.prototype.getSaveDialogOpeningData = function 
() {
var data = 
ve.init.mw.DesktopArticleTarget.super.prototype.getSaveDialogOpeningData.apply( 
this, arguments );
-   data.editSummary = this.initialEditSummary;
+   data.editSummary = this.editSummaryValue || this.initialEditSummary;
return data;
 };
 
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index df94497..d265457 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1578,7 +1578,7 @@
 ve.init.mw.ArticleTarget.prototype.getSaveFields = function () {
var name,
fields = {
-   wpSummary: this.saveDialog ? 
this.saveDialog.editSummaryInput.getValue() : this.initialEditSummary,
+   wpSummary: this.saveDialog ? 
this.saveDialog.editSummaryInput.getValue() : ( this.editSummaryValue || 
this.initialEditSummary ),
wpCaptchaId: this.captcha && this.captcha.id,
wpCaptchaWord: this.captcha && 
this.captcha.input.getValue()
};
@@ -1822,7 +1822,7 @@
this.attachToolbarSaveButton();
 
if ( this.saveDialog ) {
-   this.initialEditSummary = this.initialEditSummary || 
this.saveDialog.editSummaryInput.getValue();
+   this.editSummaryValue = 
this.saveDialog.editSummaryInput.getValue();
this.saveDialog.disconnect( this );
this.saveDialog = null;
}

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

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

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

[MediaWiki-commits] [Gerrit] operations...gerrit[master]: Gerrit: Make sure any services under the gerrit2 user are st...

2017-03-09 Thread Paladox (Code Review)

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

Change subject: Gerrit: Make sure any services under the gerrit2 user are 
stopped
..

Gerrit: Make sure any services under the gerrit2 user are stopped

The user won't be deleted on removing the deb if services are still running 
under the user.

Lets do killall -u gerrit2 to stop all services under the user.

Had a lot of help from Dzahn (mutante) with this.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/gerrit 
refs/changes/82/342082/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66ea5cfe3693a226e0acaf5f119fb915f8af9b13
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/gerrit
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Avoid wfMessage() call in Gadget cache updates

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

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

Change subject: Avoid wfMessage() call in Gadget cache updates
..


Avoid wfMessage() call in Gadget cache updates

This avoids purge problems due to layered caching. The message cache
is known to take a while to regenerate and uses lockTSE=300.

Bug: T157210
Change-Id: I418e160ddb61c4d3654780f5d2bbb14bc2827e2a
---
M includes/MediaWikiGadgetsDefinitionRepo.php
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/includes/MediaWikiGadgetsDefinitionRepo.php 
b/includes/MediaWikiGadgetsDefinitionRepo.php
index f600a7d..06e0760 100644
--- a/includes/MediaWikiGadgetsDefinitionRepo.php
+++ b/includes/MediaWikiGadgetsDefinitionRepo.php
@@ -108,12 +108,14 @@
 */
public function fetchStructuredList( $forceNewText = null ) {
if ( $forceNewText === null ) {
-   $g = wfMessage( "gadgets-definition" 
)->inContentLanguage();
-   if ( !$g->exists() ) {
+   // T157210: avoid using wfMessage() to avoid staleness 
due to cache layering
+   $title = Title::makeTitle( NS_MEDIAWIKI, 
'Gadgets-definition' );
+   $rev = Revision::newFromTitle( $title );
+   if ( !$rev || !$rev->getContent() || 
$rev->getContent()->isEmpty() ) {
return false; // don't cache
}
 
-   $g = $g->plain();
+   $g = $rev->getContent()->getNativeData();
} else {
$g = $forceNewText;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I418e160ddb61c4d3654780f5d2bbb14bc2827e2a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS:Add production dns for oresrdb2002

2017-03-09 Thread Papaul (Code Review)

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

Change subject: DNS:Add production dns for oresrdb2002
..

DNS:Add production dns for oresrdb2002

Bug:T160082
Change-Id: I9d0a37b2f9e13c13784522353d80ea4ae58db9a3
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/81/342081/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 398348a..129c95e 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2878,6 +2878,7 @@
 18  1H IN PTR   ms-be2015.codfw.wmnet.
 19  1H IN PTR   dbstore2002.codfw.wmnet.
 20  1H IN PTR   scb2006.codfw.wmnet.
+21  1H IN PTR   oresrdb2002.codfw.wmnet.
 
 24  1H IN PTR   mc2017.codfw.wmnet.
 25  1H IN PTR   mc2018.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 39d3e63..b33fa90 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2697,6 +2697,7 @@
 mwlog2001   1H  IN A10.192.32.131
 nihal   1H  IN A10.192.16.184 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 oresrdb2001 1H  IN A10.192.16.31 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
+oresrdb2002 1H  IN A10.192.32
 planet2001  1H  IN A10.192.16.180
 planet2001  1H  IN  2620:0:860:102:10:192:16:180
 pc2004  1H  IN A10.192.16.170

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...dashboard[master]: Remove unnecessary annotation on LDF endpoint usage graph

2017-03-09 Thread Bearloga (Code Review)

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

Change subject: Remove unnecessary annotation on LDF endpoint usage graph
..


Remove unnecessary annotation on LDF endpoint usage graph

Change-Id: If42ad7d2b4d6f10b92063151457d90323701eeec
---
M shiny-server/wdqs
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/shiny-server/wdqs b/shiny-server/wdqs
index 3ff5fdb..eba347b 16
--- a/shiny-server/wdqs
+++ b/shiny-server/wdqs
@@ -1 +1 @@
-Subproject commit 3ff5fdb8fd3b310eeb206be9ff0367d4112c4d70
+Subproject commit eba347bbc9c037457dda0e63efde9dc3cfb39f39

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If42ad7d2b4d6f10b92063151457d90323701eeec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] wikimedia...dashboard[master]: Remove unnecessary annotation on LDF endpoint usage graph

2017-03-09 Thread Bearloga (Code Review)

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

Change subject: Remove unnecessary annotation on LDF endpoint usage graph
..

Remove unnecessary annotation on LDF endpoint usage graph

Change-Id: If42ad7d2b4d6f10b92063151457d90323701eeec
---
M shiny-server/wdqs
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/80/342080/1

diff --git a/shiny-server/wdqs b/shiny-server/wdqs
index 3ff5fdb..eba347b 16
--- a/shiny-server/wdqs
+++ b/shiny-server/wdqs
@@ -1 +1 @@
-Subproject commit 3ff5fdb8fd3b310eeb206be9ff0367d4112c4d70
+Subproject commit eba347bbc9c037457dda0e63efde9dc3cfb39f39

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...twilightsparql[master]: Remove unnecessary annotation on LDF endpoint usage graph

2017-03-09 Thread Bearloga (Code Review)

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

Change subject: Remove unnecessary annotation on LDF endpoint usage graph
..


Remove unnecessary annotation on LDF endpoint usage graph

Change-Id: I7134eaae8b99b18a0a6e03c47012046b057c3ef5
---
M server.R
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/server.R b/server.R
index 1974ddb..3001999 100644
--- a/server.R
+++ b/server.R
@@ -27,8 +27,7 @@
   dyAxis("y", logscale = input$usage_logscale) %>%
   dyLegend(labelsDiv = "usage_legend") %>%
   dyRangeSelector %>%
-  dyEvent(as.Date("2017-01-01"), "D (Started tracking LDF usage)", 
labelLoc = "bottom") %>%
-  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+  dyEvent(as.Date("2017-01-01"), "D (Started tracking LDF usage)", 
labelLoc = "bottom")
   )
 
   output$sparql_usage_plot <- renderDygraph(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7134eaae8b99b18a0a6e03c47012046b057c3ef5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/twilightsparql
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] wikimedia...twilightsparql[master]: Remove unnecessary annotation on LDF endpoint usage graph

2017-03-09 Thread Bearloga (Code Review)

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

Change subject: Remove unnecessary annotation on LDF endpoint usage graph
..

Remove unnecessary annotation on LDF endpoint usage graph

Change-Id: I7134eaae8b99b18a0a6e03c47012046b057c3ef5
---
M server.R
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/twilightsparql 
refs/changes/79/342079/1

diff --git a/server.R b/server.R
index 1974ddb..3001999 100644
--- a/server.R
+++ b/server.R
@@ -27,8 +27,7 @@
   dyAxis("y", logscale = input$usage_logscale) %>%
   dyLegend(labelsDiv = "usage_legend") %>%
   dyRangeSelector %>%
-  dyEvent(as.Date("2017-01-01"), "D (Started tracking LDF usage)", 
labelLoc = "bottom") %>%
-  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+  dyEvent(as.Date("2017-01-01"), "D (Started tracking LDF usage)", 
labelLoc = "bottom")
   )
 
   output$sparql_usage_plot <- renderDygraph(

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.15

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

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

Change subject: all wikis to 1.29.0-wmf.15
..


all wikis to 1.29.0-wmf.15

Change-Id: I24d57cc1b938ff378b5ac9311b6274855fcfc76d
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 6e26ad9..1a064df 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.14",
+"aawiki": "php-1.29.0-wmf.15",
 "aawikibooks": "php-1.29.0-wmf.15",
 "aawiktionary": "php-1.29.0-wmf.15",
-"abwiki": "php-1.29.0-wmf.14",
+"abwiki": "php-1.29.0-wmf.15",
 "abwiktionary": "php-1.29.0-wmf.15",
-"acewiki": "php-1.29.0-wmf.14",
+"acewiki": "php-1.29.0-wmf.15",
 "advisorywiki": "php-1.29.0-wmf.15",
-"adywiki": "php-1.29.0-wmf.14",
-"afwiki": "php-1.29.0-wmf.14",
+"adywiki": "php-1.29.0-wmf.15",
+"afwiki": "php-1.29.0-wmf.15",
 "afwikibooks": "php-1.29.0-wmf.15",
 "afwikiquote": "php-1.29.0-wmf.15",
 "afwiktionary": "php-1.29.0-wmf.15",
-"akwiki": "php-1.29.0-wmf.14",
+"akwiki": "php-1.29.0-wmf.15",
 "akwikibooks": "php-1.29.0-wmf.15",
 "akwiktionary": "php-1.29.0-wmf.15",
-"alswiki": "php-1.29.0-wmf.14",
+"alswiki": "php-1.29.0-wmf.15",
 "alswikibooks": "php-1.29.0-wmf.15",
 "alswikiquote": "php-1.29.0-wmf.15",
 "alswiktionary": "php-1.29.0-wmf.15",
-"amwiki": "php-1.29.0-wmf.14",
+"amwiki": "php-1.29.0-wmf.15",
 "amwikiquote": "php-1.29.0-wmf.15",
 "amwiktionary": "php-1.29.0-wmf.15",
-"angwiki": "php-1.29.0-wmf.14",
+"angwiki": "php-1.29.0-wmf.15",
 "angwikibooks": "php-1.29.0-wmf.15",
 "angwikiquote": "php-1.29.0-wmf.15",
 "angwikisource": "php-1.29.0-wmf.15",
 "angwiktionary": "php-1.29.0-wmf.15",
-"anwiki": "php-1.29.0-wmf.14",
+"anwiki": "php-1.29.0-wmf.15",
 "anwiktionary": "php-1.29.0-wmf.15",
-"arbcom_cswiki": "php-1.29.0-wmf.14",
-"arbcom_dewiki": "php-1.29.0-wmf.14",
-"arbcom_enwiki": "php-1.29.0-wmf.14",
-"arbcom_fiwiki": "php-1.29.0-wmf.14",
-"arbcom_nlwiki": "php-1.29.0-wmf.14",
-"arcwiki": "php-1.29.0-wmf.14",
-"arwiki": "php-1.29.0-wmf.14",
+"arbcom_cswiki": "php-1.29.0-wmf.15",
+"arbcom_dewiki": "php-1.29.0-wmf.15",
+"arbcom_enwiki": "php-1.29.0-wmf.15",
+"arbcom_fiwiki": "php-1.29.0-wmf.15",
+"arbcom_nlwiki": "php-1.29.0-wmf.15",
+"arcwiki": "php-1.29.0-wmf.15",
+"arwiki": "php-1.29.0-wmf.15",
 "arwikibooks": "php-1.29.0-wmf.15",
 "arwikimedia": "php-1.29.0-wmf.15",
 "arwikinews": "php-1.29.0-wmf.15",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.15",
 "arwikiversity": "php-1.29.0-wmf.15",
 "arwiktionary": "php-1.29.0-wmf.15",
-"arzwiki": "php-1.29.0-wmf.14",
-"astwiki": "php-1.29.0-wmf.14",
+"arzwiki": "php-1.29.0-wmf.15",
+"astwiki": "php-1.29.0-wmf.15",
 "astwikibooks": "php-1.29.0-wmf.15",
 "astwikiquote": "php-1.29.0-wmf.15",
 "astwiktionary": "php-1.29.0-wmf.15",
-"aswiki": "php-1.29.0-wmf.14",
+"aswiki": "php-1.29.0-wmf.15",
 "aswikibooks": "php-1.29.0-wmf.15",
 "aswikisource": "php-1.29.0-wmf.15",
 "aswiktionary": "php-1.29.0-wmf.15",
 "auditcomwiki": "php-1.29.0-wmf.15",
-"avwiki": "php-1.29.0-wmf.14",
+"avwiki": "php-1.29.0-wmf.15",
 "avwiktionary": "php-1.29.0-wmf.15",
-"aywiki": "php-1.29.0-wmf.14",
+"aywiki": "php-1.29.0-wmf.15",
 "aywikibooks": "php-1.29.0-wmf.15",
 "aywiktionary": "php-1.29.0-wmf.15",
-"azbwiki": "php-1.29.0-wmf.14",
-"azwiki": "php-1.29.0-wmf.14",
+"azbwiki": "php-1.29.0-wmf.15",
+"azwiki": "php-1.29.0-wmf.15",
 "azwikibooks": "php-1.29.0-wmf.15",
 "azwikiquote": "php-1.29.0-wmf.15",
 "azwikisource": "php-1.29.0-wmf.15",
 "azwiktionary": "php-1.29.0-wmf.15",
-"barwiki": "php-1.29.0-wmf.14",
-"bat_smgwiki": "php-1.29.0-wmf.14",
-"bawiki": "php-1.29.0-wmf.14",
+"barwiki": "php-1.29.0-wmf.15",
+"bat_smgwiki": "php-1.29.0-wmf.15",
+"bawiki": "php-1.29.0-wmf.15",
 "bawikibooks": "php-1.29.0-wmf.15",
-"bclwiki": "php-1.29.0-wmf.14",
+"bclwiki": "php-1.29.0-wmf.15",
 "bdwikimedia": "php-1.29.0-wmf.15",
-"be_x_oldwiki": "php-1.29.0-wmf.14",
+"be_x_oldwiki": "php-1.29.0-wmf.15",
 "betawikiversity": "php-1.29.0-wmf.15",
-"bewiki": "php-1.29.0-wmf.14",
+"bewiki": "php-1.29.0-wmf.15",
 "bewikibooks": "php-1.29.0-wmf.15",
 "bewikimedia": "php-1.29.0-wmf.15",
 "bewikiquote": "php-1.29.0-wmf.15",
 "bewikisource": "php-1.29.0-wmf.15",
 "bewiktionary": "php-1.29.0-wmf.15",
-"bgwiki": "php-1.29.0-wmf.14",
+"bgwiki": "php-1.29.0-wmf.15",
 "bgwikibooks": "php-1.29.0-wmf.15",
 "bgwikinews":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.15

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

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342078 )

Change subject: all wikis to 1.29.0-wmf.15
..

all wikis to 1.29.0-wmf.15

Change-Id: I24d57cc1b938ff378b5ac9311b6274855fcfc76d
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 6e26ad9..1a064df 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.14",
+"aawiki": "php-1.29.0-wmf.15",
 "aawikibooks": "php-1.29.0-wmf.15",
 "aawiktionary": "php-1.29.0-wmf.15",
-"abwiki": "php-1.29.0-wmf.14",
+"abwiki": "php-1.29.0-wmf.15",
 "abwiktionary": "php-1.29.0-wmf.15",
-"acewiki": "php-1.29.0-wmf.14",
+"acewiki": "php-1.29.0-wmf.15",
 "advisorywiki": "php-1.29.0-wmf.15",
-"adywiki": "php-1.29.0-wmf.14",
-"afwiki": "php-1.29.0-wmf.14",
+"adywiki": "php-1.29.0-wmf.15",
+"afwiki": "php-1.29.0-wmf.15",
 "afwikibooks": "php-1.29.0-wmf.15",
 "afwikiquote": "php-1.29.0-wmf.15",
 "afwiktionary": "php-1.29.0-wmf.15",
-"akwiki": "php-1.29.0-wmf.14",
+"akwiki": "php-1.29.0-wmf.15",
 "akwikibooks": "php-1.29.0-wmf.15",
 "akwiktionary": "php-1.29.0-wmf.15",
-"alswiki": "php-1.29.0-wmf.14",
+"alswiki": "php-1.29.0-wmf.15",
 "alswikibooks": "php-1.29.0-wmf.15",
 "alswikiquote": "php-1.29.0-wmf.15",
 "alswiktionary": "php-1.29.0-wmf.15",
-"amwiki": "php-1.29.0-wmf.14",
+"amwiki": "php-1.29.0-wmf.15",
 "amwikiquote": "php-1.29.0-wmf.15",
 "amwiktionary": "php-1.29.0-wmf.15",
-"angwiki": "php-1.29.0-wmf.14",
+"angwiki": "php-1.29.0-wmf.15",
 "angwikibooks": "php-1.29.0-wmf.15",
 "angwikiquote": "php-1.29.0-wmf.15",
 "angwikisource": "php-1.29.0-wmf.15",
 "angwiktionary": "php-1.29.0-wmf.15",
-"anwiki": "php-1.29.0-wmf.14",
+"anwiki": "php-1.29.0-wmf.15",
 "anwiktionary": "php-1.29.0-wmf.15",
-"arbcom_cswiki": "php-1.29.0-wmf.14",
-"arbcom_dewiki": "php-1.29.0-wmf.14",
-"arbcom_enwiki": "php-1.29.0-wmf.14",
-"arbcom_fiwiki": "php-1.29.0-wmf.14",
-"arbcom_nlwiki": "php-1.29.0-wmf.14",
-"arcwiki": "php-1.29.0-wmf.14",
-"arwiki": "php-1.29.0-wmf.14",
+"arbcom_cswiki": "php-1.29.0-wmf.15",
+"arbcom_dewiki": "php-1.29.0-wmf.15",
+"arbcom_enwiki": "php-1.29.0-wmf.15",
+"arbcom_fiwiki": "php-1.29.0-wmf.15",
+"arbcom_nlwiki": "php-1.29.0-wmf.15",
+"arcwiki": "php-1.29.0-wmf.15",
+"arwiki": "php-1.29.0-wmf.15",
 "arwikibooks": "php-1.29.0-wmf.15",
 "arwikimedia": "php-1.29.0-wmf.15",
 "arwikinews": "php-1.29.0-wmf.15",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.15",
 "arwikiversity": "php-1.29.0-wmf.15",
 "arwiktionary": "php-1.29.0-wmf.15",
-"arzwiki": "php-1.29.0-wmf.14",
-"astwiki": "php-1.29.0-wmf.14",
+"arzwiki": "php-1.29.0-wmf.15",
+"astwiki": "php-1.29.0-wmf.15",
 "astwikibooks": "php-1.29.0-wmf.15",
 "astwikiquote": "php-1.29.0-wmf.15",
 "astwiktionary": "php-1.29.0-wmf.15",
-"aswiki": "php-1.29.0-wmf.14",
+"aswiki": "php-1.29.0-wmf.15",
 "aswikibooks": "php-1.29.0-wmf.15",
 "aswikisource": "php-1.29.0-wmf.15",
 "aswiktionary": "php-1.29.0-wmf.15",
 "auditcomwiki": "php-1.29.0-wmf.15",
-"avwiki": "php-1.29.0-wmf.14",
+"avwiki": "php-1.29.0-wmf.15",
 "avwiktionary": "php-1.29.0-wmf.15",
-"aywiki": "php-1.29.0-wmf.14",
+"aywiki": "php-1.29.0-wmf.15",
 "aywikibooks": "php-1.29.0-wmf.15",
 "aywiktionary": "php-1.29.0-wmf.15",
-"azbwiki": "php-1.29.0-wmf.14",
-"azwiki": "php-1.29.0-wmf.14",
+"azbwiki": "php-1.29.0-wmf.15",
+"azwiki": "php-1.29.0-wmf.15",
 "azwikibooks": "php-1.29.0-wmf.15",
 "azwikiquote": "php-1.29.0-wmf.15",
 "azwikisource": "php-1.29.0-wmf.15",
 "azwiktionary": "php-1.29.0-wmf.15",
-"barwiki": "php-1.29.0-wmf.14",
-"bat_smgwiki": "php-1.29.0-wmf.14",
-"bawiki": "php-1.29.0-wmf.14",
+"barwiki": "php-1.29.0-wmf.15",
+"bat_smgwiki": "php-1.29.0-wmf.15",
+"bawiki": "php-1.29.0-wmf.15",
 "bawikibooks": "php-1.29.0-wmf.15",
-"bclwiki": "php-1.29.0-wmf.14",
+"bclwiki": "php-1.29.0-wmf.15",
 "bdwikimedia": "php-1.29.0-wmf.15",
-"be_x_oldwiki": "php-1.29.0-wmf.14",
+"be_x_oldwiki": "php-1.29.0-wmf.15",
 "betawikiversity": "php-1.29.0-wmf.15",
-"bewiki": "php-1.29.0-wmf.14",
+"bewiki": "php-1.29.0-wmf.15",
 "bewikibooks": "php-1.29.0-wmf.15",
 "bewikimedia": "php-1.29.0-wmf.15",
 "bewikiquote": "php-1.29.0-wmf.15",
 "bewikisource": "php-1.29.0-wmf.15",
 "bewiktionary": "php-1.29.0-wmf.15",
-"bgwiki": "php-1.29.0-wmf.14",
+"bgwiki": "php-1.29.0-wmf.15",
 "bgwikibooks": "php-1.29.0-wmf.15",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Remove reviewer counts cron, nobody is using it

2017-03-09 Thread Dzahn (Code Review)

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

Change subject: Gerrit: Remove reviewer counts cron, nobody is using it
..


Gerrit: Remove reviewer counts cron, nobody is using it

Literally: no requests in last 30 days

Change-Id: Ie3439b9873deb4f2531258f34955e64ce2ff73d9
---
M modules/gerrit/manifests/crons.pp
1 file changed, 0 insertions(+), 16 deletions(-)

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



diff --git a/modules/gerrit/manifests/crons.pp 
b/modules/gerrit/manifests/crons.pp
index 706c3af..0102be9 100644
--- a/modules/gerrit/manifests/crons.pp
+++ b/modules/gerrit/manifests/crons.pp
@@ -6,20 +6,4 @@
 user=> 'root',
 minute  => [0, 15, 30, 45],
 }
-
-# This is useful information about the distribution of reviewers.
-# Gerrit's rest api doesn't provide an easy way to get this data.
-file { '/var/www/reviewer-counts.json':
-ensure => 'present',
-owner  => 'gerrit2',
-group  => 'root',
-mode   => '0644',
-}
-
-cron { 'list_reviewer_counts':
-command => "/usr/bin/java -jar 
/var/lib/gerrit2/review_site/bin/gerrit.war gsql -d 
/var/lib/gerrit2/review_site/ --format JSON_SINGLE -c 'SELECT changes.change_id 
AS change_id, COUNT(DISTINCT patch_set_approvals.account_id) AS reviewer_count 
FROM changes LEFT JOIN patch_set_approvals ON (changes.change_id = 
patch_set_approvals.change_id) GROUP BY changes.change_id' > 
/var/www/reviewer-counts.json",
-user=> 'gerrit2',
-hour=> 1,
-require => File['/var/www/reviewer-counts.json'],
-}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3439b9873deb4f2531258f34955e64ce2ff73d9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MZMcBride 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 >

1 - 100 of 269 matches

Mail list logo