[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Cleanup spaces in extension.json

[jenkins-bot (Code Review)]

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

Change subject: Cleanup spaces in extension.json
..


Cleanup spaces in extension.json

Change-Id: Ifc6523ee6b7ff9149383108f0e46930e8c065f99
---
M AboutBlueSpice/extension.json
M Flexiskin/extension.json
M HideTitle/extension.json
M SaferEdit/extension.json
M UEModulePDF/extension.json
M UniversalExport/extension.json
M UsageTracker/extension.json
M extension.json
8 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/AboutBlueSpice/extension.json b/AboutBlueSpice/extension.json
index f08f20a..5d1afa6 100644
--- a/AboutBlueSpice/extension.json
+++ b/AboutBlueSpice/extension.json
@@ -1,6 +1,6 @@
 {
"name": "AboutBlueSpice",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/AboutBlueSpice;,
"author": "Markus Glaser",
diff --git a/Flexiskin/extension.json b/Flexiskin/extension.json
index 9323237..8a90095 100644
--- a/Flexiskin/extension.json
+++ b/Flexiskin/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Flexiskin",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/FlexiSkin;,
"author": [
diff --git a/HideTitle/extension.json b/HideTitle/extension.json
index 4ed6e8d..0c3a916 100644
--- a/HideTitle/extension.json
+++ b/HideTitle/extension.json
@@ -1,6 +1,6 @@
 {
"name": "HideTitle",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/HideTitle;,
"author": "Markus Glaser",
diff --git a/SaferEdit/extension.json b/SaferEdit/extension.json
index 575c4c1..8bf789a 100644
--- a/SaferEdit/extension.json
+++ b/SaferEdit/extension.json
@@ -1,6 +1,6 @@
 {
"name": "SaferEdit",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/SaferEdit;,
"author": [ "Markus Glaser ", "Tobias Weichart" ],
diff --git a/UEModulePDF/extension.json b/UEModulePDF/extension.json
index 9775287..5e4a2c6 100644
--- a/UEModulePDF/extension.json
+++ b/UEModulePDF/extension.json
@@ -1,6 +1,6 @@
 {
"name": "UEModulePDF",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/UEModulePDF;,
"author": "Robert Vogel",
diff --git a/UniversalExport/extension.json b/UniversalExport/extension.json
index ab5d2c8..95c277c 100644
--- a/UniversalExport/extension.json
+++ b/UniversalExport/extension.json
@@ -1,6 +1,6 @@
 {
"name": "UniversalExport",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/UniversalExport;,
"author": "Robert Vogel",
diff --git a/UsageTracker/extension.json b/UsageTracker/extension.json
index 49cd775..53dcf90 100644
--- a/UsageTracker/extension.json
+++ b/UsageTracker/extension.json
@@ -1,6 +1,6 @@
 {
"name": "UsageTracker",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/UsageTracker;,
"author": "Markus Glaser",
diff --git a/extension.json b/extension.json
index 58ab16b..dd904eb 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceExtensions",
-"license-name": "GPL-3.0",
+   "license-name": "GPL-3.0",
"version": "3.0.0-alpha",
"url": "https://www.mediawiki.org/wiki/BlueSpice;,
"author": [ "Hallo Welt! GmbH" ],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: user homes: Allow git to control +x for $HOME files

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377056 )

Change subject: user homes: Allow git to control +x for $HOME files
..


user homes: Allow git to control +x for $HOME files

Using an octal mode for recursive management of per-user home directory
contents forces exactly those permissions on the managed files. This
means that files like $HOME/bin/foo will end up provisioned with 0644
permissions even if the file was stored in git with `--chmod=+x`
permissions. Using symbolic permissions instead will only modify the
bits that have been explicitly provided. The new symbolic mode will
ensure that files are readable by all users, directories are traversable
by all users, and both files and directories are writable by the owner.
The execute bit for files will not be modified from the git managed
value.

Change-Id: I6bd9be8a946fef97df4b1f759a50afb59561ae15
---
M modules/admin/manifests/user.pp
1 file changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved
  Addshore: Looks good to me, but someone else must approve



diff --git a/modules/admin/manifests/user.pp b/modules/admin/manifests/user.pp
index 310d8f1..e7f45f3 100644
--- a/modules/admin/manifests/user.pp
+++ b/modules/admin/manifests/user.pp
@@ -71,18 +71,21 @@
 # Puppet chokes if we try to absent subfiles to /home/${user}
 if $ensure == 'present' {
 file { "/home/${name}":
-ensure   => ensure_directory($ensure),
-source   => [
+ensure => ensure_directory($ensure),
+source => [
 "puppet:///modules/admin/home/${name}/",
 'puppet:///modules/admin/home/skel/',
 ],
-sourceselect => 'first',
-recurse  => 'remote',
-mode => '0644',
-owner=> $name,
-group=> $gid,
-force=> true,
-require  => User[$name],
+sourceselect   => 'first',
+recurse=> 'remote',
+# Use source_permissions so that +x bit from git will be applied
+# on the files when they are provisioned on hosts.
+source_permissions => 'use',
+mode   => undef,
+owner  => $name,
+group  => $gid,
+force  => true,
+require=> User[$name],
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6bd9be8a946fef97df4b1f759a50afb59561ae15
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Use Swagger link in MCS documentation

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394529 )

Change subject: Use Swagger link in MCS documentation
..

Use Swagger link in MCS documentation

Bug: T174983
Change-Id: Ie649b29ef38636e5e1f023fc3b94d6347e51c283
---
M 
puppet/modules/role/templates/mobilecontentservice/VagrantRoleMobileContentService.wiki.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/29/394529/1

diff --git 
a/puppet/modules/role/templates/mobilecontentservice/VagrantRoleMobileContentService.wiki.erb
 
b/puppet/modules/role/templates/mobilecontentservice/VagrantRoleMobileContentService.wiki.erb
index 77e7750..8a0d5b1 100644
--- 
a/puppet/modules/role/templates/mobilecontentservice/VagrantRoleMobileContentService.wiki.erb
+++ 
b/puppet/modules/role/templates/mobilecontentservice/VagrantRoleMobileContentService.wiki.erb
@@ -1,4 +1,4 @@
 The Mobile Content Service provides a variety of APIs for shipping mobile 
friendly content to app clients.
-* API: http://<%= @vhost_name %><%= @port_fragment %>/
+* API: http://<%= @vhost_name %><%= @port_fragment %>/?doc
 * Documentation: [[mw:Wikimedia Apps/Team/RESTBase services for apps]]
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie649b29ef38636e5e1f023fc3b94d6347e51c283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Hygiene: simplify function signature

[Mobrovac (Code Review)]

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

Change subject: Hygiene: simplify function signature
..


Hygiene: simplify function signature

Bundle the format option with pdfOptions.

Change-Id: I8ebc51ac1b28c779e1741ff8176ad064e8576d8b
---
M lib/queue.js
M lib/renderer.js
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/lib/queue.js b/lib/queue.js
index ca7f03f..be5d42c 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -203,8 +203,12 @@
 let renderTime;
 
 data.renderer
-.articleToPdf(data.uri, data.format, this._puppeteerOptions,
-  this._pdfOptions)
+.articleToPdf(
+data.uri,
+this._puppeteerOptions,
+Object.assign(
+{}, this._pdfOptions, { format: data.format }
+))
 .then((pdf) => {
 renderTime = Date.now() - data._timeAtRenderStart;
 this._logger.log(
diff --git a/lib/renderer.js b/lib/renderer.js
index 9b1b24c..dedc90f 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -21,13 +21,11 @@
 /**
  * Renders content from `url` in PDF
  * @param {string} url URL to get content from
- * TODO: merge format with pdfOptions
- * @param {string} format Page size, e.g. Letter or A4, passed to 
understands
  * @param {Object} puppeteerOptions
  * @param {Object} pdfOptions
  * @return {} Promise which resolves with PDF buffer
  */
-articleToPdf(url, format, puppeteerOptions, pdfOptions) {
+articleToPdf(url, puppeteerOptions, pdfOptions) {
 let page;
 const that = this;
 
@@ -41,9 +39,7 @@
 return page.goto(url, { waitUntil: 'networkidle2' });
 })
 .then(() => {
-return page.pdf(Object.assign(
-{}, pdfOptions, { format }
-));
+return page.pdf(pdfOptions);
 })
 .catch((error) => {
 // Only thrown an error if we didn't close the browser 
ourselves

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ebc51ac1b28c779e1741ff8176ad064e8576d8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Pmiazga 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: diamond: skip DiskSpace for Docker containers

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393215 )

Change subject: diamond: skip DiskSpace for Docker containers
..


diamond: skip DiskSpace for Docker containers

When a container starts, Docker mount a filesystem under
/var/lib/docker/devicemmapper/mnt/. Diamond eventually the disk space
usages on those and report to Graphite.

Shinken monitor the graphite data and it ends up emitting an alarm
because the metrics are outdated (no valid datapoints found).

That causes alarms such as:

WARNING: integration.integration-slave-docker-1001.diskspace._var_lib_d
ocker_devicemapper_mnt_e6e01440f04a145c09affed5a3ca6f3b53daaab53d038a0d
9a25a2321ad2e83e.byte_percentfree (No valid datapoints found) integrati
on.integration-slave-docker-1001.diskspace._var_lib_docker_devicemapper
_mnt_ae0c0365a418e6d09fafa87f9895fd4e627f98827599ba01651a8d2bb7a745fa.b
yte_percentfree ...

Filter out anything mounted under /var/lib/docker/ as well as the nfs
mounts under /run/docker/netns/

Bug: T177052
Change-Id: Idffe85202cb60f656e698f7b3af8c3a0ed74d0ce
---
M modules/diamond/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index 7b730c6..a90141e 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -127,7 +127,12 @@
 diamond::collector { 'Network': }
 diamond::collector { 'DiskSpace':
 settings => {
-filesystems => 
'ext2,ext3,ext4,xfs,fuse.fuse_dfs,fat32,fat16,btrfs',
+filesystems => 
'ext2,ext3,ext4,xfs,fuse.fuse_dfs,fat32,fat16,btrfs',
+# Dockerd has ephemeral mounts - T181295
+exclude_filters => [
+'^/var/lib/docker/',
+'^/run/docker/',
+],
 },
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idffe85202cb60f656e698f7b3af8c3a0ed74d0ce
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Hashar 
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...apertium-tur[master]: apertium-tur: New upstream release

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393758 )

Change subject: apertium-tur: New upstream release
..


apertium-tur: New upstream release

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

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



diff --git a/debian/changelog b/debian/changelog
index 14e2694..4b28e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-tur (0.2.0~r83161-1+wmf1) jessie-wikimedia; urgency=low
+
+  * New upstream release.
+
+ -- Kartik Mistry   Tue, 28 Nov 2017 18:37:25 +0530
+
 apertium-tur (0.1.0~r81882-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fafe23959866beb81b0fc396e72333a9fe4e4d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-tur
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Alexandros Kosiaris 
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...apertium-crh[master]: apertium-crh: New upstream release

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393711 )

Change subject: apertium-crh: New upstream release
..


apertium-crh: New upstream release

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

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



diff --git a/debian/changelog b/debian/changelog
index c46509b..c1ae9ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-crh (0.2.0~r83161-1+wmf1) jessie-wikimedia; urgency=low
+
+  * New upstream release.
+
+ -- Kartik Mistry   Tue, 28 Nov 2017 10:03:04 +0530
+
 apertium-crh (0.1.0~r81872-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96f1585a04ba3043add6b81c17e4117ee01f57d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-crh
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add Portal namespace for mwl.wikipedia

[MarcoAurelio (Code Review)]

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

Change subject: Add Portal namespace for mwl.wikipedia
..

Add Portal namespace for mwl.wikipedia

Bug: T180052
Change-Id: I29b7c94c972ac8abbdf503bbdad2dfbed05a5a80
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29b7c94c972ac8abbdf503bbdad2dfbed05a5a80
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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]: mariadb: Enable Barracuda on a few roles

[Marostegui (Code Review)]

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

Change subject: mariadb: Enable Barracuda on a few roles
..

mariadb: Enable Barracuda on a few roles

Let's start deploying Barracuda as default format for a few roles.
Specially those getting benefits from the compression

Bug: T150949
Change-Id: Ieff4181739e497453afcd6a96602b2ac2ad1b83c
---
M modules/profile/templates/mariadb/mysqld_config/core_multiinstance.my.cnf.erb
M modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
M 
modules/role/templates/mariadb/mysqld_config/sanitarium_multiinstance.my.cnf.erb
3 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/394527/1

diff --git 
a/modules/profile/templates/mariadb/mysqld_config/core_multiinstance.my.cnf.erb 
b/modules/profile/templates/mariadb/mysqld_config/core_multiinstance.my.cnf.erb
index 6e166ce..b6ca61d 100644
--- 
a/modules/profile/templates/mariadb/mysqld_config/core_multiinstance.my.cnf.erb
+++ 
b/modules/profile/templates/mariadb/mysqld_config/core_multiinstance.my.cnf.erb
@@ -124,6 +124,7 @@
 innodb_stats_sample_pages  = 16
 innodb_stats_method= nulls_unequal
 innodb_locks_unsafe_for_binlog = 1
+innodb_file_format = barracuda
 
 # dump and load innodb buffer at start and stop
 innodb_buffer_pool_load_at_startup  = 1
diff --git 
a/modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
index d6a9114..ba39cb4 100644
--- 
a/modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
+++ 
b/modules/role/templates/mariadb/mysqld_config/dbstore_multiinstance.my.cnf.erb
@@ -56,6 +56,7 @@
 innodb_stats_sample_pages  = 16
 innodb_stats_method= nulls_unequal
 innodb_locks_unsafe_for_binlog = 1
+innodb_file_format = barracuda
 
 # don't dump and load innodb buffer at start and stop
 # these servers will have the buffer pool in a bad state due to dumps
diff --git 
a/modules/role/templates/mariadb/mysqld_config/sanitarium_multiinstance.my.cnf.erb
 
b/modules/role/templates/mariadb/mysqld_config/sanitarium_multiinstance.my.cnf.erb
index 3964154..b0aedfa 100644
--- 
a/modules/role/templates/mariadb/mysqld_config/sanitarium_multiinstance.my.cnf.erb
+++ 
b/modules/role/templates/mariadb/mysqld_config/sanitarium_multiinstance.my.cnf.erb
@@ -82,6 +82,7 @@
 innodb_log_file_size   = 2G
 innodb_flush_log_at_trx_commit = 1
 innodb_flush_method= O_DIRECT
+innodb_file_format = barracuda
 join_cache_level   = 8
 
 # dump and load innodb buffer at start and stop

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieff4181739e497453afcd6a96602b2ac2ad1b83c
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] mediawiki...Timeless[master]: No need for background color on the outside of thumbnails

[jenkins-bot (Code Review)]

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

Change subject: No need for background color on the outside of thumbnails
..


No need for background color on the outside of thumbnails

Change-Id: Id7e38e3653ad0c53a41444926b7ba3157e13c2d2
---
M resources/screen-common.less
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/resources/screen-common.less b/resources/screen-common.less
index 6cf9c6f..1eb1eff 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -409,12 +409,10 @@
 .tright {
margin: 0 0 0.5em 0.5em;
padding: 0 0 1em 1.5em;
-   background: #fff;
 }
 .tleft {
margin: 0 0.5em 0.5em 0;
padding: 0 1.5em 1em 0;
-   background: #fff;
 
 }
 .thumbinner {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7e38e3653ad0c53a41444926b7ba3157e13c2d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: fix useInterimHoldOffCaching() doc mistake

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394526 )

Change subject: objectcache: fix useInterimHoldOffCaching() doc mistake
..

objectcache: fix useInterimHoldOffCaching() doc mistake

Change-Id: Iea24b77f6816251e9dac814dc57f6a44382a3cea
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/394526/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 74ec7b9..129dc26 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1502,7 +1502,7 @@
}
 
/**
-* Disable the use of brief caching for tombstoned keys
+* Enable or disable the use of brief caching for tombstoned keys
 *
 * When a key is purged via delete(), there normally is a period where 
caching
 * is hold-off limited to an extremely short time. This method will 
disable that

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Add @ingroup to RedisBagOStuff

[jenkins-bot (Code Review)]

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

Change subject: objectcache: Add @ingroup to RedisBagOStuff
..


objectcache: Add @ingroup to RedisBagOStuff

Was missing from "Cache" group, as well as from the cross-component
"Redis" group.

Change-Id: I52ebc93cf472a4acc383742e0ea5c15c5a6db537
---
M includes/libs/objectcache/RedisBagOStuff.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/libs/objectcache/RedisBagOStuff.php 
b/includes/libs/objectcache/RedisBagOStuff.php
index 583ec37..f720010 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -23,7 +23,10 @@
 /**
  * Redis-based caching module for redis server >= 2.6.12
  *
- * @note: avoid use of Redis::MULTI transactions for twemproxy support
+ * @note Avoid use of Redis::MULTI transactions for twemproxy support
+ *
+ * @ingroup Cache
+ * @ingroup Redis
  */
 class RedisBagOStuff extends BagOStuff {
/** @var RedisConnectionPool */

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Updates for the 2018 round of Wikimania

[jenkins-bot (Code Review)]

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

Change subject: Updates for the 2018 round of Wikimania
..


Updates for the 2018 round of Wikimania

Bug: T181072
Change-Id: Ic4b96d2a41a63a9c5c4a4a92d780a08b80738ad4
---
M .gitignore
A data/db/migrations/20171128-update-questions-2018.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/inc/forms.html
M data/templates/review/view.html
M src/Forms/Apply.php
9 files changed, 63 insertions(+), 55 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 86b037e..6a2dea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 .AppleDouble
 .LSOverride
 Icon
+.idea/
 
 # Thumbnails
 ._*
diff --git a/data/db/migrations/20171128-update-questions-2018.sql 
b/data/db/migrations/20171128-update-questions-2018.sql
new file mode 100644
index 000..2c08b58
--- /dev/null
+++ b/data/db/migrations/20171128-update-questions-2018.sql
@@ -0,0 +1,11 @@
+-- Alter schema for 2018 round questions
+
+-- Drop unused columns
+ALTER TABLE scholarships DROP COLUMN presentation;
+ALTER TABLE scholarships DROP COLUMN presentationTopic;
+
+-- Add new column for scholarship type
+ALTER TABLE scholarships
+  ADD COLUMN separatejury TINYINT(1) NOT NULL DEFAULT '0' AFTER chapteragree,
+  ADD COLUMN missingKnowledge TEXT DEFAULT NULL AFTER collaboration
+  ;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 4ad70a7..74523d9 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -16,6 +16,7 @@
 id  INT(11) NOT NULL AUTO_INCREMENT
   , typeENUM('partial', 'full', 'either') DEFAULT NULL
   , chapteragreeTINYINT(1) NOT NULL DEFAULT '0'
+  , separatejuryTINYINT(1) NOT NULL DEFAULT '0'
   , fname   VARCHAR(32) DEFAULT NULL
   , lname   VARCHAR(32) DEFAULT NULL
   , email   VARCHAR(64) DEFAULT NULL
@@ -52,11 +53,10 @@
   , contributionTEXT
   , experience  TEXT
   , collaboration   TEXT
+  , missingKnowledgeTEXT
   , prev_scholarTINYINT(1) DEFAULT NULL
   , last_year_scholar   TINYINT(1) DEFAULT NULL
   , reports TEXT
-  , presentationTINYINT(1) DEFAULT NULL
-  , presentationTopic   TEXT
   , willgetvisa TINYINT(1) NOT NULL DEFAULT '0'
   , agreestotravelconditionsTINYINT(1) NOT NULL DEFAULT '0'
   , grantfortravelonly  TINYINT(1) NOT NULL DEFAULT '0'
diff --git a/data/i18n/en.json b/data/i18n/en.json
index befead1..ca33215 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -7,8 +7,8 @@
]
},
"wikimania": "Wikimania",
-   "wikimania-location-year": "Montréal, Canada 2017",
-   "header-title": "Wikimania 2017 - Scholarship application",
+   "wikimania-location-year": "Cape Town, South Africa, 2018",
+   "header-title": "Wikimania 2018 - Scholarship application",
 
"nav-apply": "Apply",
"nav-faq": "FAQ",
@@ -27,16 +27,16 @@
 
"mock": "This is a mock scholarship application site only, use it just 
for testing.",
 
-   "not-open": "The 2017 Wikimania Scholarship process is not yet open. 
For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>About
 Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\;>About
 Scholarships\n",
+   "not-open": "The 2018 Wikimania Scholarship process is not yet open. 
For more information, see:\n\nhttps://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>About
 Wikimania\nhttps://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships\;>About
 Scholarships\n",
 
-   "deadline-passed": "Scholarship application deadline was February 
20, 23:59 UTC.\nWe will notify applicants in April 2017 about the result 
of their application.\nPlease see the scholarships
 page on the wiki for more details.",
+   "deadline-passed": "Scholarship application deadline was February 
20, 23:59 UTC.\nWe will notify applicants in April 2018 about the result 
of their application.\nPlease see the scholarships
 page on the wiki for more details.",
 
-   "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
 2017, the annual international conference centered on Wikimedia projects. 
Awardees will receive a scholarship which will cover conference registration 
fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada, Aug 
9-13, 2017.\nApplications may be submitted in any language, but 
every applicant must provide evidence 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: add WANObjectCache::getMultiCheckKeyTime method

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394524 )

Change subject: objectcache: add WANObjectCache::getMultiCheckKeyTime method
..

objectcache: add WANObjectCache::getMultiCheckKeyTime method

Change-Id: I5675fabc5aa70f72659ce02d68caae88be20e06d
---
M includes/libs/objectcache/WANObjectCache.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
2 files changed, 44 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/394524/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index b8d90d9..0bdfed3 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -586,25 +586,54 @@
 * Note that "check" keys won't collide with other regular keys.
 *
 * @param string $key
-* @return float UNIX timestamp of the check key
+* @return float UNIX timestamp
 */
final public function getCheckKeyTime( $key ) {
-   $key = self::TIME_KEY_PREFIX . $key;
+   return $this->getMultiCheckKeyTime( [ $key ] )[$key];
+   }
 
-   $purge = self::parsePurgeValue( $this->cache->get( $key ) );
-   if ( $purge !== false ) {
-   $time = $purge[self::FLD_TIME];
-   } else {
-   // Casting assures identical floats for the next 
getCheckKeyTime() calls
-   $now = (string)$this->getCurrentTime();
-   $this->cache->add( $key,
-   $this->makePurgeValue( $now, self::HOLDOFF_TTL 
),
-   self::CHECK_KEY_TTL
-   );
-   $time = (float)$now;
+   /**
+* Fetch the values of each timestamp "check" key
+*
+* This works like getCheckKeyTime() except it takes a list of keys
+* and returns a list of timestamps instead of just that of one key
+*
+* @see WANObjectCache::getCheckKeyTime()
+*
+* @param array $keys
+* @return float[] Map of (key => UNIX timestamps)
+* @since 1.31
+*/
+   final public function getMultiCheckKeyTime( array $keys ) {
+   $rawKeys = [];
+   foreach ( $keys as $key ) {
+   $rawKeys[] = self::TIME_KEY_PREFIX . $key;
}
 
-   return $time;
+   $rawValues = $this->cache->getMulti( $rawKeys );
+   $rawValues += array_fill_keys( $rawKeys, false );
+
+   $index = 0;
+   $times = [];
+   foreach ( $rawKeys as $rawKey ) {
+   $purge = self::parsePurgeValue( $rawValues[$rawKey] );
+   if ( $purge !== false ) {
+   $time = $purge[self::FLD_TIME];
+   } else {
+   // Casting assures identical floats for the 
next getCheckKeyTime() calls
+   $now = (string)$this->getCurrentTime();
+   $this->cache->add(
+   $rawKey,
+   $this->makePurgeValue( $now, 
self::HOLDOFF_TTL ),
+   self::CHECK_KEY_TTL
+   );
+   $time = (float)$now;
+   }
+
+   $times[$keys[$index++]] = $time;
+   }
+
+   return $times;
}
 
/**
diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 
b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index d94c546..a0fee8b 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -1153,6 +1153,7 @@
 * @covers WANObjectCache::touchCheckKey
 * @covers WANObjectCache::resetCheckKey
 * @covers WANObjectCache::getCheckKeyTime
+* @covers WANObjectCache::getCheckKeyTimeMulti
 * @covers WANObjectCache::makePurgeValue
 * @covers WANObjectCache::parsePurgeValue
 */

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: add example use case to WANObjectCache::getMult...

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394525 )

Change subject: objectcache: add example use case to 
WANObjectCache::getMultiCheckKeyTime()
..

objectcache: add example use case to WANObjectCache::getMultiCheckKeyTime()

Change-Id: I874070d2f770be7f9e06c381b2413f6e133418b8
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 45 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/25/394525/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 0bdfed3..f157cc9 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -598,7 +598,52 @@
 * This works like getCheckKeyTime() except it takes a list of keys
 * and returns a list of timestamps instead of just that of one key
 *
+* This might be useful when an entity depends on hundreds of other 
other entities,
+* which themselves are used by millions of entities. The later can use 
"check" keys
+* to invalidate their many dependee entities. However, it might be too 
expensive for the
+* former to fetch all the "check" keys of the entities it depends on 
within every single
+* getWithSetCallback() call. In this case the "check" keys can be 
fetched and compared to
+* only after a "time-till-verify" has passed. The verifications are 
middle ground between
+* a blind cache use and a full value computation.
+*
+* Example usage:
+* @code
+* $value = $cache->getWithSetCallback(
+* $cache->makeGlobalKey( 'wikibase-item', $id ),
+* self::INITIAL_TTV, // initial time-till-verify
+* function ( $oldValue, &$ttv, &$setOpts, $oldAsOf ) use ( 
$checkKeys, $cache ) {
+* $now = microtime( true );
+* // Use $oldValue if it passes max ultimate age and 
"check" key comparisons
+* if ( $oldValue &&
+* $oldAsOf > max( $cache->getCheckKeyTimeMulti( 
$checkKeys ) ) &&
+* ( $now - $oldValue['ctime'] ) <= self::MAX_CACHE_AGE
+* ) {
+* // Increase time-till-verify by 50% of last time to 
reduce overhead
+* $ttv = $cache->adaptiveTTL( $oldAsOf, self::MAX_TTV, 
self::MIN_TTV, 1.5 );
+* // Unlike $oldAsOf, "ctime" is the ultimate age of 
the cached data
+* return $oldValue;
+* }
+*
+* $mtimes = []; // mtimes of dependencies; passed by 
reference
+* $value = [ 'data' => $this->computeValue( $mtimes ), 
'ctime' => $now ];
+* // Guess time-till-change among the dependencies, e.g. 
1/(total change rate)
+* $ttc = 1 / array_sum( array_map(
+* function ( $mtime ) use ( $now ) {
+* return 1 / ( $mtime ? ( $now - $mtime ) : 900 );
+* },
+* $mtimes
+* ) );
+* // The time-to-verify should not be overly pessimistic 
nor optimistic
+* $ttv = min( max( $ttc, self::MIN_TTV ), self::MAX_TTV );
+*
+* return $value;
+* },
+* [ 'staleTTL' => $cache::TTL_DAY ] // keep around to verify 
and re-save
+* );
+* @endcode
+*
 * @see WANObjectCache::getCheckKeyTime()
+* @see WANObjectCache::getWithSetCallback()
 *
 * @param array $keys
 * @return float[] Map of (key => UNIX timestamps)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Unify BetaFeatures SVG screenshot markup

[Prtksxna (Code Review)]

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

Change subject: Unify BetaFeatures SVG screenshot markup
..

Unify BetaFeatures SVG screenshot markup

- sort attributes
- indentation

Bug: T180427
Change-Id: Id537f55ab4380aca5c7c1b34f0b3aeaf6dfe5ad3
---
M resources/TwoColConflict-beta-features-ltr.svg
M resources/TwoColConflict-beta-features-rtl.svg
2 files changed, 86 insertions(+), 86 deletions(-)


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

diff --git a/resources/TwoColConflict-beta-features-ltr.svg 
b/resources/TwoColConflict-beta-features-ltr.svg
index ba586c2..621bbc0 100644
--- a/resources/TwoColConflict-beta-features-ltr.svg
+++ b/resources/TwoColConflict-beta-features-ltr.svg
@@ -1,44 +1,44 @@
-
-http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162" id="svg2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
 
diff --git a/resources/TwoColConflict-beta-features-rtl.svg 
b/resources/TwoColConflict-beta-features-rtl.svg
index 12be2f4..20c62de 100644
--- a/resources/TwoColConflict-beta-features-rtl.svg
+++ b/resources/TwoColConflict-beta-features-rtl.svg
@@ -1,44 +1,44 @@
-
-http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162" id="svg2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id537f55ab4380aca5c7c1b34f0b3aeaf6dfe5ad3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Move “Language settings” dialog headline up

[jenkins-bot (Code Review)]

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

Change subject: Move “Language settings” dialog headline up
..


Move “Language settings” dialog headline up

Moving “Language settings” dialog headline up to put on a
virtual line with ToggleButton and apply `#000` to it as
dialog titles elsewhere.

Bug: T175295
Change-Id: Id2d7a7b90996ec7be96e8bafd7bbe78eb8f0e1c9
---
M resources/css/ext.uls.languagesettings.less
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index ed7a041..7b1e437 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -37,13 +37,13 @@
 }
 
 .languagesettings-menu h1 {
+   color: #000;
font-size: 16pt;
line-height: 20pt;
margin-top: 0;
font-weight: normal;
border: 0;
-   padding: 15px 0 3px 15px;
-   color: #54595d;
+   padding: 8px 0 3px 15px;
 }
 
 #languagesettings-settings-panel {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2d7a7b90996ec7be96e8bafd7bbe78eb8f0e1c9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Unify BetaFeatures SVG screenshot markup

[Prtksxna (Code Review)]

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

Change subject: Unify BetaFeatures SVG screenshot markup
..

Unify BetaFeatures SVG screenshot markup

- sort attributes
- generalizing attributes on `g` where applicable
- indentation

Bug: T180427
Change-Id: I4374686c216f39a0bf9d7e520545666c8227f1b9
---
M images/ORES-beta-features-ltr.svg
M images/ORES-beta-features-rtl.svg
2 files changed, 70 insertions(+), 74 deletions(-)


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

diff --git a/images/ORES-beta-features-ltr.svg 
b/images/ORES-beta-features-ltr.svg
index 0f666a8..be4f836 100644
--- a/images/ORES-beta-features-ltr.svg
+++ b/images/ORES-beta-features-ltr.svg
@@ -1,38 +1,36 @@
-
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 
0 264 162" id="svg2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 
0 264 162">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
 
diff --git a/images/ORES-beta-features-rtl.svg 
b/images/ORES-beta-features-rtl.svg
index b621556..668c238 100644
--- a/images/ORES-beta-features-rtl.svg
+++ b/images/ORES-beta-features-rtl.svg
@@ -1,38 +1,36 @@
-
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 
0 264 162" id="svg2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 
0 264 162">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4374686c216f39a0bf9d7e520545666c8227f1b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: tag-deploy: push only the created tag

[BearND (Code Review)]

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

Change subject: tag-deploy: push only the created tag
..

tag-deploy: push only the created tag

git push --tags would push any local tags missing on the upstream repo
to it. Instead just push the single tag we just created.

Change-Id: If221f8faceab86f9ab3df61b18e27678a43cfda4
---
M scripts/tag-deploy.sh
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/scripts/tag-deploy.sh b/scripts/tag-deploy.sh
index 8b63dab..53f4464 100755
--- a/scripts/tag-deploy.sh
+++ b/scripts/tag-deploy.sh
@@ -35,4 +35,4 @@
 
 # Tag the latest code repo commit with it & push tags
 cd "$repo_dir"
-git tag -s "$tag" -m "deployed" && git push --tags && printf "Applied new tag: 
$tag\n"
+git tag -s "$tag" -m "deployed" && git push origin "$tag" && printf "Applied 
new tag: $tag\n"

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: proofreadpage_tests.py: Mark test_page_gen_redlink as expect...

[jenkins-bot (Code Review)]

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

Change subject: proofreadpage_tests.py: Mark test_page_gen_redlink as expected 
failure
..


proofreadpage_tests.py: Mark test_page_gen_redlink as expected failure

Bug: T181697
Change-Id: Idfe1f890a3dc4bcf14ddd5feb54007fa61703ae8
---
M tests/proofreadpage_tests.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Xqt: Looks good to me, approved



diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py
index 77117ad..4d76a2e 100644
--- a/tests/proofreadpage_tests.py
+++ b/tests/proofreadpage_tests.py
@@ -675,6 +675,7 @@
 n = self.index.get_number(page)
 self.assertEqual(self.index.get_page(n), page)
 
+@unittest.expectedFailure  # T181697
 def test_page_gen_redlink(self):
 """Test Index page generator with redlinks."""
 # Check start/end limits.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update jquery.uls to 98fff1b

[jenkins-bot (Code Review)]

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

Change subject: Update jquery.uls to 98fff1b
..


Update jquery.uls to 98fff1b

* Translation updates
* Change for SVG background image styles
* Use searchAPI always when provided

Change-Id: I5a90d76d5acc1939cc7b670df43c4ea3347dfcb3
---
M lib/jquery.uls/css/jquery.uls.css
M lib/jquery.uls/i18n/af.json
M lib/jquery.uls/i18n/anp.json
M lib/jquery.uls/i18n/ckb.json
M lib/jquery.uls/i18n/hoc.json
M lib/jquery.uls/src/jquery.uls.languagefilter.js
6 files changed, 54 insertions(+), 59 deletions(-)

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



diff --git a/lib/jquery.uls/css/jquery.uls.css 
b/lib/jquery.uls/css/jquery.uls.css
index 5c1e9ca..6af44a5 100644
--- a/lib/jquery.uls/css/jquery.uls.css
+++ b/lib/jquery.uls/css/jquery.uls.css
@@ -1,8 +1,5 @@
 .uls-trigger {
-   /* @embed */
background: url('../images/icon-language.png') no-repeat left center;
-   /* @embed */
-   background-image: -webkit-linear-gradient(transparent, transparent), 
url('../images/icon-language.svg');
/* @embed */
background-image: linear-gradient(transparent, transparent), 
url('../images/icon-language.svg');
padding-left: 30px;
@@ -69,7 +66,6 @@
 
 .uls-search-label {
background: url('../images/search.png') no-repeat center center;
-   background-image: -webkit-linear-gradient(transparent, transparent), 
url('../images/search.svg');
/* @embed */
background-image: linear-gradient(transparent, transparent), 
url('../images/search.svg');
background-size: 20px;
@@ -115,7 +111,6 @@
 
 .uls-languagefilter-clear {
background: url('../images/clear.png') no-repeat left center;
-   background-image: -webkit-linear-gradient(transparent, transparent), 
url('../images/clear.svg');
/* @embed */
background-image: linear-gradient(transparent, transparent), 
url('../images/clear.svg');
background-size: 15px;
diff --git a/lib/jquery.uls/i18n/af.json b/lib/jquery.uls/i18n/af.json
index 2b9d83d..36a24de 100644
--- a/lib/jquery.uls/i18n/af.json
+++ b/lib/jquery.uls/i18n/af.json
@@ -18,8 +18,8 @@
"uls-region-PA": "Stille Oseaan",
"uls-region-all": "Alle tale",
"uls-no-results-found": "Geen resultate gevind nie",
-   "uls-common-languages": "Voorgestelde Tale",
+   "uls-common-languages": "Voorgestelde tale",
"uls-no-results-suggestion-title": "U mag geïnteresseerd wees in:",
-   "uls-search-help": "Soektogte kan volgende taalnaam, skripnaam, 
ISO-kode, of volgens streek geskied.",
+   "uls-search-help": "Soek gerus volgens taalnaam, skrifnaam of ISO-kode, 
of blaai volgens streek.",
"uls-search-placeholder": "Soek na ’n taal"
 }
diff --git a/lib/jquery.uls/i18n/anp.json b/lib/jquery.uls/i18n/anp.json
index 0a61cc0..95d5ee5 100644
--- a/lib/jquery.uls/i18n/anp.json
+++ b/lib/jquery.uls/i18n/anp.json
@@ -12,9 +12,10 @@
"uls-region-AS": "एशिया",
"uls-region-ME": "मध्य पूर्व",
"uls-region-PA": "प्रशांत",
+   "uls-region-all": "सब्भे भाषा",
"uls-no-results-found": "कोय परिणाम नै मिललै",
-   "uls-common-languages": "आम भाषा सीनी",
+   "uls-common-languages": "आम भाषा सिनी",
"uls-no-results-suggestion-title": "आपन॑ लेली संभवतः उपयोगी:",
"uls-search-help": "आपन॑ भाषा केरऽ नाम , स्क्रिप्ट केरऽ नाम , भाषा केरऽ 
आईएसओ कोड सं॑ खोज॑ सकै छहो या आपन॑ क्षेत्र के नाम सं॑ ब्राउज़ कर॑ सकै छहऽ.",
-   "uls-search-placeholder": "भाषा खोज"
+   "uls-search-placeholder": "भाषा लेली खोजऽ"
 }
diff --git a/lib/jquery.uls/i18n/ckb.json b/lib/jquery.uls/i18n/ckb.json
index 695ac35..fa8e23b 100644
--- a/lib/jquery.uls/i18n/ckb.json
+++ b/lib/jquery.uls/i18n/ckb.json
@@ -3,7 +3,8 @@
"authors": [
"Calak",
"Asoxor",
-   "Lost Whispers"
+   "Lost Whispers",
+   "Épine"
]
},
"uls-region-WW": "لە گشت جیھاندا",
diff --git a/lib/jquery.uls/i18n/hoc.json b/lib/jquery.uls/i18n/hoc.json
index db58388..cdbfa72 100644
--- a/lib/jquery.uls/i18n/hoc.json
+++ b/lib/jquery.uls/i18n/hoc.json
@@ -10,7 +10,12 @@
"uls-region-AF": "ᢡᣘᣗᣜᣂᣌᣁ",
"uls-region-EU": "ᢥᣃᣜᣉᣉᣘ",
"uls-region-AS": "ᢨᣈᣞᣂᣅᣁ",
+   "uls-region-ME": "ᢵᣚᣁ-ᣕᣃᣜ ᣞᣄ",
+   "uls-region-PA": "ᢸᣈᣞᣂᣘᣂᣌ",
"uls-region-all": "ᢾᣗᣈᣓ ᣎᣈᣋᣁᣜ ᣌᣉ",
"uls-no-results-found": "᢮ᣁᣓᣄ ᣌᣁ ᣓᣖ ᣎᣓᣁ",
+   "uls-common-languages": "ᢨᣒᣄ ᣎᣈᣋᣁᣜ ᣌᣉ",
+   "uls-no-results-suggestion-title": "ᢳᣈᣓᣁ ᣌᣉ ᣏᣂ ᣗᣈᣓ ᣓᣖ ᣕᣓᣁ:",
+   "uls-search-help": "᢮ᣈᣋᣁᣜ ᣓᣃᣕᣃᣖ ᣕᣈ, ᣏᣂᣕᣂ ᣓᣃᣕᣃᣖ ᣕᣈ, ᣎᣈᣋᣁᣜ ᣜᣈᣅᣄ ISO ᣌᣉᣉᣑ 
ᣕᣈ ᣌᣁᣜᣈ ᣕᣅᣑ ᣓᣃᣕᣃᣖ ᣕᣈ ᣉᣉ ᣓᣖ-ᣓᣈᣚ ᣔᣆᣅᣉᣄᣁ.",
"uls-search-placeholder": "ᢶᣂᣈᣑ ᣎᣈᣋᣁᣓ ᣓᣈᣚ-ᣓᣖᣈ"
 }
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Improve ULS language search api

[jenkins-bot (Code Review)]

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

Change subject: Improve ULS language search api
..


Improve ULS language search api

* Store prefixes and infixes separately in the data
* First match language code, then prefixes, then infixes
* Try to use suggestion either in user language or autonym first
* use formatversion=2 to avoid escaping Unicode

Using Language::fetchLanguageName might can have a small
performance impact. On the other hand there is now check
to skip languages we already found, avoiding some fuzzy
matching.

This is in a preparation for a change in jquery.uls to use
the search API more, while trying to reduce the amount of
weird autocompletion suggestions we show to the user.

Bug: T73891
Change-Id: Id94c5352d9a591969bf90144d1d2d5e758d08301
---
M api/ApiLanguageSearch.php
M data/LanguageNameIndexer.php
M data/LanguageNameSearch.php
M data/LanguageNameSearchData.php
M resources/js/ext.uls.mediawiki.js
M tests/phpunit/LanguageSearchTest.php
6 files changed, 51,632 insertions(+), 46,567 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id94c5352d9a591969bf90144d1d2d5e758d08301
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Don't repeat the default in test setup

[jenkins-bot (Code Review)]

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

Change subject: Don't repeat the default in test setup
..


Don't repeat the default in test setup

For a new ParserOptions object, ->setEditSection( true ) is already the
default. Since it's being deprecated in MediaWiki core change
Ied5fe1a61, just remove the call.

Change-Id: Id517a8746d4cc4b0b26a98a74244e4d8c711358c
---
M tests/phpunit/ExtractFormatterTest.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/ExtractFormatterTest.php 
b/tests/phpunit/ExtractFormatterTest.php
index 6b0174f..46d60a6 100644
--- a/tests/phpunit/ExtractFormatterTest.php
+++ b/tests/phpunit/ExtractFormatterTest.php
@@ -16,7 +16,6 @@
 */
public function testExtracts( $expected, $text, $plainText ) {
$po = new ParserOptions();
-   $po->setEditSection( true );
$config = 
MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'textextracts' );
$fmt = new ExtractFormatter( $text, $plainText, $config );
$fmt->remove( '.metadata' ); // Will be added via 
$wgExtractsRemoveClasses on WMF

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id517a8746d4cc4b0b26a98a74244e4d8c711358c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
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...TemplateSandbox[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Change-Id: Id6ad08a0b1f8575e7ee98916217a84c09e72dd3b
Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
---
M TemplateSandbox.hooks.php
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index b0cb4fb..0c520e6 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -119,7 +119,6 @@
$popts = $editpage->getArticle()->makeParserOptions(
$context
);
-   $popts->setEditSection( false );
$popts->setIsPreview( true );
$popts->setIsSectionPreview( false );
$content = $content->preSaveTransform(
@@ -132,7 +131,6 @@
 
$page = WikiPage::factory( $title );
$popts = $page->makeParserOptions( $context );
-   $popts->setEditSection( false );
$popts->setIsPreview( true );
$popts->setIsSectionPreview( false );
$logic = new TemplateSandboxLogic( [], $templatetitle, 
$content );
@@ -147,7 +145,9 @@
 
$dtitle = $parserOutput->getDisplayTitle();
$parserOutput->setTitleText( '' );
-   $out = $parserOutput->getText();
+   $out = $parserOutput->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
 
if ( count( $parserOutput->getWarnings() ) ) {
$note .= "\n\n" . implode( "\n\n", 
$parserOutput->getWarnings() );
@@ -427,7 +427,6 @@
 
// Apply PST to templatesandboxtext
$popts = $page->makeParserOptions( $module );
-   $popts->setEditSection( false );
$popts->setIsPreview( true );
$popts->setIsSectionPreview( false );
$user = RequestContext::getMain()->getUser();

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Use ParserOutput stateless transforms when available

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms when available
..


Use ParserOutput stateless transforms when available

See MediaWiki core changes Ied5fe1a61 and I78b62ec3.

There's no need to feature-flag the extra parameter in calls to
ParserOutput::getText(), they'll just be ignored if this is merged
first.

Change-Id: Ic7aa606b7d697e06c74c1e9207efc77442f5b0c3
---
M includes/UploadWizardCampaign.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/includes/UploadWizardCampaign.php 
b/includes/UploadWizardCampaign.php
index 4d4ccc8..2280438 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -218,7 +218,9 @@
global $wgParser;
 
$parserOptions = ParserOptions::newFromContext( $this->context 
);
-   $parserOptions->setEditSection( false );
+   if ( !defined( 'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' ) 
) {
+   $parserOptions->setEditSection( false );
+   }
$parserOptions->setInterfaceMessage( true );
$parserOptions->setUserLang( $lang );
$parserOptions->setTargetLanguage( $lang );
@@ -226,7 +228,9 @@
 
$output = $wgParser->parse( $value, $this->getTitle(),

$parserOptions );
-   $parsed = $output->getText();
+   $parsed = $output->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
 
// Strip out the surrounding  tags
$m = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7aa606b7d697e06c74c1e9207efc77442f5b0c3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...GWToolset[master]: Use ParserOutput stateless transforms when available

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms when available
..


Use ParserOutput stateless transforms when available

See MediaWiki core changes Ied5fe1a61 and I78b62ec3.

There's no need to feature-flag the extra parameter in calls to
ParserOutput::getText(), they'll just be ignored if this is merged
first.

Change-Id: I2cd7519186f2319f32cf6288655ddb873337a638
---
M includes/Forms/PreviewForm.php
1 file changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/includes/Forms/PreviewForm.php b/includes/Forms/PreviewForm.php
index f0f66fc..2463615 100644
--- a/includes/Forms/PreviewForm.php
+++ b/includes/Forms/PreviewForm.php
@@ -267,7 +267,9 @@
$Output = $Context->getOutput();
 
$parser_options = ParserOptions::newFromContext( $Context );
-   $parser_options->setEditSection( false );
+   if ( !defined( 'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' ) 
) {
+   $parser_options->setEditSection( false );
+   }
$parser_options->setIsPreview( true );
 
foreach ( $metadata_items as $item ) {
@@ -296,7 +298,9 @@
);
 
// find this hacky, but not sure how to 
retrieve the raw text
-   $category = strip_tags( $category->getText() );
+   $category = strip_tags( $category->getText( [
+   'enableSectionEditLinks' => false,
+   ] ) );
 
// if the parser was not able to parse a 
template, {} will be left.
// only include the text if valid category.
@@ -337,7 +341,9 @@
wfMessage( 
'gwtoolset-preview-mediafile-placeholder-text' )->escaped()
) .
 
-   $parser_out->getText() .
+   $parser_out->getText( [
+   'enableSectionEditLinks' => false,
+   ] ) .
$Skin->getCategories() .
self::getNonParsableCategoriesAsHtml( 
$notParsable ) .
Html::closeElement( 'div' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cd7519186f2319f32cf6288655ddb873337a638
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...FeaturedFeeds[master]: Use ParserOutput stateless transforms when available

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms when available
..


Use ParserOutput stateless transforms when available

See MediaWiki core changes Ied5fe1a61 and I78b62ec3.

There's no need to feature-flag the extra parameter in calls to
ParserOutput::getText(), they'll just be ignored if this is merged
first.

Change-Id: I432da8c0686c279b3c2e770f7f9e20248589d6db
---
M FeaturedFeeds.body.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/FeaturedFeeds.body.php b/FeaturedFeeds.body.php
index f572aec..bb1d20f 100644
--- a/FeaturedFeeds.body.php
+++ b/FeaturedFeeds.body.php
@@ -310,7 +310,9 @@
private static function staticInit() {
if ( !self::$parserOptions ) {
self::$parserOptions = new ParserOptions();
-   self::$parserOptions->setEditSection( false );
+   if ( !defined( 
'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' ) ) {
+   self::$parserOptions->setEditSection( false );
+   }
self::$parser = new Parser();
}
}
@@ -427,7 +429,9 @@
if ( !$text ) {
return false;
}
-   $text = self::$parser->parse( $text, $title, 
self::$parserOptions )->getText();
+   $text = self::$parser->parse( $text, $title, 
self::$parserOptions )->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
$ts = new MWTimestamp( $date );
$url = SpecialPage::getTitleFor( 'FeedItem',
$this->name . '/' . $ts->getTimestamp( TS_MW ) . '/' . 
$this->languageCode

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I432da8c0686c279b3c2e770f7f9e20248589d6db
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FeaturedFeeds
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

See MediaWiki core change Ied5fe1a61. There's no need for a dependency
here, though, since it'll just ignore the extra parameter.

Change-Id: Iff28b00638c15de7307a130196bbb91cda91c3d1
---
M includes/DiscussionParser.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index f396bc0..7786175 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -1156,7 +1156,9 @@
 */
static function getTextSnippet( $text, Language $lang, $length = 150, 
$title = null ) {
// Parse wikitext
-   $html = MessageCache::singleton()->parse( $text, $title 
)->getText();
+   $html = MessageCache::singleton()->parse( $text, $title 
)->getText( [
+   'enableSectionEditLinks' => false
+   ] );
$plaintext = trim( Sanitizer::stripAllTags( $html ) );
return $lang->truncate( $plaintext, $length );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff28b00638c15de7307a130196bbb91cda91c3d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

See MediaWiki core change Ied5fe1a61. There's no need for a dependency
here, though, since it'll just ignore the extra parameter.

Change-Id: I0d05ce2f565778a4bf39d3d25d26acd0b8043788
---
M includes/ArticleMetadata.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/ArticleMetadata.php b/includes/ArticleMetadata.php
index b9558ea..3abae13 100644
--- a/includes/ArticleMetadata.php
+++ b/includes/ArticleMetadata.php
@@ -834,7 +834,9 @@
}
 
$text = trim( Sanitizer::stripAllTags(
-   MessageCache::singleton()->parse( $text )->getText()
+   MessageCache::singleton()->parse( $text )->getText( [
+   'enableSectionEditLinks' => false,
+   ] )
) );
// strip out non-useful data for snippet
$text = str_replace( [ '{', '}', '[edit]' ], '', $text );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d05ce2f565778a4bf39d3d25d26acd0b8043788
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikidataPageBanner[master]: Don't use ParserOutput::setTOCEnabled() to try to hide the toc

[jenkins-bot (Code Review)]

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

Change subject: Don't use ParserOutput::setTOCEnabled() to try to hide the toc
..


Don't use ParserOutput::setTOCEnabled() to try to hide the toc

It's being deprecated in MediaWiki core change Ied5fe1a61. Actually
remove the TOC from the HTML instead.

Change-Id: I9b082e37f19c8baa182b0583c7d70d692fafc16e
---
M includes/WikidataPageBanner.hooks.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/includes/WikidataPageBanner.hooks.php 
b/includes/WikidataPageBanner.hooks.php
index ebd0480..990ef32 100644
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -157,8 +157,12 @@
if ( strpos( $options['toc'], 'class="toc"' ) 
!== false ) {
$options['toc'] = str_replace( 
'class="toc"', '', $options['toc'] );
}
-   // disable default TOC
-   $pOut->setTOCEnabled( false );
+   // Remove default TOC
+   $pOut->setRawText( preg_replace(
+   '#' . preg_quote( Parser::TOC_START, 
'#' ) . '.*?' . preg_quote( Parser::TOC_END, '#' ) . '#s',
+   '',
+   $pOut->getRawText()
+   ) );
}
 
// set banner properties as an OutputPage property

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b082e37f19c8baa182b0583c7d70d692fafc16e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Change-Id: I28b46cf4da66cc6e1f04045939a243faa30bc9bf
Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
---
M includes/SpecialMassMessage.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/includes/SpecialMassMessage.php b/includes/SpecialMassMessage.php
index f8db4bd..1d39ba2 100644
--- a/includes/SpecialMassMessage.php
+++ b/includes/SpecialMassMessage.php
@@ -283,7 +283,6 @@
$content = ContentHandler::makeContent( $data['message'], 
$mockTarget );
// Parser stuff. Taken from EditPage::getPreviewText()
$parserOptions = $wikipage->makeParserOptions( 
$this->getContext() );
-   $parserOptions->setEditSection( false );
$parserOptions->setIsPreview( true );
$parserOptions->setIsSectionPreview( false );
$content = $content->addSectionHeader( $data['subject'] );
@@ -295,7 +294,7 @@
$parserOutput = $content->getParserOutput( $mockTarget, null, 
$parserOptions );
$previewFieldset = Xml::fieldset(
$this->msg( 'massmessage-fieldset-preview' )->text(),
-   $parserOutput->getText()
+   $parserOutput->getText( [ 'enableSectionEditLinks' => 
false ] )
);
$this->getOutput()->addHTML( $previewFieldset );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28b46cf4da66cc6e1f04045939a243faa30bc9bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Wctaiwan 
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...FlaggedRevs[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Change-Id: I404f064b93573e80b61a228e3cf2b5d2add65c39
Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
---
M frontend/FlaggablePageView.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index a602f64..44afbf9 100644
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -619,11 +619,10 @@
 
# Get the new stable parser output...
$pOpts = $this->article->makeParserOptions( $reqUser );
-   $pOpts->setEditSection( false ); // old revision
$parserOut = FlaggedRevs::parseStableRevision( $frev, $pOpts );
 
# Parse and output HTML
-   $this->out->addParserOutput( $parserOut );
+   $this->out->addParserOutput( $parserOut, [ 
'enableSectionEditLinks' => false ] );
 
return $parserOut;
}
@@ -695,8 +694,9 @@
 
# Get parsed stable version and output HTML
$pOpts = $this->article->makeParserOptions( $reqUser );
+   $poOpts = [];
if ( !$this->article->getTitle()->quickUserCan( 'edit', 
$reqUser ) ) {
-   $pOpts->setEditSection( false );
+   $poOpts['enableSectionEditLinks'] = false;
}
$parserCache = FRParserCacheStable::singleton();
$parserOut = $parserCache->get( $this->article, $pOpts );
@@ -705,7 +705,7 @@
# chance that a review form will be added to this page (which 
requires the versions).
if ( $parserOut ) {
# Cache hit. Note that redirects are not cached.
-   $this->out->addParserOutput( $parserOut );
+   $this->out->addParserOutput( $parserOut, $poOpts );
} else {
$parserOut = false;
# Get the new stable parser output...
@@ -732,7 +732,7 @@
# Update the stable version cache
$parserCache->save( $parserOut, $this->article, $pOpts 
);
# Add the stable output to the page view
-   $this->out->addParserOutput( $parserOut );
+   $this->out->addParserOutput( $parserOut, $poOpts );
# Update the stable version dependancies
if ( !wfReadOnly() ) {
FlaggedRevs::updateStableOnlyDeps(

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CiteThisPage[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
Change-Id: I30f162aa43c7f513df1153e0884a4339e4279aeb
---
M SpecialCiteThisPage.php
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/SpecialCiteThisPage.php b/SpecialCiteThisPage.php
index d7f5adb..9a17686 100644
--- a/SpecialCiteThisPage.php
+++ b/SpecialCiteThisPage.php
@@ -117,7 +117,9 @@
);
 
$this->getOutput()->addModuleStyles( 'ext.citeThisPage' );
-   $this->getOutput()->addParserOutputContent( $ret );
+   $this->getOutput()->addParserOutputContent( $ret, [
+   'enableSectionEditLinks' => false,
+   ] );
}
 
/**
@@ -161,7 +163,6 @@
private function getParserOptions() {
$parserOptions = ParserOptions::newFromUser( $this->getUser() );
$parserOptions->setDateFormat( 'default' );
-   $parserOptions->setEditSection( false );
 
// Having tidy on causes whitespace and  tags to
// be generated around the output of the CiteThisPageOutput
@@ -195,7 +196,9 @@
/* $linestart = */ false
);
 
-   return $ret->getText();
+   return $ret->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
}
 
protected function getDisplayFormat() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30f162aa43c7f513df1153e0884a4339e4279aeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CiteThisPage
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use ParserOutput stateless transforms when available

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms when available
..


Use ParserOutput stateless transforms when available

See MediaWiki core changes Ied5fe1a61 and I78b62ec3.

There's no need to feature-flag the extra parameter in calls to
ParserOutput::getText(), they'll just be ignored if this is merged
first.

This also changes the TOC-removing logic in MobileFrontendHooks to
actually remove the TOC from the HTML instead of relying on the stateful
ParserOutput::setTOCEnabled().

Change-Id: I3565868af824a08235ab5ce4a34145895ed0e74d
---
M includes/MobileFrontend.hooks.php
M includes/api/ApiMobileView.php
M tests/phpunit/api/ApiMobileViewTest.php
3 files changed, 12 insertions(+), 5 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 7ece0ce..c0899cb 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1073,7 +1073,12 @@
$context = MobileContext::singleton();
 
if ( $context->shouldDisplayMobileView() ) {
-   $po->setTOCEnabled( false );
+   // Remove TOC from the ParserOutput HTML
+   $po->setText( preg_replace(
+   '#' . preg_quote( Parser::TOC_START, '#' ) . 
'.*?' . preg_quote( Parser::TOC_END, '#' ) . '#s',
+   '',
+   $po->getRawText()
+   ) );
$outputPage->setProperty( 'MFTOC', $po->getTOCHTML() 
!== '' );
 
if ( $context->shouldShowWikibaseDescriptions( 
'tagline' ) ) {
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index dd0591d..9a6ed9d 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -452,7 +452,7 @@
 */
protected function getParserOutput( WikiPage $wp, ParserOptions 
$parserOptions, $oldid = null ) {
$parserOutput = $wp->getParserOutput( $parserOptions, $oldid );
-   if ( $parserOutput ) {
+   if ( $parserOutput && !defined( 
'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' ) ) {
$parserOutput->setTOCEnabled( false );
}
 
@@ -615,7 +615,7 @@
$this->dieWithError( 
'apierror-mobilefrontend-badidtitle', 'invalidparams' );
return;
}
-   $html = $parserOutput->getText();
+   $html = $parserOutput->getText( [ 'allowTOC' => false ] 
);
$cacheExpiry = $parserOutput->getCacheExpiry();
}
 
diff --git a/tests/phpunit/api/ApiMobileViewTest.php 
b/tests/phpunit/api/ApiMobileViewTest.php
index 91cb2fd..68187d1 100644
--- a/tests/phpunit/api/ApiMobileViewTest.php
+++ b/tests/phpunit/api/ApiMobileViewTest.php
@@ -22,8 +22,10 @@
}
$parser = new Parser();
$po = $parser->parse( $params['text'], $wp->getTitle(), 
$parserOptions );
-   $po->setTOCEnabled( false );
-   $po->setText( str_replace( [ "\r", "\n" ], '', $po->getText() ) 
);
+   if ( !defined( 'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' ) 
) {
+   $po->setTOCEnabled( false );
+   }
+   $po->setText( str_replace( [ "\r", "\n" ], '', $po->getText( [ 
'allowTOC' => false ] ) ) );
 
return $po;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3565868af824a08235ab5ce4a34145895ed0e74d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
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...TwoColConflict[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
Change-Id: I39b599246759baad2164a29244150c99f0920684
---
M includes/SpecialConflictTestPage/HtmlPreview.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/includes/SpecialConflictTestPage/HtmlPreview.php 
b/includes/SpecialConflictTestPage/HtmlPreview.php
index 833b95a..bd6bc94 100644
--- a/includes/SpecialConflictTestPage/HtmlPreview.php
+++ b/includes/SpecialConflictTestPage/HtmlPreview.php
@@ -51,12 +51,13 @@
 
Wikimedia\ScopedCallback::consume( $scopedCallback );
 
-   return $parseResult->getText();
+   return $parseResult->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
}
 
private function getParserOptions() {
$parserOptions = new ParserOptions();
-   $parserOptions->setEditSection( false );
$parserOptions->setIsPreview( true );
return $parserOptions;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39b599246759baad2164a29244150c99f0920684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Change-Id: Ia54a9e3d11c9ab28975947148d0841819f3a8e3c
Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
---
M includes/Conversion/Utils.php
M includes/Notifications/Controller.php
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/includes/Conversion/Utils.php b/includes/Conversion/Utils.php
index 27f3d2e..528065e 100644
--- a/includes/Conversion/Utils.php
+++ b/includes/Conversion/Utils.php
@@ -213,10 +213,9 @@
 
$options = new \ParserOptions;
$options->setTidy( true );
-   $options->setEditSection( false );
 
$output = $wgParser->parse( $content, $title, $options );
-   return $output->getText();
+   return $output->getText( [ 'enableSectionEditLinks' => false ] 
);
}
 
/**
diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index a78f9aa..c65dac9 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -640,7 +640,6 @@
 
$options = new \ParserOptions;
$options->setTidy( true );
-   $options->setEditSection( false );
 
$output = $wgParser->parse( $wikitext, $title, $options );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia54a9e3d11c9ab28975947148d0841819f3a8e3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use ParserOutput stateless transforms

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

We still set the state in many cases for benefit of extensions, but all
calls within core should no longer be using non-default state.

Change-Id: I78b62ec33fcb8273acb9b3b4e9012215442be94c
Depends-On: I140ff32373430b61b92226689ef9b58cca317450
---
M includes/EditPage.php
M includes/Message.php
M includes/OutputPage.php
M includes/Status.php
M includes/api/ApiParse.php
M includes/content/WikiTextStructure.php
M includes/diff/DifferenceEngine.php
M includes/installer/Installer.php
M includes/page/Article.php
M includes/parser/ParserOutput.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialUndelete.php
M tests/parser/ParserTestRunner.php
13 files changed, 80 insertions(+), 30 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index ff224c5..bcaab3a 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4012,7 +4012,10 @@
$parserOutput->setEditSectionTokens( false ); // no section 
edit links
return [
'parserOutput' => $parserOutput,
-   'html' => $parserOutput->getText() ];
+   'html' => $parserOutput->getText( [
+   'enableSectionEditLinks' => false
+   ] )
+   ];
}
 
/**
diff --git a/includes/Message.php b/includes/Message.php
index 3b2f3cc..16ae839 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1244,7 +1244,9 @@
$this->getLanguage()
);
 
-   return $out instanceof ParserOutput ? $out->getText() : $out;
+   return $out instanceof ParserOutput
+   ? $out->getText( [ 'enableSectionEditLinks' => false ] )
+   : $out;
}
 
/**
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a5f9c18..92963fd 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1783,7 +1783,9 @@
 
$popts->setTidy( $oldTidy );
 
-   $this->addParserOutput( $parserOutput );
+   $this->addParserOutput( $parserOutput, [
+   'enableSectionEditLinks' => false,
+   ] );
}
 
/**
@@ -1868,9 +1870,10 @@
 *
 * @since 1.24
 * @param ParserOutput $parserOutput
+* @param array $poOptions Options to ParserOutput::getText()
 */
-   public function addParserOutputContent( $parserOutput ) {
-   $this->addParserOutputText( $parserOutput );
+   public function addParserOutputContent( $parserOutput, $poOptions = [] 
) {
+   $this->addParserOutputText( $parserOutput, $poOptions );
 
$this->addModules( $parserOutput->getModules() );
$this->addModuleScripts( $parserOutput->getModuleScripts() );
@@ -1884,9 +1887,10 @@
 *
 * @since 1.24
 * @param ParserOutput $parserOutput
+* @param array $poOptions Options to ParserOutput::getText()
 */
-   public function addParserOutputText( $parserOutput ) {
-   $text = $parserOutput->getText();
+   public function addParserOutputText( $parserOutput, $poOptions = [] ) {
+   $text = $parserOutput->getText( $poOptions );
// Avoid PHP 7.1 warning of passing $this by reference
$outputPage = $this;
Hooks::runWithoutAbort( 'OutputPageBeforeHTML', [ &$outputPage, 
&$text ] );
@@ -1897,16 +1901,22 @@
 * Add everything from a ParserOutput object.
 *
 * @param ParserOutput $parserOutput
+* @param array $poOptions Options to ParserOutput::getText()
 */
-   function addParserOutput( $parserOutput ) {
+   function addParserOutput( $parserOutput, $poOptions = [] ) {
$this->addParserOutputMetadata( $parserOutput );
 
// Touch section edit links only if not previously disabled
if ( $parserOutput->getEditSectionTokens() ) {
$parserOutput->setEditSectionTokens( 
$this->mEnableSectionEditLinks );
}
+   if ( !$this->mEnableSectionEditLinks
+   && !array_key_exists( 'enableSectionEditLinks', 
$poOptions )
+   ) {
+   $poOptions['enableSectionEditLinks'] = false;
+   }
 
-   $this->addParserOutputText( $parserOutput );
+   $this->addParserOutputText( $parserOutput, $poOptions );
}
 
/**
@@ -1957,7 +1967,9 @@
  

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use ParserOutputPostCacheTransform hook to avoid splitting c...

[jenkins-bot (Code Review)]

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

Change subject: Use ParserOutputPostCacheTransform hook to avoid splitting 
cache on 'editsection'
..


Use ParserOutputPostCacheTransform hook to avoid splitting cache on 
'editsection'

Core change Ied5fe1a6 introduces this hook, as well as the concept of
stateless post-cache transformations that would break the former logic
here.

Bug: T168543
Change-Id: I140ff32373430b61b92226689ef9b58cca317450
Depends-On: Ied5fe1a6159c2d4fa48170042b44d735ce7b6f9b
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
M repo/includes/Content/EntityContent.php
M repo/includes/Diff/EntityContentDiffView.php
M repo/tests/phpunit/includes/Content/EntityContentTest.php
M view/src/ToolbarEditSectionGenerator.php
M view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
7 files changed, 25 insertions(+), 13 deletions(-)

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



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index dbe5cab..8fb1aad 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -1004,6 +1004,23 @@
}
 
/**
+* Post-cache transformation for Wikibase section-edit markers
+*
+* @param ParserOutput $out
+* @param string &$text Text being transformed
+* @param array &$options Transformation options
+*/
+   public static function onParserOutputPostCacheTransform(
+   ParserOutput $out, &$text, array &$options
+   ) {
+   if ( $options['enableSectionEditLinks'] ) {
+   $text = str_replace( [ '', 
'' ], '', $text );
+   } else {
+   $text = preg_replace( 
'#.*?#s', '', $text );
+   }
+   }
+
+   /**
 * Add Wikibase-specific ElasticSearch analyzer configurations.
 * @param array &$config
 * @param AnalysisConfigBuilder $builder
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a4969d5..d87bb096 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -1010,6 +1010,7 @@
$wgHooks['ResourceLoaderRegisterModules'][] = 
'Wikibase\RepoHooks::onResourceLoaderRegisterModules';
$wgHooks['BeforeDisplayNoArticleText'][] = 
'Wikibase\ViewEntityAction::onBeforeDisplayNoArticleText';
$wgHooks['InfoAction'][] = '\Wikibase\RepoHooks::onInfoAction';
+   $wgHooks['ParserOutputPostCacheTransform'][] = 
'\Wikibase\RepoHooks::onParserOutputPostCacheTransform';
$wgHooks['BeforePageDisplayMobile'][] = 
'\Wikibase\RepoHooks::onBeforePageDisplayMobile';
$wgHooks['CirrusSearchAnalysisConfig'][] = 
'\Wikibase\RepoHooks::onCirrusSearchAnalysisConfig';
$wgHooks['CirrusSearchScoreBuilder'][] = 
'\Wikibase\RepoHooks::onCirrusSearchScoreBuilder';
diff --git a/repo/includes/Content/EntityContent.php 
b/repo/includes/Content/EntityContent.php
index 230a062..da186ac 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -258,19 +258,12 @@
 
$outputGenerator = 
$entityParserOutputGeneratorFactory->getEntityParserOutputGenerator(
$options->getUserLang(),
-   $options->getEditSection()
+   true
);
 
$entityRevision = $this->getEntityRevision( $revisionId );
 
$output = $outputGenerator->getParserOutput( 
$entityRevision->getEntity(), $generateHtml );
-
-   // Force parser cache split by whether edit links are show.
-   // MediaWiki core has the ability to split on editsection, but 
does not trigger it
-   // automatically when $parserOptions->getEditSection() is 
called. Presumably this
-   // is because core uses  tags that are 
substituted by ParserOutput::getText
-   // using the info from ParserOutput::getEditSectionTokens.
-   $output->recordOption( 'editsection' );
 
// Since the output depends on the user language, we must make 
sure
// ParserCache::getKey() includes it in the cache key.
diff --git a/repo/includes/Diff/EntityContentDiffView.php 
b/repo/includes/Diff/EntityContentDiffView.php
index 2e5a774..d7852ac 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -149,7 +149,6 @@
protected function getParserOutput( WikiPage $page, Revision $rev ) {
$parserOptions = $page->makeParserOptions( $this->getContext() 
);
 
-   $parserOptions->setEditSection( false );
// Do not poison parser cache with diff-specific stuff
$parserOptions->addExtraKey( 'diff=1' );
 
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ParserOutput: Add stateless transforms to getText()

[jenkins-bot (Code Review)]

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

Change subject: ParserOutput: Add stateless transforms to getText()
..


ParserOutput: Add stateless transforms to getText()

The stateful transforms are deprecated.

Inspired by Krinkle's If2fb32fc.

Bug: T171797
Change-Id: Ied5fe1a6159c2d4fa48170042b44d735ce7b6f9b
---
M RELEASE-NOTES-1.31
M docs/hooks.txt
M includes/parser/ParserOptions.php
M includes/parser/ParserOutput.php
M tests/phpunit/includes/parser/ParserOutputTest.php
5 files changed, 298 insertions(+), 4 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index b32e3e7..139773b 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -31,6 +31,8 @@
   [[iw:User:Example|iw>Example]].
 * (T111605) The 'ImportHandleUnknownUser' hook allows extensions to auto-create
   users during an import.
+* Added a hook, ParserOutputPostCacheTransform, to allow extensions to affect
+  the ParserOutput::getText() post-cache transformations.
 
 === External library changes in 1.31 ===
 
@@ -119,6 +121,18 @@
 * The Block class will no longer accept usable-but-missing usernames for
   'byText' or ->setBlocker(). Callers should either ensure the blocker exists
   locally or use a new interwiki-format username like "iw>Example".
+* The following methods that get and set ParserOutput state are deprecated.
+  Callers should use the new stateless $options parameter to
+  ParserOutput::getText() instead.
+  * ParserOptions::getEditSection()
+  * ParserOptions::setEditSection()
+  * ParserOutput::getEditSectionTokens()
+  * ParserOutput::setEditSectionTokens()
+  * ParserOutput::getTOCEnabled()
+  * ParserOutput::setTOCEnabled()
+  * OutputPage::enableSectionEditLinks()
+  * OutputPage::sectionEditLinksEnabled()
+  * The public ParserOutput state fields $mTOCEnabled and $mEditSectionTokens 
are also deprecated.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 685a182..29883b2 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2594,6 +2594,12 @@
   callable here. The callable is passed the ParserOptions object and the option
   name.
 
+'ParserOutputPostCacheTransform': Called from ParserOutput::getText() to do
+post-cache transforms.
+$parserOutput: The ParserOutput object.
+&$text: The text being transformed, before core transformations are done.
+&$options: The options array being used for the transformation.
+
 'ParserSectionCreate': Called each time the parser creates a document section
 from wikitext. Use this to apply per-section modifications to HTML (like
 wrapping the section in a DIV).  Caveat: DIVs are valid wikitext, and a DIV
diff --git a/includes/parser/ParserOptions.php 
b/includes/parser/ParserOptions.php
index 5e2845f..f99089b 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -869,6 +869,7 @@
 
/**
 * Create "edit section" links?
+* @deprecated since 1.31, use ParserOutput::getText() options instead.
 * @return bool
 */
public function getEditSection() {
@@ -877,6 +878,7 @@
 
/**
 * Create "edit section" links?
+* @deprecated since 1.31, use ParserOutput::getText() options instead.
 * @param bool|null $x New value (null is no change)
 * @return bool Old value
 */
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 3480a51..59c27e5 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -144,6 +144,7 @@
public $mSections = [];
 
/**
+* @deprecated since 1.31 Use getText() options.
 * @var bool $mEditSectionTokens prefix/suffix markers if edit sections 
were output as tokens.
 */
public $mEditSectionTokens = false;
@@ -164,6 +165,7 @@
public $mTimestamp;
 
/**
+* @deprecated since 1.31 Use getText() options.
 * @var bool $mTOCEnabled Whether TOC should be shown, can't override 
__NOTOC__.
 */
public $mTOCEnabled = true;
@@ -250,9 +252,38 @@
return $this->mText;
}
 
-   public function getText() {
+   /**
+* Get the output HTML
+*
+* @param array $options (since 1.31) Transformations to apply to the 
HTML
+*  - allowTOC: (bool) Show the TOC, assuming there were enough headings
+* to generate one and `__NOTOC__` wasn't used. Default is true,
+* but might be statefully overridden.
+*  - enableSectionEditLinks: (bool) Include section edit links, 
assuming
+*section edit link tokens are present in the HTML. Default is true,
+* but might be statefully overridden.
+* @return string 

[MediaWiki-commits] [Gerrit] mediawiki...GWToolset[master]: Append \ to fix many object namespace issues

[jenkins-bot (Code Review)]

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

Change subject: Append \ to fix many object namespace issues
..


Append \ to fix many object namespace issues

Some more ok -> isOK()

Bug: T180882
Change-Id: I749e86288d071b9909b3966d371c1190f4461e75
---
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Forms/MetadataDetectForm.php
M includes/Forms/MetadataMappingForm.php
M includes/Handlers/Forms/FormHandler.php
M includes/Handlers/Forms/MetadataDetectHandler.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Handlers/UploadHandler.php
M includes/Handlers/Xml/XmlDetectHandler.php
M includes/Handlers/Xml/XmlHandler.php
M includes/Handlers/Xml/XmlMappingHandler.php
M includes/Helpers/FileChecks.php
M includes/Helpers/GWTFileBackend.php
M includes/Hooks/Hooks.php
M includes/Jobs/GWTFileBackendCleanupJob.php
M includes/Models/Mapping.php
M includes/Specials/SpecialGWToolset.php
16 files changed, 44 insertions(+), 45 deletions(-)

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



diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php 
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index 2fea594..e56ff6e 100644
--- a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
+++ b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
@@ -101,7 +101,7 @@
 * format -- {"parameter name":""}
 *
 * @param Title $Title
-* @throws MWException
+* @throws \MWException
 * @return null|string
 * null or a JSON representation of the MediaWiki template parameters
 */
diff --git a/includes/Forms/MetadataDetectForm.php 
b/includes/Forms/MetadataDetectForm.php
index 100e1d8..0796fdc 100644
--- a/includes/Forms/MetadataDetectForm.php
+++ b/includes/Forms/MetadataDetectForm.php
@@ -66,8 +66,7 @@
 *
 * @param SpecialPage $SpecialPage
 *
-* @return string
-* an html form
+* @return string an html form
 */
public static function getForm( SpecialPage $SpecialPage ) {
$namespace = Utils::getNamespaceName( 
Config::$metadata_namespace );
diff --git a/includes/Forms/MetadataMappingForm.php 
b/includes/Forms/MetadataMappingForm.php
index 45f8a8e..410aa89 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -20,7 +20,7 @@
/**
 * returns an html form for step 2 : Metadata Mapping
 *
-* @param GWToolset\Handlers\Forms\FormHandler $Handler
+* @param \GWToolset\Handlers\Forms\FormHandler $Handler
 *
 * @param array &$user_options
 * an array of user options that was submitted in the html form
diff --git a/includes/Handlers/Forms/FormHandler.php 
b/includes/Handlers/Forms/FormHandler.php
index b646ea8..1e59e02 100644
--- a/includes/Handlers/Forms/FormHandler.php
+++ b/includes/Handlers/Forms/FormHandler.php
@@ -165,7 +165,7 @@
public function execute() {
$result = WikiChecks::doesEditTokenMatch( $this->SpecialPage );
 
-   if ( !$result->ok ) {
+   if ( !$result->isOK() ) {
$result =
Html::rawElement(
'h2',
diff --git a/includes/Handlers/Forms/MetadataDetectHandler.php 
b/includes/Handlers/Forms/MetadataDetectHandler.php
index 0c02f67..81696a3 100644
--- a/includes/Handlers/Forms/MetadataDetectHandler.php
+++ b/includes/Handlers/Forms/MetadataDetectHandler.php
@@ -41,22 +41,22 @@
];
 
/**
-* @var GWToolset\Helpers\GWTFileBackend
+* @var \GWToolset\Helpers\GWTFileBackend
 */
protected $_GWTFileBackend;
 
/**
-* @var GWToolset\Models\Mapping
+* @var \GWToolset\Models\Mapping
 */
protected $_Mapping;
 
/**
-* @var GWToolset\Models\MediawikiTemplate
+* @var \GWToolset\Models\MediawikiTemplate
 */
protected $_MediawikiTemplate;
 
/**
-* @var GWToolset\Handlers\UploadHandler
+* @var \GWToolset\Handlers\UploadHandler
 */
protected $_UploadHandler;
 
@@ -66,7 +66,7 @@
protected $_whitelisted_post;
 
/**
-* @var GWToolset\Handlers\Xml\XmlDetectHandler
+* @var \GWToolset\Handlers\Xml\XmlDetectHandler
 */
public $XmlDetectHandler;
 
diff --git a/includes/Handlers/Forms/MetadataMappingHandler.php 
b/includes/Handlers/Forms/MetadataMappingHandler.php
index 9ff2f12..41eb492 100644
--- a/includes/Handlers/Forms/MetadataMappingHandler.php
+++ b/includes/Handlers/Forms/MetadataMappingHandler.php
@@ -68,22 +68,22 @@
];
 
/**
-* @var GWToolset\Models\Mapping
+* @var \GWToolset\Models\Mapping
 */
protected $_Mapping;
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: swift: remove ganglia

[Dzahn (Code Review)]

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

Change subject: swift: remove ganglia
..


swift: remove ganglia

Purging ganglia package, config, service
from all Swift hosts.

Grafana replacement dashboard at
https://grafana.wikimedia.org/dashboard/file/swift.json?orgId=1

Bug: T177225
Change-Id: I9e8d5620c5eb5f391030980f0cf3cd383fc5b7ae
---
M hieradata/role/common/swift/proxy.yaml
M hieradata/role/common/swift/storage.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/swift/proxy.yaml 
b/hieradata/role/common/swift/proxy.yaml
index 8cbde62..91f0c0a 100644
--- a/hieradata/role/common/swift/proxy.yaml
+++ b/hieradata/role/common/swift/proxy.yaml
@@ -2,3 +2,4 @@
 # (swift proxy-server will do the checking)
 tlsproxy::nginx_client_max_body_size: 0
 tlsproxy::localssl::proxy_request_buffering: 'off'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/swift/storage.yaml 
b/hieradata/role/common/swift/storage.yaml
index 21bef47..7401c9a 100644
--- a/hieradata/role/common/swift/storage.yaml
+++ b/hieradata/role/common/swift/storage.yaml
@@ -1,2 +1,3 @@
 cluster: swift
+standard::has_ganglia: false
 nagios_group: swift

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e8d5620c5eb5f391030980f0cf3cd383fc5b7ae
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
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]: Change to use assertRaisesRegex in link_tests.py

[Rafidaslam (Code Review)]

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

Change subject: Change to use assertRaisesRegex in link_tests.py
..

Change to use assertRaisesRegex in link_tests.py

assertRaises is not as good of a test as asserRaisesRegex. The latter
has an extra parameter to match the exception message, allowing more
more precision when checking an error.

Bug: T154281
Change-Id: Ie2dd6a0e5828be51fd500a2f0a14f552a9ed917e
---
M tests/link_tests.py
1 file changed, 149 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/20/394520/1

diff --git a/tests/link_tests.py b/tests/link_tests.py
index 8bacdc1..0cee603 100644
--- a/tests/link_tests.py
+++ b/tests/link_tests.py
@@ -7,6 +7,8 @@
 #
 from __future__ import absolute_import, unicode_literals
 
+import re
+
 import pywikibot
 
 from pywikibot import config2 as config
@@ -103,43 +105,155 @@
 
 def test_invalid(self):
 """Test that invalid titles raise InvalidTitle exception."""
-self.assertRaises(InvalidTitle, Link('', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link(':', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('__  __', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('  __  ', self.get_site()).parse)
+exception_message_regex = re.escape(
+'The link does not contain a page title')
+
+with self.assertRaisesRegex(
+InvalidTitle,
+exception_message_regex):
+Link('', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+exception_message_regex):
+Link(':', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+exception_message_regex):
+Link('__  __', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+exception_message_regex):
+Link('  __  ', self.get_site()).parse()
 # Bad characters forbidden regardless of wgLegalTitleChars
-self.assertRaises(InvalidTitle, Link('A [ B', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('A ] B', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('A { B', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('A } B', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('A < B', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('A > B', self.get_site()).parse)
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A \[ B\' contains illegal char\(s\) (u|)\'\[\''):
+Link('A [ B', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A \] B\' contains illegal char\(s\) (u|)\'\]\''):
+Link('A ] B', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A \{ B\' contains illegal char\(s\) (u|)\'\{\''):
+Link('A { B', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A \} B\' contains illegal char\(s\) (u|)\'\}\''):
+Link('A } B', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A \< B\' contains illegal char\(s\) (u|)\'\<\''):
+Link('A < B', self.get_site()).parse()
+
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A \> B\' contains illegal char\(s\) (u|)\'\>\''):
+Link('A > B', self.get_site()).parse()
+
 # URL encoding
 # %XX is understood by wikimedia but not %
-self.assertRaises(InvalidTitle, Link('A%2523B', self.get_site()).parse)
+with self.assertRaisesRegex(
+InvalidTitle,
+r'(u|)\'A%23B\' contains illegal char\(s\) (u|)\'%23\''):
+Link('A%2523B', self.get_site()).parse()
 # A link is invalid if their (non-)talk page would be in another
 # namespace than the link's "other" namespace
-self.assertRaises(InvalidTitle, Link('Talk:File:Example.svg', 
self.get_site()).parse)
+with self.assertRaisesRegex(
+InvalidTitle,
+(r'The \(non-\)talk page of (u|)\'Talk:File:Example.svg\''
+ r' is a valid title in another namespace.')):
+Link('Talk:File:Example.svg', self.get_site()).parse()
 # Directory navigation
-self.assertRaises(InvalidTitle, Link('.', self.get_site()).parse)
-self.assertRaises(InvalidTitle, Link('..', self.get_site()).parse)
-self.assertRaises(InvalidTitle, 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mysql: remove ganglia

[Dzahn (Code Review)]

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

Change subject: mysql: remove ganglia
..

mysql: remove ganglia

Bug: T177225
Change-Id: I89bef5743ceb5d32e82aa92e020f9311f48053c9
---
M hieradata/regex.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 35be176..6f4dd05 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -99,10 +99,12 @@
 mysql_eqiad:
   __regex: !ruby/regexp 
/^(db1[01][0-9][0-9]|dbstore100[1-2]|dbproxy10[01][0-9]|es101[1-9]|pc100[4-6]|labsdb10[01][0-9])\.eqiad\.wmnet$/
   cluster: mysql
+  standard::has_ganglia: false
 
 mysql_codfw:
   __regex: !ruby/regexp 
/^(db2[01][0-9][0-9]|dbstore200[1-2]|es200[1-4]|pc200[4-6]|es201[1-9])\.codfw\.wmnet$/
   cluster: mysql
+  standard::has_ganglia: false
 
 labvirt:
   __regex: !ruby/regexp /^labvirt10[0-9][0-9]\.eqiad\.wmnet$/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89bef5743ceb5d32e82aa92e020f9311f48053c9
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]: swift: remove ganglia

[Dzahn (Code Review)]

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

Change subject: swift: remove ganglia
..

swift: remove ganglia

Bug: T177225
Change-Id: I9e8d5620c5eb5f391030980f0cf3cd383fc5b7ae
---
M hieradata/role/common/swift/proxy.yaml
M hieradata/role/common/swift/storage.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/role/common/swift/proxy.yaml 
b/hieradata/role/common/swift/proxy.yaml
index 8cbde62..91f0c0a 100644
--- a/hieradata/role/common/swift/proxy.yaml
+++ b/hieradata/role/common/swift/proxy.yaml
@@ -2,3 +2,4 @@
 # (swift proxy-server will do the checking)
 tlsproxy::nginx_client_max_body_size: 0
 tlsproxy::localssl::proxy_request_buffering: 'off'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/swift/storage.yaml 
b/hieradata/role/common/swift/storage.yaml
index 21bef47..7401c9a 100644
--- a/hieradata/role/common/swift/storage.yaml
+++ b/hieradata/role/common/swift/storage.yaml
@@ -1,2 +1,3 @@
 cluster: swift
+standard::has_ganglia: false
 nagios_group: swift

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Set required MW to 1.25.0 in extension.json

[Reedy (Code Review)]

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

Change subject: Set required MW to 1.25.0 in extension.json
..

Set required MW to 1.25.0 in extension.json

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/16/394516/1

diff --git a/extension.json b/extension.json
index 3f259bb..3456b07 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,7 @@
"type": "parserhook",
"license-name": "GPL-2.0+",
"requires": {
-   "MediaWiki": ">= 1.23.0"
+   "MediaWiki": ">= 1.25.0"
},
"MessagesDirs": {
"CodeMirror": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e76cfca9a476be7dd766d14231d0a2ee67cb942
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Remove php entry point

[Reedy (Code Review)]

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

Change subject: Remove php entry point
..

Remove php entry point

Change-Id: I22859bcd54f41cb17f4470d12321ad7991958b70
---
D CodeMirror.php
1 file changed, 0 insertions(+), 13 deletions(-)


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

diff --git a/CodeMirror.php b/CodeMirror.php
deleted file mode 100644
index 568907d..000
--- a/CodeMirror.php
+++ /dev/null
@@ -1,13 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   ); */
-   return true;
-} else {
-   die( 'This version of the CodeMirror extension requires MediaWiki 
1.25+' );
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22859bcd54f41cb17f4470d12321ad7991958b70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...JSBreadCrumbs[master]: Fix plural in i18n messages

[Cicalese (Code Review)]

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

Change subject: Fix plural in i18n messages
..

Fix plural in i18n messages

Change-Id: I911cd2b8bed9d676e65833106465abdd0505cdbf
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JSBreadCrumbs 
refs/changes/15/394515/3

diff --git a/i18n/en.json b/i18n/en.json
index a0f70c8..d87b3ea 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,8 +8,8 @@
},
"jsbreadcrumbs-desc": "Adds a trail of bread crumbs below the tab bar",
"jsbreadcrumbs-horizontal-separator": "»",
-   "jsbreadcrumbs-intro-horizontal": "Last $1 Pages Viewed: ",
-   "jsbreadcrumbs-intro-vertical": "Last $1 Pages Viewed",
+   "jsbreadcrumbs-intro-horizontal": "Last {{PLURAL:$1|Page|$1 Pages}} 
Viewed: ",
+   "jsbreadcrumbs-intro-vertical": "Last {{PLURAL:$1|Page|$1 Pages}} 
Viewed",
"prefs-jsbreadcrumbs": "Bread Crumbs",
"prefs-jsbreadcrumbs-showaction": "Show action bread crumbs",
"prefs-jsbreadcrumbs-showcrumbs": "Display bread crumbs",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 795eafe..e8066cf 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,8 +11,8 @@
},
"jsbreadcrumbs-desc": "{{desc|name=JS Bread 
Crumbs|url=https://www.mediawiki.org/wiki/Extension:JSBreadCrumbs}};,
"jsbreadcrumbs-horizontal-separator": "{{optional}}",
-   "jsbreadcrumbs-intro-horizontal": "Used as bread crumb description when 
the bread crumbs are horizontal.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by \":\" and bread crumbs 
(\"»\"-separated links).",
-   "jsbreadcrumbs-intro-vertical": "Used as bread crumb description when 
the bread crumbs are vertical.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by \":\" and bread crumbs 
(\"»\"-separated links).",
+   "jsbreadcrumbs-intro-horizontal": "Used as bread crumb description when 
the bread crumbs are horizontal.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by bread crumbs separated by 
jsbreadcrumbs-horizontal-separator).",
+   "jsbreadcrumbs-intro-vertical": "Used as bread crumb description when 
the bread crumbs are vertical.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by bread crumbs on separate lines).",
"prefs-jsbreadcrumbs": "This is the name of the extension JS Bread 
Crumbs (https://www.mediawiki.org/wiki/Extension:JSBreadCrumbs). The expression 
\"Bread Crumbs\" designates a kind of navigation bar (see 
https://en.wiktionary.org/wiki/breadcrumbs).",
"prefs-jsbreadcrumbs-showaction": "Used as checkbox label in 
[[Special:Preferences]].",
"prefs-jsbreadcrumbs-showcrumbs": "Used as checkbox label in 
[[Special:Preferences]].",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I911cd2b8bed9d676e65833106465abdd0505cdbf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/JSBreadCrumbs
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Raimond Spekking 
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]: jobqueue_redis, restbase: remove ganglia

[Dzahn (Code Review)]

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

Change subject: jobqueue_redis,restbase: remove ganglia
..


jobqueue_redis,restbase: remove ganglia

Bug: T177225
Change-Id: If3a26fc80743c681967b502ab04761cee792793b
---
M hieradata/role/common/jobqueue_redis/master.yaml
M hieradata/role/common/jobqueue_redis/slave.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M hieradata/role/common/restbase/test_cluster.yaml
5 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/jobqueue_redis/master.yaml 
b/hieradata/role/common/jobqueue_redis/master.yaml
index f4d845f..e35ac70 100644
--- a/hieradata/role/common/jobqueue_redis/master.yaml
+++ b/hieradata/role/common/jobqueue_redis/master.yaml
@@ -1,4 +1,5 @@
 cluster: redis
+standard::has_ganglia: false
 profile::redis::multidc::category: jobqueue
 profile::redis::multidc::discovery: "appservers-rw"
 profile::redis::multidc::settings:
diff --git a/hieradata/role/common/jobqueue_redis/slave.yaml 
b/hieradata/role/common/jobqueue_redis/slave.yaml
index 8c31ccd..d29c023 100644
--- a/hieradata/role/common/jobqueue_redis/slave.yaml
+++ b/hieradata/role/common/jobqueue_redis/slave.yaml
@@ -1,4 +1,5 @@
 cluster: redis
+standard::has_ganglia: false
 profile::redis::slave::settings:
   bind: '0.0.0.0'
   appendonly: true
diff --git a/hieradata/role/common/restbase/production.yaml 
b/hieradata/role/common/restbase/production.yaml
index 709966c..644f9bf 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -2,6 +2,7 @@
 # RESTBase
 #
 cluster: restbase
+standard::has_ganglia: false
 profile::restbase::cassandra_local_dc: "%{::site}"
 profile::restbase::logging_label: restbase
 profile::restbase::cassandra_datacenters:
diff --git a/hieradata/role/common/restbase/production_ng.yaml 
b/hieradata/role/common/restbase/production_ng.yaml
index 0cd5317..1ce05ff 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -1,5 +1,5 @@
 cluster: restbase
-
+standard::has_ganglia: false
 #
 # Cassandra
 #
diff --git a/hieradata/role/common/restbase/test_cluster.yaml 
b/hieradata/role/common/restbase/test_cluster.yaml
index cb525f8..47a2779 100644
--- a/hieradata/role/common/restbase/test_cluster.yaml
+++ b/hieradata/role/common/restbase/test_cluster.yaml
@@ -1,4 +1,5 @@
 cluster: restbase_test
+standard::has_ganglia: false
 profile::restbase::cassandra_local_dc: "%{::site}"
 profile::restbase::logging_label: restbase-test
 profile::restbase::cassandra_datacenters:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update psy/psyssh from 0.8.11 to 0.8.15

[Reedy (Code Review)]

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

Change subject: Update psy/psyssh from 0.8.11 to 0.8.15
..

Update psy/psyssh from 0.8.11 to 0.8.15

https://github.com/bobthecow/psysh/releases/tag/v0.8.12
https://github.com/bobthecow/psysh/releases/tag/v0.8.13
https://github.com/bobthecow/psysh/releases/tag/v0.8.14
https://github.com/bobthecow/psysh/releases/tag/v0.8.15

https://github.com/bobthecow/psysh/compare/v0.8.11...v0.8.15

Change-Id: If03398bbc565c03987ef843534ab1ee3a4779ca1
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M psy/psysh/.gitignore
M psy/psysh/.styleci.yml
M psy/psysh/.travis.yml
M psy/psysh/composer.json
M psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php
M psy/psysh/src/Psy/Command/DocCommand.php
A psy/psysh/src/Psy/Command/EditCommand.php
M psy/psysh/src/Psy/Command/ListCommand.php
M psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php
M psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php
M psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php
M psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php
M psy/psysh/src/Psy/Command/WhereamiCommand.php
M psy/psysh/src/Psy/ConfigPaths.php
M psy/psysh/src/Psy/Configuration.php
M psy/psysh/src/Psy/Exception/ErrorException.php
M psy/psysh/src/Psy/Input/ShellInput.php
M psy/psysh/src/Psy/Shell.php
A psy/psysh/src/Psy/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php
M psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php
A 
psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php
M psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php
A psy/psysh/src/Psy/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php
M psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php
A 
psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php
M psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php
M psy/psysh/src/Psy/VarDumper/Dumper.php
M psy/psysh/src/Psy/VarDumper/Presenter.php
M psy/psysh/src/Psy/VersionUpdater/GitHubChecker.php
M psy/psysh/src/Psy/functions.php
M psy/psysh/test/Psy/Test/AutoloaderTest.php
M psy/psysh/test/Psy/Test/CodeCleaner/CodeCleanerTestCase.php
M psy/psysh/test/Psy/Test/CodeCleaner/FunctionReturnInWriteContextPassTest.php
M psy/psysh/test/Psy/Test/CodeCleanerTest.php
M psy/psysh/test/Psy/Test/ConfigurationTest.php
M psy/psysh/test/Psy/Test/ConsoleColorFactoryTest.php
M psy/psysh/test/Psy/Test/Exception/BreakExceptionTest.php
M psy/psysh/test/Psy/Test/Exception/ErrorExceptionTest.php
M psy/psysh/test/Psy/Test/Exception/FatalErrorExceptionTest.php
M psy/psysh/test/Psy/Test/Exception/ParseErrorExceptionTest.php
M psy/psysh/test/Psy/Test/Exception/RuntimeExceptionTest.php
M psy/psysh/test/Psy/Test/Formatter/CodeFormatterTest.php
M psy/psysh/test/Psy/Test/Formatter/DocblockFormatterTest.php
M psy/psysh/test/Psy/Test/Formatter/SignatureFormatterTest.php
M psy/psysh/test/Psy/Test/Input/CodeArgumentTest.php
M psy/psysh/test/Psy/Test/Input/ShellInputTest.php
M psy/psysh/test/Psy/Test/Readline/GNUReadlineTest.php
M psy/psysh/test/Psy/Test/Readline/HoaConsoleTest.php
M psy/psysh/test/Psy/Test/Readline/LibeditTest.php
M psy/psysh/test/Psy/Test/Readline/TransientTest.php
M psy/psysh/test/Psy/Test/Reflection/ReflectionConstantTest.php
M psy/psysh/test/Psy/Test/ShellTest.php
M psy/psysh/test/Psy/Test/TabCompletion/AutoCompleterTest.php
M psy/psysh/test/Psy/Test/Util/DocblockTest.php
M psy/psysh/test/Psy/Test/Util/MirrorTest.php
M psy/psysh/test/Psy/Test/Util/StrTest.php
M psy/psysh/test/Psy/Test/VersionUpdater/GitHubCheckerTest.php
62 files changed, 905 insertions(+), 184 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/14/394514/1

diff --git a/composer.json b/composer.json
index 087e52f..f70f4a8 100644
--- a/composer.json
+++ b/composer.json
@@ -96,7 +96,7 @@
"php": ">=5.5.9",
"pimple/pimple": "3.0.2",
"psr/log": "1.0.2",
-   "psy/psysh": "0.8.11",
+   "psy/psysh": "0.8.15",
"ruflin/elastica": "5.3.0",
"serialization/serialization": "3.2.2",
"stil/gd-text":  "1.0.0",
diff --git a/composer.lock b/composer.lock
index dbad8e6..f4f365e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "75dfcdd9f65a5bfd9302c0096caf",
+"content-hash": "8f7c0f6b85df2fe0ec83fa2ec6f8e97f",
 "packages": [
 {
 "name": "composer/semver",
@@ -1891,16 +1891,16 @@
 },
 {
 "name": "psy/psysh",
-"version": "v0.8.11",
+  

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update pear/mail_mime from v1.10.1 to v1.10.2

[jenkins-bot (Code Review)]

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

Change subject: Update pear/mail_mime from v1.10.1 to v1.10.2
..


Update pear/mail_mime from v1.10.1 to v1.10.2

https://github.com/pear/Mail_Mime/releases/tag/1.10.2
https://github.com/pear/Mail_Mime/compare/1.10.1...1.10.2

Change-Id: Ib9df08fefa21fb90804852aa73b8ef1e22e4dabc
---
M composer.json
M composer.lock
M composer/include_paths.php
M composer/installed.json
M pear/mail_mime/Mail/mime.php
M pear/mail_mime/Mail/mimePart.php
M pear/mail_mime/package.xml
A pear/mail_mime/tests/test_Bug_21255.phpt
8 files changed, 129 insertions(+), 96 deletions(-)

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



diff --git a/composer.json b/composer.json
index 0a7f405..087e52f 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
-   "pear/mail_mime": "1.10.1",
+   "pear/mail_mime": "1.10.2",
"pear/mail_mime-decode": "1.5.5.2",
"pear/net_smtp": "1.7.3",
"pear/net_socket": "1.2.1",
diff --git a/composer.lock b/composer.lock
index ad4345b..dbad8e6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "e948033dcea38ac3c205abf7e2e274f7",
+"content-hash": "75dfcdd9f65a5bfd9302c0096caf",
 "packages": [
 {
 "name": "composer/semver",
@@ -1491,16 +1491,16 @@
 },
 {
 "name": "pear/mail_mime",
-"version": "1.10.1",
+"version": "1.10.2",
 "source": {
 "type": "git",
 "url": "https://github.com/pear/Mail_Mime.git;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e"
+"reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/pear/Mail_Mime/zipball/3d4e33a6879cbb4c71684a282750b7bb072a121e;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e",
+"url": 
"https://api.github.com/repos/pear/Mail_Mime/zipball/7b2f93fa5219da99e9997f497b916b5bb27eb57a;,
+"reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a",
 "shasum": ""
 },
 "require": {
@@ -1533,7 +1533,7 @@
 ],
 "description": "Mail_Mime provides classes to create MIME 
messages",
 "homepage": "http://pear.php.net/package/Mail_Mime;,
-"time": "2017-05-21T10:43:06+00:00"
+"time": "2017-11-17T09:21:45+00:00"
 },
 {
 "name": "pear/mail_mime-decode",
diff --git a/composer/include_paths.php b/composer/include_paths.php
index 206c5c0..54a1ead 100644
--- a/composer/include_paths.php
+++ b/composer/include_paths.php
@@ -12,6 +12,6 @@
 $vendorDir . '/pear/net_smtp',
 $vendorDir . '/pear/pear-core-minimal/src',
 $vendorDir . '/pear/mail',
-$vendorDir . '/pear/mail_mime',
 $vendorDir . '/pear/net_socket',
+$vendorDir . '/pear/mail_mime',
 );
diff --git a/composer/installed.json b/composer/installed.json
index c031f43..beea8ad 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,54 +1895,6 @@
 "homepage": "http://pear.php.net/package/Mail;
 },
 {
-"name": "pear/mail_mime",
-"version": "1.10.1",
-"version_normalized": "1.10.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/pear/Mail_Mime.git;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/pear/Mail_Mime/zipball/3d4e33a6879cbb4c71684a282750b7bb072a121e;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e",
-"shasum": ""
-},
-"require": {
-"pear/pear-core-minimal": "*"
-},
-"time": "2017-05-21T10:43:06+00:00",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"psr-0": {
-"Mail": "./"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"include-path": [
-"./"
-],
-"license": [
-"BSD-3-clause"
-],
-"authors": [
-{
-"name": "Cipriano Groenendal",
-"email": "ci...@php.net",
-"role": "Lead"
-},
-{
- 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update pear/mail_mime from v1.10.1 to v1.10.2

[Reedy (Code Review)]

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

Change subject: Update pear/mail_mime from v1.10.1 to v1.10.2
..

Update pear/mail_mime from v1.10.1 to v1.10.2

https://github.com/pear/Mail_Mime/releases/tag/1.10.2
https://github.com/pear/Mail_Mime/compare/1.10.1...1.10.2

Change-Id: Ib9df08fefa21fb90804852aa73b8ef1e22e4dabc
---
M composer.json
M composer.lock
M composer/include_paths.php
M composer/installed.json
M pear/mail_mime/Mail/mime.php
M pear/mail_mime/Mail/mimePart.php
M pear/mail_mime/package.xml
A pear/mail_mime/tests/test_Bug_21255.phpt
8 files changed, 129 insertions(+), 96 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/13/394513/1

diff --git a/composer.json b/composer.json
index 0a7f405..087e52f 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
-   "pear/mail_mime": "1.10.1",
+   "pear/mail_mime": "1.10.2",
"pear/mail_mime-decode": "1.5.5.2",
"pear/net_smtp": "1.7.3",
"pear/net_socket": "1.2.1",
diff --git a/composer.lock b/composer.lock
index ad4345b..dbad8e6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "e948033dcea38ac3c205abf7e2e274f7",
+"content-hash": "75dfcdd9f65a5bfd9302c0096caf",
 "packages": [
 {
 "name": "composer/semver",
@@ -1491,16 +1491,16 @@
 },
 {
 "name": "pear/mail_mime",
-"version": "1.10.1",
+"version": "1.10.2",
 "source": {
 "type": "git",
 "url": "https://github.com/pear/Mail_Mime.git;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e"
+"reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/pear/Mail_Mime/zipball/3d4e33a6879cbb4c71684a282750b7bb072a121e;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e",
+"url": 
"https://api.github.com/repos/pear/Mail_Mime/zipball/7b2f93fa5219da99e9997f497b916b5bb27eb57a;,
+"reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a",
 "shasum": ""
 },
 "require": {
@@ -1533,7 +1533,7 @@
 ],
 "description": "Mail_Mime provides classes to create MIME 
messages",
 "homepage": "http://pear.php.net/package/Mail_Mime;,
-"time": "2017-05-21T10:43:06+00:00"
+"time": "2017-11-17T09:21:45+00:00"
 },
 {
 "name": "pear/mail_mime-decode",
diff --git a/composer/include_paths.php b/composer/include_paths.php
index 206c5c0..54a1ead 100644
--- a/composer/include_paths.php
+++ b/composer/include_paths.php
@@ -12,6 +12,6 @@
 $vendorDir . '/pear/net_smtp',
 $vendorDir . '/pear/pear-core-minimal/src',
 $vendorDir . '/pear/mail',
-$vendorDir . '/pear/mail_mime',
 $vendorDir . '/pear/net_socket',
+$vendorDir . '/pear/mail_mime',
 );
diff --git a/composer/installed.json b/composer/installed.json
index c031f43..beea8ad 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,54 +1895,6 @@
 "homepage": "http://pear.php.net/package/Mail;
 },
 {
-"name": "pear/mail_mime",
-"version": "1.10.1",
-"version_normalized": "1.10.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/pear/Mail_Mime.git;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/pear/Mail_Mime/zipball/3d4e33a6879cbb4c71684a282750b7bb072a121e;,
-"reference": "3d4e33a6879cbb4c71684a282750b7bb072a121e",
-"shasum": ""
-},
-"require": {
-"pear/pear-core-minimal": "*"
-},
-"time": "2017-05-21T10:43:06+00:00",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"psr-0": {
-"Mail": "./"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"include-path": [
-"./"
-],
-"license": [
-"BSD-3-clause"
-],
-"authors": [
-{
-"name": "Cipriano Groenendal",
-"email": "ci...@php.net",
-"role": "Lead"
-},
-{
-

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Fix a bug in the function addPropertyWithLitteral

[Karima Rafes (Code Review)]

Karima Rafes has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394512 )

Change subject: Fix a bug in the function addPropertyWithLitteral
..


Fix a bug in the function addPropertyWithLitteral

Change-Id: Ice3177f14602607e259f2eeb1d1171b38884c76b
---
M lua/LinkedWiki.lua.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lua/LinkedWiki.lua.php b/lua/LinkedWiki.lua.php
index dfa70f4..ba2cf27 100644
--- a/lua/LinkedWiki.lua.php
+++ b/lua/LinkedWiki.lua.php
@@ -301,7 +301,7 @@
 if ($iriSubject === null && $this->subject ===null) {
 return array("ERROR : Subject unknown (Use the parameter 
iriSubject or the function setSubject.");
 }
-if (EMPTY($value) || preg_match("/(\"\"\"|''')/i", $value)) {
+if ((EMPTY($value) && !is_numeric($value)) || 
preg_match("/(\"\"\"|''')/i", $value)) {
 return array("ERROR : Bad value");
 }
 if (EMPTY($iriProperty) || preg_match("/(\"\"\"|'''| )/i", 
trim($iriProperty))) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice3177f14602607e259f2eeb1d1171b38884c76b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 
Gerrit-Reviewer: Karima Rafes 
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...LinkedWiki[master]: Fix a bug in the function addPropertyWithLitteral

[Karima Rafes (Code Review)]

Karima Rafes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394512 )

Change subject: Fix a bug in the function addPropertyWithLitteral
..

Fix a bug in the function addPropertyWithLitteral

Change-Id: Ice3177f14602607e259f2eeb1d1171b38884c76b
---
M lua/LinkedWiki.lua.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkedWiki 
refs/changes/12/394512/1

diff --git a/lua/LinkedWiki.lua.php b/lua/LinkedWiki.lua.php
index dfa70f4..ba2cf27 100644
--- a/lua/LinkedWiki.lua.php
+++ b/lua/LinkedWiki.lua.php
@@ -301,7 +301,7 @@
 if ($iriSubject === null && $this->subject ===null) {
 return array("ERROR : Subject unknown (Use the parameter 
iriSubject or the function setSubject.");
 }
-if (EMPTY($value) || preg_match("/(\"\"\"|''')/i", $value)) {
+if ((EMPTY($value) && !is_numeric($value)) || 
preg_match("/(\"\"\"|''')/i", $value)) {
 return array("ERROR : Bad value");
 }
 if (EMPTY($iriProperty) || preg_match("/(\"\"\"|'''| )/i", 
trim($iriProperty))) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice3177f14602607e259f2eeb1d1171b38884c76b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 

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

[MediaWiki-commits] [Gerrit] performance[refs/meta/dashboards/custom]: Update "Other patches" to hide if already reviewed by MW or ...

[Krinkle (Code Review)]

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

Change subject: Update "Other patches" to hide if already reviewed by MW or WMF 
groups
..

Update "Other patches" to hide if already reviewed by MW or WMF groups

Because they're also authorised to review in mediawiki/core.

This means we still don't hide patches if they've already been
reviewed by guest accounts or accounts with rights elsewhere,
but also don't show all patches unless one of us has reviewed them.

Also update limits a bit.

Change-Id: Ib49ffecabbed7ba31aa25cefddc6de3437146528
---
M custom
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance refs/changes/11/394511/1

diff --git a/custom b/custom
index 1e167f6..4e767bb 100644
--- a/custom
+++ b/custom
@@ -4,10 +4,10 @@
 [section "Our patches awaiting review"]
   query = is:open ownerin:performance -owner:self -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review<0 limit:40
 [section "Other patches in subscribed areas"]
-  query = is:open -ownerin:performance -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review=-2 -label:Code-Review<0,group=performance 
(project:mediawiki/extensions/NavigationTiming OR 
project:mediawiki/extensions/PerformanceInspector OR project:performance OR 
project:performance/docroot OR project:performance/WebPageTest OR 
(project:mediawiki/core reviewerin:performance)) limit:20
+  query = is:open -ownerin:performance -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review=-2 -label:Code-Review<0,group=performance 
-label:Code-Review<0,group=mediawiki -label:Code-Review<0,group=wmf-deployment 
(project:mediawiki/extensions/NavigationTiming OR 
project:mediawiki/extensions/PerformanceInspector OR project:performance OR 
project:performance/docroot OR project:performance/WebPageTest OR 
(project:mediawiki/core reviewerin:performance)) limit:15
 [section "My patches awaiting review"]
   query = is:open ownerin:performance owner:self -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review<0 limit:40
 [section "My other patches"]
   query = is:open ownerin:performance owner:self (message:WIP OR message:DNM 
OR label:Verified<0 OR label:Code-Review<0) limit:40
 [section "Recently merged"]
-  query = is:merged ownerin:performance limit:30
+  query = is:merged ownerin:performance limit:15

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib49ffecabbed7ba31aa25cefddc6de3437146528
Gerrit-PatchSet: 1
Gerrit-Project: performance
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] performance[refs/meta/dashboards/custom]: Update "Other patches" to hide if already reviewed by MW or ...

[Krinkle (Code Review)]

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

Change subject: Update "Other patches" to hide if already reviewed by MW or WMF 
groups
..


Update "Other patches" to hide if already reviewed by MW or WMF groups

Because they're also authorised to review in mediawiki/core.

This means we still don't hide patches if they've already been
reviewed by guest accounts or accounts with rights elsewhere,
but also don't show all patches unless one of us has reviewed them.

Also update limits a bit.

Change-Id: Ib49ffecabbed7ba31aa25cefddc6de3437146528
---
M custom
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/custom b/custom
index 1e167f6..4e767bb 100644
--- a/custom
+++ b/custom
@@ -4,10 +4,10 @@
 [section "Our patches awaiting review"]
   query = is:open ownerin:performance -owner:self -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review<0 limit:40
 [section "Other patches in subscribed areas"]
-  query = is:open -ownerin:performance -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review=-2 -label:Code-Review<0,group=performance 
(project:mediawiki/extensions/NavigationTiming OR 
project:mediawiki/extensions/PerformanceInspector OR project:performance OR 
project:performance/docroot OR project:performance/WebPageTest OR 
(project:mediawiki/core reviewerin:performance)) limit:20
+  query = is:open -ownerin:performance -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review=-2 -label:Code-Review<0,group=performance 
-label:Code-Review<0,group=mediawiki -label:Code-Review<0,group=wmf-deployment 
(project:mediawiki/extensions/NavigationTiming OR 
project:mediawiki/extensions/PerformanceInspector OR project:performance OR 
project:performance/docroot OR project:performance/WebPageTest OR 
(project:mediawiki/core reviewerin:performance)) limit:15
 [section "My patches awaiting review"]
   query = is:open ownerin:performance owner:self -message:WIP -message:DNM 
-label:Verified<0 -label:Code-Review<0 limit:40
 [section "My other patches"]
   query = is:open ownerin:performance owner:self (message:WIP OR message:DNM 
OR label:Verified<0 OR label:Code-Review<0) limit:40
 [section "Recently merged"]
-  query = is:merged ownerin:performance limit:30
+  query = is:merged ownerin:performance limit:15

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49ffecabbed7ba31aa25cefddc6de3437146528
Gerrit-PatchSet: 1
Gerrit-Project: performance
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Add maintenance script for attaching existing LDAP accounts

[BryanDavis (Code Review)]

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

Change subject: Add maintenance script for attaching existing LDAP accounts
..

Add maintenance script for attaching existing LDAP accounts

The attachLdapUser.php maintenance script can be used to attach an
existing LDAP account to the local wiki. In addition to creating the
user table entries, it will also add the expected user creation log
events.

Bug: T180813
Change-Id: Id7aa131c64fc0a7df934ebcbc56d367e996b8355
---
A maintenance/attachLdapUser.php
1 file changed, 64 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/10/394510/1

diff --git a/maintenance/attachLdapUser.php b/maintenance/attachLdapUser.php
new file mode 100644
index 000..d4cd49a
--- /dev/null
+++ b/maintenance/attachLdapUser.php
@@ -0,0 +1,64 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+if ( getenv( 'MW_INSTALL_PATH' ) ) {
+   $IP = getenv( 'MW_INSTALL_PATH' );
+} else {
+   $IP = __DIR__ . '/../../..';
+}
+require_once "$IP/maintenance/Maintenance.php";
+
+use MediaWiki\Auth\AuthManager;
+
+/**
+ * Attach an existing LDAP account to the local wiki with all expected log
+ * events created as well.
+ *
+ * @copyright © 2017 Wikimedia Foundation and contributors
+ */
+class AttachLdapUser extends Maintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->mDescription = "Attach an existing LDAP user to the 
local wiki";
+   $this->addOption( 'user', 'Username', true, true );
+   $this->addOption( 'email', 'Email address', true, true );
+   $this->addOption( 'domain', 'LDAP domain', false, true );
+   }
+
+   public function execute() {
+   // Setup the internal state of LdapAuthenticationPlugin as 
though the
+   // login form was used. Ugly but this is what LdapAuthentication
+   // forces us to do.
+   $ldap = LdapAuthenticationPlugin::getInstance();
+   $ldap->LDAPUsername = $this->getOption( 'user' );
+   $ldap->email = $this->getOption( 'email' );
+   $domain = $this->getOption( 'domain', $ldap->getDomain() );
+   $ldap->setDomain( $domain );
+   $_SESSION['wsDomain'] = $domain;
+
+   $user = User::newFromName( $ldap->LDAPUsername, 'creatable' );
+   AuthManager::singleton()->autoCreateUser(
+   $user, LdapPrimaryAuthenticationProvider::class, false 
);
+   }
+}
+
+$maintClass = "AttachLdapUser";
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7aa131c64fc0a7df934ebcbc56d367e996b8355
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...ThrottleOverride[master]: Cleanup spaces in extension.json

[jenkins-bot (Code Review)]

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

Change subject: Cleanup spaces in extension.json
..


Cleanup spaces in extension.json

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

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



diff --git a/extension.json b/extension.json
index f2a9059..765f806 100644
--- a/extension.json
+++ b/extension.json
@@ -13,7 +13,7 @@
"throttleoverride"
],
"LogActionsHandlers": {
-"throttleoverride/*": "ThrottleOverrideLogFormatter"
+   "throttleoverride/*": "ThrottleOverrideLogFormatter"
},
"Hooks": {
"PingLimiter": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f412b3a9487c7ef88274d5d13f36f71af9ada46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ThrottleOverride
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: EddieGP 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Port DBN from clickmodels to scala

[EBernhardson (Code Review)]

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

Change subject: Port DBN from clickmodels to scala
..

Port DBN from clickmodels to scala

DBN takes quite some time when running against a full run of wikis. On
one run that resulted in 90M observations across 20 wikis it took over
20 minutes.  In the naive benchmark (included) this scala version is >
20x faster than the python implementation, and is perhaps easier to
follow since we remove unused functionality ( the intents and layouts).

This does not yet include the python side of calling this, because the
way the CI works we will need to publish a new mjolnir jar with this
code and wanted to let it get reviewed first.

For performance reasons this almost exclusively uses arrays, and most
inner loops are using while instead of more idiomatic map or fold. This
conversion gave an ~3x speedup, which seems worthwhile. This is probably
very allocation heavy, but optimizing out the allocations seemed like a
big pain.

Change-Id: I7231590a18b7f8fe2552997bc4c702ee635d06e5
---
A jvm/src/main/scala/org/wikimedia/search/mjolnir/DBN.scala
A jvm/src/test/resources/dbn.data
A jvm/src/test/scala/org/wikimedia/search/mjolnir/DBNSuite.scala
3 files changed, 463 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/09/394509/1

diff --git a/jvm/src/main/scala/org/wikimedia/search/mjolnir/DBN.scala 
b/jvm/src/main/scala/org/wikimedia/search/mjolnir/DBN.scala
new file mode 100644
index 000..51ea651
--- /dev/null
+++ b/jvm/src/main/scala/org/wikimedia/search/mjolnir/DBN.scala
@@ -0,0 +1,312 @@
+package org.wikimedia.search.mjolnir
+
+import scala.collection.mutable
+import scala.util.parsing.json.JSON
+
+case class SessionItem(queryId: Int, urlIds: Array[Int], clicks: 
Array[Boolean])
+case class RelevanceResult(query: String, region: String, url: String, 
relevance: Double)
+
+class InputReader(
+  minDocsPerQuery: Int, maxDocsPerQuery: Int, serpSize: Int,
+  discardNoClicks: Boolean
+) {
+
+  private val urlToId: mutable.Map[String, Int] = mutable.Map()
+  private val queryToId: mutable.Map[(String, String), Int] = mutable.Map()
+  private var currentUrlId: Int = 1
+  private var currentQueryId: Int = 0
+
+  def maxQueryId: Int = currentQueryId + 1
+
+  private def getQueryId(query: String, region: String): Int = {
+val key = (query, region)
+queryToId.get(key) match {
+  case Some(queryId) => queryId
+  case None =>
+val queryId = currentQueryId
+currentQueryId += 1
+queryToId.put(key, queryId)
+queryId
+}
+  }
+
+  private def getUrlId(url: String): Int = {
+urlToId.get(url) match {
+  case Some(urlId) => urlId
+  case None =>
+val urlId = currentUrlId
+currentUrlId += 1
+urlToId.put(url, urlId)
+urlId
+}
+  }
+
+
+  private def parseJsonBooleanArray(json: String): Option[Array[Boolean]] = {
+JSON.parseFull(json) match {
+  case Some(x: List[Any]) =>
+if (x.forall(_.isInstanceOf[Boolean])) {
+  Some(x.asInstanceOf[List[Boolean]].toArray)
+} else {
+  None
+}
+  case _ => None
+}
+  }
+
+  private def parseJsonStringArray(json: String): Option[Array[String]] = {
+JSON.parseFull(json) match {
+  case Some(x: List[Any]) =>
+if (x.forall(_.isInstanceOf[String])) {
+  Some(x.asInstanceOf[List[String]].toArray)
+} else {
+  None
+}
+  case _ => None
+}
+  }
+
+  def makeSessionItem(query: String, region: String, urls: Array[String], 
clicks: Array[Boolean]): Option[SessionItem] = {
+
+val n = math.min(serpSize, urls.length)
+val hasClicks = clicks.take(n).foldLeft(false)(_ || _)
+if (urls.length < minDocsPerQuery ||
+(discardNoClicks && !hasClicks)
+) {
+  None
+} else {
+  val queryId = getQueryId(query, region)
+  val urlIds = urls.map(getUrlId)
+  Some(SessionItem(queryId, urlIds, clicks.take(n)))
+}
+  }
+
+  val PIECE_HASH_DIGEST = 0
+  val PIECE_QUERY = 1
+  val PIECE_REGION = 2
+  val PIECE_INTENT_WEIGHT = 3
+  val PIECE_URLS = 4
+  val PIECE_LAYOUT = 5
+  val PIECE_CLICKS = 6
+
+  // TODO: Ideally dont use this and make session items directly without extra 
ser/deser overhead
+  def read(f: Iterator[String]): Seq[SessionItem] = {
+f.flatMap { line => {
+  val pieces = line.split("\t")
+  val query: String = pieces(PIECE_QUERY)
+  val region = pieces(PIECE_REGION)
+  val urls = parseJsonStringArray(pieces(PIECE_URLS)) match {
+case Some(x: Array[String]) => x
+case None => Array[String]()
+  }
+  val clicks = parseJsonBooleanArray(pieces(PIECE_CLICKS)) match {
+case Some(x: Array[Boolean]) => x
+case None => Array[Boolean]()
+  }
+
+  makeSessionItem(query, region, urls, clicks)
+  

[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash: remove ganglia

[Dzahn (Code Review)]

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

Change subject: logstash: remove ganglia
..


logstash: remove ganglia

Bug: T177225
Change-Id: I42ecbc3eda1937962f12dbf4c5458c4b9ff7dacf
---
M hieradata/role/common/logstash/collector.yaml
M hieradata/role/common/logstash/elasticsearch.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/logstash/collector.yaml 
b/hieradata/role/common/logstash/collector.yaml
index 3a9e7f4..c533845 100644
--- a/hieradata/role/common/logstash/collector.yaml
+++ b/hieradata/role/common/logstash/collector.yaml
@@ -1,4 +1,5 @@
 cluster: logstash
+standard::has_ganglia: false
 admin::groups:
   - logstash-roots
   - elasticsearch-roots
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml 
b/hieradata/role/common/logstash/elasticsearch.yaml
index 971ba43..0f56951 100644
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ b/hieradata/role/common/logstash/elasticsearch.yaml
@@ -1,5 +1,6 @@
 # General configs
 cluster: logstash
+standard::has_ganglia: false
 admin::groups:
   - logstash-roots
   - elasticsearch-roots

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Remove pre from apt key

[jenkins-bot (Code Review)]

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

Change subject: Remove pre from apt key
..


Remove pre from apt key

Change-Id: I33e582115d2ae64e715aae3680e885c5c079de99
---
M puppet/modules/apt/files/wikimedia-pubkey.asc
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/puppet/modules/apt/files/wikimedia-pubkey.asc 
b/puppet/modules/apt/files/wikimedia-pubkey.asc
index 30a45ec..3819065 100644
--- a/puppet/modules/apt/files/wikimedia-pubkey.asc
+++ b/puppet/modules/apt/files/wikimedia-pubkey.asc
@@ -1,4 +1,3 @@
-
 -BEGIN PGP PUBLIC KEY BLOCK-
 Version: GnuPG v1
 
@@ -28,5 +27,4 @@
 S2wOIo0ckRI0APw6DQSFMyBrNs9rWy72Ixu9RC1GtzCCn5OaMRUM9FaqjRnTKX4m
 grWsU8i35fI=
 =ib96
--END PGP PUBLIC KEY BLOCK-
-
\ No newline at end of file
+-END PGP PUBLIC KEY BLOCK-
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33e582115d2ae64e715aae3680e885c5c079de99
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Paladox 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Remove pre from apt key

[Paladox (Code Review)]

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

Change subject: Remove pre from apt key
..

Remove pre from apt key

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/08/394508/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33e582115d2ae64e715aae3680e885c5c079de99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: role::huggle

[jenkins-bot (Code Review)]

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

Change subject: role::huggle
..


role::huggle

Provision the Huggle git repo and libraries and utilities needed to
compile and test Huggle using QT4. Running Huggle from inside the VM
should work if the host computer has a working X server.

Bug: T178141
Change-Id: I9b71be4711054cca1c3743eb024133fb4e98a823
---
A puppet/modules/role/manifests/huggle.pp
A puppet/modules/role/templates/huggle/VagrantRoleHuggle.wiki.erb
2 files changed, 47 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/huggle.pp 
b/puppet/modules/role/manifests/huggle.pp
new file mode 100644
index 000..4fc0008
--- /dev/null
+++ b/puppet/modules/role/manifests/huggle.pp
@@ -0,0 +1,29 @@
+# == Class: role::huggle
+# Provision build environment for Huggle.
+#
+# Clones the Huggle git repository and installs libraries needed for
+# development and testing. See
+# http://dev.wiki.local.wmftest.net:8080/wiki/VagrantRoleHuggle for details.
+class role::huggle {
+include ::mwv
+
+require_package(
+'libqt4-dev',
+'libqt4-webkit',
+'libqt4-network',
+'qt4-qmake',
+'libqtwebkit-dev',
+'libqt4-dev-bin',
+'qt4-dev-tools',
+)
+
+git::clone { 'huggle':
+directory => "${::mwv::services_dir}/huggle",
+remote=> 'https://github.com/huggle/huggle3-qt-lx.git',
+}
+
+# Add some documentation for developers
+mediawiki::import::text { 'VagrantRoleHuggle':
+content => template('role/huggle/VagrantRoleHuggle.wiki.erb'),
+}
+}
diff --git a/puppet/modules/role/templates/huggle/VagrantRoleHuggle.wiki.erb 
b/puppet/modules/role/templates/huggle/VagrantRoleHuggle.wiki.erb
new file mode 100644
index 000..8c4ee83
--- /dev/null
+++ b/puppet/modules/role/templates/huggle/VagrantRoleHuggle.wiki.erb
@@ -0,0 +1,18 @@
+'''Huggle''' is an anti-vandalism tool for use on MediaWiki based projects.
+
+== Getting started ==
+
+  $ vagrant ssh
+  $ cd /vagrant/srv/huggle/huggle
+  $ ./configure --qt4 --extension --no-audio
+  $ cd /vagrant/srv/huggle/huggle/huggle_release
+  $ make
+  $ cd /vagrant/srv/huggle/huggle/tests/test
+  $ cmake .
+  $ make
+  $ ./tst_testmain
+
+== See also ==
+* [https://en.wikipedia.org/wiki/Wikipedia:Huggle Wikipedia:Huggle]
+* [https://github.com/huggle/huggle3-qt-lx Huggle on GitHub]
+* [https://github.com/huggle/huggle3-qt-lx/wiki/Developer-guide Developer 
guide]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b71be4711054cca1c3743eb024133fb4e98a823
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Petrb 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix broken $::mediawiki::wiki_db usage

[jenkins-bot (Code Review)]

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

Change subject: Fix broken $::mediawiki::wiki_db usage
..


Fix broken $::mediawiki::wiki_db usage

At some point the $::mediawiki::wiki_db setting was renamed to
$::mediawiki::wiki_name, but we missed a few usages of the old name.
Puppet4 actually notices this and complains when compiling the catalog
which is nice.

Change-Id: Ie1131cd252af4d5492531944c3075e03a22054fe
---
M puppet/modules/role/manifests/restbase.pp
M puppet/modules/role/manifests/thumb_on_404.pp
M puppet/modules/role/manifests/visualeditor.pp
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/puppet/modules/role/manifests/restbase.pp 
b/puppet/modules/role/manifests/restbase.pp
index d8318dc..d28dd92 100644
--- a/puppet/modules/role/manifests/restbase.pp
+++ b/puppet/modules/role/manifests/restbase.pp
@@ -36,7 +36,7 @@
 mediawiki::settings { 'RESTBase-VRS':
 values   => template('role/restbase/vrs.php.erb'),
 priority => $::load_first,
-wiki => $::mediawiki::wiki_db,
+wiki => $::mediawiki::wiki_name,
 }
 
 # Reverse proxy /api/rest_v1/ to RESTBase server
@@ -52,7 +52,7 @@
 wgVisualEditorRestbaseURL => $ve_url,
 },
 priority => $::load_early,
-wiki => $::mediawiki::wiki_db,
+wiki => $::mediawiki::wiki_name,
 }
 
 mediawiki::import::text { 'VagrantRoleRestbase':
diff --git a/puppet/modules/role/manifests/thumb_on_404.pp 
b/puppet/modules/role/manifests/thumb_on_404.pp
index 2458e87..900aa61 100644
--- a/puppet/modules/role/manifests/thumb_on_404.pp
+++ b/puppet/modules/role/manifests/thumb_on_404.pp
@@ -9,6 +9,6 @@
 role::thumb_on_404::multiwiki { $::mediawiki::wiki_name:
 images_url => '/images',
 images_dir => "${::mwv::files_dir}/images",
-wiki   => $::mediawiki::wiki_db,
+wiki   => $::mediawiki::wiki_name,
 }
 }
diff --git a/puppet/modules/role/manifests/visualeditor.pp 
b/puppet/modules/role/manifests/visualeditor.pp
index 8ae9547..ceb0e7d 100644
--- a/puppet/modules/role/manifests/visualeditor.pp
+++ b/puppet/modules/role/manifests/visualeditor.pp
@@ -18,6 +18,6 @@
 settings  => template('role/visualeditor/conf.php.erb'),
 browser_tests => 'modules/ve-mw/tests/browser',
 priority  => $::load_early,
-wiki  => $::mediawiki::wiki_db,
+wiki  => $::mediawiki::wiki_name,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1131cd252af4d5492531944c3075e03a22054fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[trusty-compat]: lxc: new box image

[jenkins-bot (Code Review)]

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

Change subject: lxc: new box image
..


lxc: new box image

Our custom box image is throwing a 404, so backport the Puppet bootstrap
provisioner and switch to a known good box image.

Bug: T161891
Change-Id: Idec261cbc334b5a9a7293ec4445f67969387c019
---
M Vagrantfile
A support/puppet-bootstrap.sh
2 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index ee403cf..3c40ca1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -90,7 +90,7 @@
   # LXC provider. Enable wtih `--provider=lxc`
   # Requires vagrant-lxc plugin and Vagrant 1.7+
   config.vm.provider :lxc do |_lxc, override|
-override.vm.box = 'Wikimedia/trusty64-puppet-lxc'
+override.vm.box = 'fgrehm/trusty64-lxc'
   end
 
   # Parallels provider. Enable with `--provider=parallels`
@@ -212,6 +212,9 @@
 
   config.vm.provision :mediawiki_reload if mwv.reload?
 
+  # Ensure that the VM has Puppet installed
+  config.vm.provision :shell, path: 'support/puppet-bootstrap.sh'
+
   config.vm.provision :puppet do |puppet|
 # Use empty module path to avoid an extra mount.
 # See --modulepath below
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
new file mode 100755
index 000..cf64fff
--- /dev/null
+++ b/support/puppet-bootstrap.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Install Puppet via apt
+set -e
+
+if [ "`id -u`" != "0" ]; then
+echo "This script must be run as root." >&2
+echo "EUID = $EUID" >&2
+exit 1
+fi
+
+if which puppet >/dev/null 2>&1; then
+exit 0
+fi
+
+apt-get update >/dev/null 2>&1
+DEBIAN_FRONTEND=noninteractive apt-get \
+-y \
+-o Dpkg::Options::="--force-confdef" \
+-o Dpkg::Options::="--force-confold" \
+install puppet >/dev/null 2>&1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idec261cbc334b5a9a7293ec4445f67969387c019
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: trusty-compat
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix legacy usage of Capitalized resource names

[jenkins-bot (Code Review)]

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

Change subject: Fix legacy usage of Capitalized resource names
..


Fix legacy usage of Capitalized resource names

Puppet4 complains and this usage has long been deprecated.

Change-Id: I79970cf89260e82e8c4ca309ef439e17cb3e4139
---
M puppet/modules/apt/manifests/init.pp
M puppet/modules/role/manifests/striker.pp
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 5af3c83..7932f24 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -76,5 +76,5 @@
 mode   => '0444',
 }
 
-Class['Apt'] -> Package <| |>
+Class['apt'] -> Package <| |>
 }
diff --git a/puppet/modules/role/manifests/striker.pp 
b/puppet/modules/role/manifests/striker.pp
index 4318bd9..8fe839a 100644
--- a/puppet/modules/role/manifests/striker.pp
+++ b/puppet/modules/role/manifests/striker.pp
@@ -187,7 +187,7 @@
   before  => Exec['striker manage.py migrate'],
   require => [
   Mysql::User[$db_user],
-  Class[Mysql::Large_prefix],
+  Class['mysql::large_prefix'],
   ],
   subscribe   => Mysql::Db[$db_name],
 }
@@ -197,7 +197,7 @@
 command => "${venv}/bin/python manage.py migrate",
 require => [
 Mysql::User[$db_user],
-Class[Mysql::Large_prefix],
+Class['mysql::large_prefix'],
 File['/etc/striker/striker.ini'],
 ],
 onlyif  => "${venv}/bin/python manage.py showmigrations --plan | 
/bin/grep -q '\\[ \\]'",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79970cf89260e82e8c4ca309ef439e17cb3e4139
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Dduvall 
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/vagrant[trusty-compat]: Revert "Merge "Fix .gitreview for compat branch" into trusty...

[jenkins-bot (Code Review)]

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

Change subject: Revert "Merge "Fix .gitreview for compat branch" into 
trusty-compat"
..


Revert "Merge "Fix .gitreview for compat branch" into trusty-compat"

This reverts commit a92d9b0ea6ed283a950ad198934623acdf7c65f0, reversing
changes made to 81fd32c95c0c08c12ea740cc86f931c965798731.

Bug: T171537
Change-Id: Idaa4775223c09f7eb001e64634d2a3231024bb1d
---
M .gitmodules
M .rubocop.yml
M Gemfile
M Gemfile.lock
M Vagrantfile
A lib/labs-vagrant.rb
M lib/mediawiki-vagrant/lsb_check/provisioner.rb
M puppet/hieradata/common.yaml
M puppet/hieradata/provider/lxc.yaml
M puppet/modules/apache/manifests/init.pp
M puppet/modules/apache/manifests/mod/access_compat.pp
M puppet/modules/apache/manifests/mod/proxy_fcgi.pp
A puppet/modules/apache/manifests/mod/version.pp
M puppet/modules/apache/templates/ports.conf.erb
M puppet/modules/apt/manifests/init.pp
M puppet/modules/apt/manifests/ppa.pp
D puppet/modules/apt/templates/backports.list.erb
M puppet/modules/apt/templates/mwv-apt.list.erb
M puppet/modules/apt/templates/wikimedia.list.erb
M puppet/modules/browsertests/manifests/bundle.pp
M puppet/modules/browsertests/manifests/init.pp
A puppet/modules/cgroup/files/cgrulesengd.conf
M puppet/modules/cgroup/manifests/init.pp
D puppet/modules/cgroup/templates/systemd/cgrulesengd.erb
M puppet/modules/citoid/manifests/init.pp
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/eventlogging/manifests/devserver.pp
M puppet/modules/eventlogging/manifests/service.pp
A puppet/modules/eventlogging/templates/devserver.upstart.erb
A puppet/modules/eventlogging/templates/service.upstart.erb
D puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
D puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
M puppet/modules/git/manifests/init.pp
A puppet/modules/hhvm/files/hhvm.conf
D puppet/modules/hhvm/manifests/fcgi.pp
M puppet/modules/hhvm/manifests/init.pp
D puppet/modules/hhvm/templates/systemd/hhvm.erb
A puppet/modules/kafka/files/upstart
M puppet/modules/kafka/manifests/init.pp
D puppet/modules/kafka/templates/log4j.properties.erb
D puppet/modules/kafka/templates/systemd/kafka.erb
A puppet/modules/mariadb
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/jobrunner.pp
D puppet/modules/mediawiki/manifests/ready_service.pp
A puppet/modules/mediawiki/templates/jobchron.conf.erb
A puppet/modules/mediawiki/templates/jobrunner.conf.erb
M puppet/modules/mediawiki/templates/jobrunner.json.erb
A puppet/modules/mediawiki/templates/mediawiki-bridge.conf.erb
D puppet/modules/mediawiki/templates/systemd/jobchron.erb
D puppet/modules/mediawiki/templates/systemd/jobrunner.erb
D puppet/modules/mediawiki/templates/systemd/mediawiki-ready.erb
D puppet/modules/mediawiki/templates/wait-for-mediawiki.sh.erb
M puppet/modules/misc/files/mediawiki_vagrant_motd
M puppet/modules/misc/manifests/init.pp
M puppet/modules/motd/manifests/init.pp
D puppet/modules/mwv/manifests/cachefilesd.pp
M puppet/modules/mwv/manifests/init.pp
D puppet/modules/mwv/manifests/packages.pp
M puppet/modules/nginx
M puppet/modules/npm/files/nodesource.sources.list
M puppet/modules/payments/files/Main_Page.wiki
M puppet/modules/postfix/manifests/init.pp
D puppet/modules/role/files/keystone/logging.conf
D puppet/modules/role/files/keystone/policy.json
D puppet/modules/role/files/keystone/use-openstack
D puppet/modules/role/files/keystone/wmfkeystonehooks.egg-info/PKG-INFO
D puppet/modules/role/files/keystone/wmfkeystonehooks.egg-info/entry_points.txt
D puppet/modules/role/files/keystone/wmfkeystonehooks/__init__.py
D puppet/modules/role/files/keystone/wmfkeystonehooks/wmfkeystonehooks.py
D puppet/modules/role/files/striker/20160916-01-initial.sql
M puppet/modules/role/manifests/cirrussearch.pp
M puppet/modules/role/manifests/citoid.pp
D puppet/modules/role/manifests/keystone.pp
M puppet/modules/role/manifests/ores.pp
M puppet/modules/role/manifests/striker.pp
M puppet/modules/role/manifests/timedmediahandler.pp
D puppet/modules/role/manifests/timeless.pp
A puppet/modules/role/manifests/trafficserver.pp
A puppet/modules/role/manifests/zotero.pp
A puppet/modules/role/settings/trafficserver.yaml
M puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
M puppet/modules/role/templates/elk/monolog.php.erb
D puppet/modules/role/templates/keystone/admin-openrc.erb
D puppet/modules/role/templates/keystone/bootstrap_keystone.erb
D puppet/modules/role/templates/keystone/keystone.conf.erb
M puppet/modules/role/templates/swift/apache2.conf.erb
M puppet/modules/role/templates/wikidata/shared.php.erb
M puppet/modules/rsyslog/manifests/init.pp
M puppet/modules/ruby/manifests/bundle.pp
A puppet/modules/ruby/manifests/default.pp
A puppet/modules/ruby/manifests/gem.pp
M puppet/modules/ruby/manifests/init.pp
A 

[MediaWiki-commits] [Gerrit] operations...python-json-logger[master]: Initial deb packaging

[Ayounsi (Code Review)]

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

Change subject: Initial deb packaging
..

Initial deb packaging

Change-Id: I1386a55485d8ea776679851a32f403de0a191135
---
A debian/changelog
A debian/compat
A debian/control
A debian/rules
A debian/source/format
A debian/watch
6 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-json-logger 
refs/changes/07/394507/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ef755be
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-json-logger (0.1.8-1) unstable; urgency=low
+
+  * Initial release
+
+ -- arzhel Younsi   Thu, 30 Nov 2017 16:03:00 -0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..a132cdb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: python-json-logger
+Maintainer: Arzhel Younsi 
+Section: python
+Priority: optional
+Build-Depends: dh-python, python-setuptools (>= 0.6b3), python-all (>= 
2.6.6-3), debhelper (>= 8), python (>= 2.6.6-3~)
+Standards-Version: 3.9.3
+Homepage: http://github.com/madzak/python-json-logger
+
+Package: python-json-logger
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: A python library adding a json log formatter
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..a7e6ebb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=python-json-logger
+%:
+   dh $@ --with python2 --buildsystem=pybuild
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..085ba90
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+# please also check http://pypi.debian.net/python-json-logger/watch
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/python-json-logger/python-json-logger-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1386a55485d8ea776679851a32f403de0a191135
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-json-logger
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch all wikis to HTML5 section IDs

[jenkins-bot (Code Review)]

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

Change subject: Switch all wikis to HTML5 section IDs
..


Switch all wikis to HTML5 section IDs

Bug: T152540
Bug: T175725
Change-Id: Iadf22f73b5fbef78b1b417c0ee01cb6331b37816
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 13 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cd59a11..107d697 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19732,19 +19732,7 @@
 
 // T152540
 'wgFragmentMode' => [
-   'default' => [ 'legacy', 'html5' ],
-   'testwiki' => [ 'html5', 'legacy' ],
-   'test2wiki' => [ 'html5', 'legacy' ],
-   'mediawikiwiki' => [ 'html5', 'legacy' ],
-   'ruwiki' => [ 'html5', 'legacy' ],
-   'ruwikibooks' => [ 'html5', 'legacy' ],
-   'ruwikimedia' => [ 'html5', 'legacy' ],
-   'ruwikinews' => [ 'html5', 'legacy' ],
-   'ruwikiquote' => [ 'html5', 'legacy' ],
-   'ruwikisource' => [ 'html5', 'legacy' ],
-   'ruwikiversity' => [ 'html5', 'legacy' ],
-   'ruwikivoyage' => [ 'html5', 'legacy' ],
-   'ruwiktionary' => [ 'html5', 'legacy' ],
+   'default' => [ 'html5', 'legacy' ],
 ],
 
 'wmgUse3d' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadf22f73b5fbef78b1b417c0ee01cb6331b37816
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Title: Use a more proper way of detecting whether interwikis...

[jenkins-bot (Code Review)]

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

Change subject: Title: Use a more proper way of detecting whether interwikis 
are local
..


Title: Use a more proper way of detecting whether interwikis are local

Bug: T181575
Change-Id: Ifcfe609ce01b174120b81b8c0bf82c4ed6077641
---
M includes/Title.php
M tests/phpunit/includes/TitleTest.php
2 files changed, 53 insertions(+), 1 deletion(-)

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



diff --git a/includes/Title.php b/includes/Title.php
index 829be44..d0d77e3 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1464,7 +1464,9 @@
public function getFragmentForURL() {
if ( !$this->hasFragment() ) {
return '';
-   } elseif ( $this->isExternal() && !$this->getTransWikiID() ) {
+   } elseif ( $this->isExternal()
+   && !self::getInterwikiLookup()->fetch( 
$this->mInterwiki )->isLocal()
+   ) {
return '#' . Sanitizer::escapeIdForExternalInterwiki( 
$this->getFragment() );
}
return '#' . Sanitizer::escapeIdForLink( $this->getFragment() );
diff --git a/tests/phpunit/includes/TitleTest.php 
b/tests/phpunit/includes/TitleTest.php
index 5a92b99..75e0c3e 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -911,4 +911,54 @@
public function testGetPrefixedDBKey( Title $title, $expected ) {
$this->assertEquals( $expected, $title->getPrefixedDBkey() );
}
+
+   /**
+* @dataProvider provideGetFragmentForURL
+*
+* @param string $titleStr
+* @param string $expected
+*/
+   public function testGetFragmentForURL( $titleStr, $expected ) {
+   $this->setMwGlobals( [
+   'wgFragmentMode' => [ 'html5' ],
+   'wgExternalInterwikiFragmentMode' => 'legacy',
+   ] );
+   $dbw = wfGetDB( DB_MASTER );
+   $dbw->insert( 'interwiki',
+   [
+   [
+   'iw_prefix' => 'de',
+   'iw_url' => 
'http://de.wikipedia.org/wiki/',
+   'iw_api' => 
'http://de.wikipedia.org/w/api.php',
+   'iw_wikiid' => 'dewiki',
+   'iw_local' => 1,
+   'iw_trans' => 0,
+   ],
+   [
+   'iw_prefix' => 'zz',
+   'iw_url' => 'http://zzwiki.org/wiki/',
+   'iw_api' => 
'http://zzwiki.org/w/api.php',
+   'iw_wikiid' => 'zzwiki',
+   'iw_local' => 0,
+   'iw_trans' => 0,
+   ],
+   ],
+   __METHOD__,
+   [ 'IGNORE' ]
+   );
+
+   $title = Title::newFromText( $titleStr );
+   self::assertEquals( $expected, $title->getFragmentForURL() );
+
+   $dbw->delete( 'interwiki', '*', __METHOD__ );
+   }
+
+   public function provideGetFragmentForURL() {
+   return [
+   [ 'Foo', '' ],
+   [ 'Foo#ümlåût', '#ümlåût' ],
+   [ 'de:Foo#Bå®', '#Bå®' ],
+   [ 'zz:Foo#тест', '#.D1.82.D0.B5.D1.81.D1.82' ],
+   ];
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcfe609ce01b174120b81b8c0bf82c4ed6077641
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Make WANObjectCache interim caching not interfe...

[jenkins-bot (Code Review)]

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

Change subject: objectcache: Make WANObjectCache interim caching not interfere 
with ChronologyProtector
..


objectcache: Make WANObjectCache interim caching not interfere with 
ChronologyProtector

Also removed useless line from testLockTSE(). That would have needed
to be using $this->internalCache and those locks are freed immediately.

Bug: T180035
Change-Id: Ida1a923f779aaf8410da76643457d2200da6cb20
---
M includes/Setup.php
M includes/libs/objectcache/WANObjectCache.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
3 files changed, 94 insertions(+), 11 deletions(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index 081ea68..d6f4b2f 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -736,17 +736,20 @@
 
 // Initialize the request object in $wgRequest
 $wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
-// Set user IP/agent information for causal consistency purposes
+// Set user IP/agent information for causal consistency purposes.
+// The cpPosTime cookie has no prefix and is set by 
MediaWiki::preOutputCommit().
+$cpPosTime = $wgRequest->getFloat( 'cpPosTime', $wgRequest->getCookie( 
'cpPosTime', '' ) );
 MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' 
),
-   // The cpPosTime cookie has no prefix and is set by 
MediaWiki::preOutputCommit()
-   'ChronologyPositionTime' => $wgRequest->getFloat(
-   'cpPosTime',
-   $wgRequest->getCookie( 'cpPosTime', '' )
-   )
+   'ChronologyPositionTime' => $cpPosTime
 ] );
+// Make sure that caching does not compromise the consistency improvements
+if ( $cpPosTime ) {
+   
MediaWikiServices::getInstance()->getMainWANObjectCache()->useInterimHoldOffCaching(
 false );
+}
+unset( $cpPosTime );
 
 // Useful debug output
 if ( $wgCommandLineMode ) {
diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index db27e42..74ec7b9 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -91,6 +91,8 @@
protected $logger;
/** @var StatsdDataFactoryInterface */
protected $stats;
+   /** @var bool Whether to use "interim" caching while keys are 
tombstoned */
+   protected $useInterimHoldOffCaching = true;
 
/** @var int ERR_* constant for the "last error" registry */
protected $lastRelayError = self::ERR_NONE;
@@ -1104,6 +1106,10 @@
 * @return mixed
 */
protected function getInterimValue( $key, $versioned, $minTime, &$asOf 
) {
+   if ( !$this->useInterimHoldOffCaching ) {
+   return false; // disabled
+   }
+
$wrapped = $this->cache->get( self::INTERIM_KEY_PREFIX . $key );
list( $value ) = $this->unwrap( $wrapped, 
$this->getCurrentTime() );
if ( $value !== false && $this->isValid( $value, $versioned, 
$asOf, $minTime ) ) {
@@ -1496,6 +1502,30 @@
}
 
/**
+* Disable the use of brief caching for tombstoned keys
+*
+* When a key is purged via delete(), there normally is a period where 
caching
+* is hold-off limited to an extremely short time. This method will 
disable that
+* caching, forcing the callback to run for any of:
+*   - WANObjectCache::getWithSetCallback()
+*   - WANObjectCache::getMultiWithSetCallback()
+*   - WANObjectCache::getMultiWithUnionSetCallback()
+*
+* This is useful when both:
+*   - a) the database used by the callback is known to be up-to-date 
enough
+*for some particular purpose (e.g. replica DB has applied 
transaction X)
+*   - b) the caller needs to exploit that fact, and therefore needs to 
avoid the
+*use of inherently volatile and possibly stale interim keys
+*
+* @see WANObjectCache::delete()
+* @param bool $enabled Whether to enable interim caching
+* @since 1.31
+*/
+   public function useInterimHoldOffCaching( $enabled ) {
+   $this->useInterimHoldOffCaching = $enabled;
+   }
+
+   /**
 * @param int $flag ATTR_* class constant
 * @return int QOS_* class constant
 * @since 1.28
diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 
b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index df8228d..c2be911 100644
--- 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolforge: bastion local throttling

[Rush (Code Review)]

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

Change subject: toolforge: bastion local throttling
..

toolforge: bastion local throttling

Change-Id: I93bdaf82a0d1ff8f01fccc1b2d6156338db06943
---
M modules/toollabs/manifests/bastion.pp
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index 633038f..2b91e7d 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -72,6 +72,8 @@
 },
 },
 rules  => [
+'*:/usr/bin/php cpu  /scripts',
+'%  memory   /scripts',
 '*:/usr/bin/rubycpu  /scripts',
 '%  memory   /scripts',
 '*:/usr/bin/ruby1.9.1   cpu  /scripts',
@@ -92,8 +94,12 @@
 '%  memory   /scripts',
 '*:/usr/bin/tclsh8.6cpu  /scripts',
 '%  memory   /scripts',
+'*:/usr/bin/tclsh8.7cpu  /scripts',
+'%  memory   /scripts',
 '*:/shared/bin/node cpu  /scripts',
 '%  memory   /scripts',
+'*:/data/project/shared/tcl/bin/tclsh8.7cpu  
/scripts',
+'%  memory   
/scripts',
 ],
 }
 
@@ -112,6 +118,8 @@
 '*:/usr/bin/vim.diff  memory  /utilities',
 '*:/usr/bin/vim.tiny  memory  /utilities',
 '*:/usr/bin/nano  memory  /utilities',
+'*:/usr/bin/unzip cpu /utilities',
+'%memory  /utilities',
 '*:/bin/tar   cpu /utilities',
 '%memory  /utilities',
 '*:/bin/bzip2  cpu /utilities',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove @defgroup from DefaultSettings.php

[jenkins-bot (Code Review)]

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

Change subject: Remove @defgroup from DefaultSettings.php
..


Remove @defgroup from DefaultSettings.php

This renders in Doxygen as a blank page in the "Modules" sidebar,
doesn't seem to serve any purpose.

No mentions of "Globalsettings" or "Global settings" elsewhere
in the repository.

Change-Id: I2c03b4190c899f2acff400d63bbd3df09f8d49d1
---
M includes/DefaultSettings.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 21efb28..c17bf7e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -39,10 +39,6 @@
  */
 
 /**
- * @defgroup Globalsettings Global settings
- */
-
-/**
  * @cond file_level_code
  * This is not a valid entry point, perform no further processing unless
  * MEDIAWIKI is defined

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c03b4190c899f2acff400d63bbd3df09f8d49d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove ArticleCreationWorkflow from extension-list-labs, it'...

[jenkins-bot (Code Review)]

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

Change subject: Remove ArticleCreationWorkflow from extension-list-labs, it's 
in prod
..


Remove ArticleCreationWorkflow from extension-list-labs, it's in prod

Change-Id: I853c393a92978ceeb3c94066b5a9a92e8924377f
---
M wmf-config/extension-list-labs
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index e61c08c..f4fd45c 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,3 @@
-$IP/extensions/ArticleCreationWorkflow/extension.json
 $IP/extensions/EmailAuth/extension.json
 $IP/extensions/FileImporter/extension.json
 $IP/extensions/FileExporter/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I853c393a92978ceeb3c94066b5a9a92e8924377f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Add @ingroup to RedisBagOStuff

[Krinkle (Code Review)]

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

Change subject: objectcache: Add @ingroup to RedisBagOStuff
..

objectcache: Add @ingroup to RedisBagOStuff

Was missing from "Cache" group, as well as from the cross-component
"Redis" group.

Change-Id: I52ebc93cf472a4acc383742e0ea5c15c5a6db537
---
M includes/libs/objectcache/RedisBagOStuff.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/394505/1

diff --git a/includes/libs/objectcache/RedisBagOStuff.php 
b/includes/libs/objectcache/RedisBagOStuff.php
index 583ec37..f720010 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -23,7 +23,10 @@
 /**
  * Redis-based caching module for redis server >= 2.6.12
  *
- * @note: avoid use of Redis::MULTI transactions for twemproxy support
+ * @note Avoid use of Redis::MULTI transactions for twemproxy support
+ *
+ * @ingroup Cache
+ * @ingroup Redis
  */
 class RedisBagOStuff extends BagOStuff {
/** @var RedisConnectionPool */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52ebc93cf472a4acc383742e0ea5c15c5a6db537
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/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] operations/mediawiki-config[master]: Remove AdvancedSearch inclusion in beta, it's in prod

[Chad (Code Review)]

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

Change subject: Remove AdvancedSearch inclusion in beta, it's in prod
..

Remove AdvancedSearch inclusion in beta, it's in prod

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


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 6ea6db0..4844d73 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -322,10 +322,6 @@
wfLoadExtension( 'PerformanceInspector' );
 }
 
-if ( $wmgUseAdvancedSearch ) {
-   wfLoadExtension( 'AdvancedSearch' );
-}
-
 if ( $wmgUseUniversalLanguageSelector ) {
$wgDefaultUserOptions['compact-language-links'] = 0;
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove timeless inclusion in labs, prod has it

[Chad (Code Review)]

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

Change subject: Remove timeless inclusion in labs, prod has it
..

Remove timeless inclusion in labs, prod has it

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


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index c79aa17..6ea6db0 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -344,11 +344,6 @@
};
 }
 
-if ( $wmgUseTimeless ) {
-   // Test new Isarra responsive skin
-   wfLoadSkin( 'Timeless' ); // T160643
-}
-
 if ( $wmgUseReadingLists ) {
wfLoadExtension( 'ReadingLists' );
$wgReadingListsCentralWiki = 'metawiki';

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix composer-test example-run.sh

[jenkins-bot (Code Review)]

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

Change subject: Fix composer-test example-run.sh
..


Fix composer-test example-run.sh

The example-run for this image has not been updated since the creation
of ci-src-setup. As a result, the example-run will fail since the image
no longer checks out source code by itself.

Change-Id: I81bc37b6f125d9db4a8790e7eaebe75de20c7563
---
M dockerfiles/composer-test/example-run.sh
1 file changed, 14 insertions(+), 7 deletions(-)

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



diff --git a/dockerfiles/composer-test/example-run.sh 
b/dockerfiles/composer-test/example-run.sh
index a9b3a36..29c2b67 100644
--- a/dockerfiles/composer-test/example-run.sh
+++ b/dockerfiles/composer-test/example-run.sh
@@ -1,11 +1,18 @@
 #!/bin/bash
 
-install --mode 777 --directory log
+mkdir -m 2777 -p log src cache
+
+git init src
+git -C src fetch --quiet --depth 1 \
+"https://gerrit.wikimedia.org/r/integration/jenkins; \
+"refs/changes/31/316231/4"
+git -C src checkout FETCH_HEAD
+
 docker run \
 --rm --tty \
---env ZUUL_URL=https://gerrit.wikimedia.org/r \
---env ZUUL_PROJECT=integration/jenkins \
---env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \
---env ZUUL_REF=refs/changes/31/316231/4 \
---volume /$(pwd)/log://var/lib/jenkins/log \
- wmfreleng/composer-test:latest
+--volume /$(pwd)/log:/log \
+--volume /$(pwd)/cache:/cache \
+--volume /$(pwd)/src:/src \
+wmfreleng/composer-test:latest
+
+rm -rf src log cache

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove some dumb headers with my name in it

[jenkins-bot (Code Review)]

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

Change subject: Remove some dumb headers with my name in it
..


Remove some dumb headers with my name in it

Change-Id: Ib34b623b47fb92f1383bc5c55c50a16dd6d49abd
---
M includes/api/ApiPurge.php
M includes/db/CloneDatabase.php
M maintenance/Maintenance.php
M maintenance/doMaintenance.php
4 files changed, 0 insertions(+), 11 deletions(-)

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



diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index 4b8ce7f..b7cfc2c 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -1,12 +1,6 @@
 
- * https://www.mediawiki.org/
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 10082e9..255892b 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -50,7 +50,6 @@
  * is the execute() method. See docs/maintenance.txt for more info
  * and a quick demo of how to use it.
  *
- * @author Chad Horohoe 
  * @since 1.16
  * @ingroup Maintenance
  */
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index b5beef6..2ac756c 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @author Chad Horohoe 
  * @file
  * @ingroup Maintenance
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib34b623b47fb92f1383bc5c55c50a16dd6d49abd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove @defgroup from DefaultSettings.php

[Krinkle (Code Review)]

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

Change subject: Remove @defgroup from DefaultSettings.php
..

Remove @defgroup from DefaultSettings.php

This renders in Doxygen as a blank page in the "Modules" sidebar,
doesn't seem to serve any purpose.

No mentions of "Globalsettings" or "Global settings" elsewhere
in the repository.

Change-Id: I2c03b4190c899f2acff400d63bbd3df09f8d49d1
---
M includes/DefaultSettings.php
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/394502/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 21efb28..c17bf7e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -39,10 +39,6 @@
  */
 
 /**
- * @defgroup Globalsettings Global settings
- */
-
-/**
  * @cond file_level_code
  * This is not a valid entry point, perform no further processing unless
  * MEDIAWIKI is defined

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c03b4190c899f2acff400d63bbd3df09f8d49d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/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] operations/puppet[production]: parsoid: remove ganglia

[Dzahn (Code Review)]

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

Change subject: parsoid: remove ganglia
..


parsoid: remove ganglia

Bug: T177225
Change-Id: Ieede30ae08900822395ce61a40684bd9f261cbd9
---
M hieradata/role/common/parsoid.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/parsoid.yaml 
b/hieradata/role/common/parsoid.yaml
index f686f98..e4b31d9 100644
--- a/hieradata/role/common/parsoid.yaml
+++ b/hieradata/role/common/parsoid.yaml
@@ -2,6 +2,7 @@
   - parsoid-roots
   - parsoid-admin
 cluster: parsoid
+standard::has_ganglia: false
 role::lvs::realserver::pools:
   parsoid: {}
 parsoid::discovery: 'api-rw'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Unserialize compact diff when it's string not array

[jenkins-bot (Code Review)]

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

Change subject: Unserialize compact diff when it's string not array
..


Unserialize compact diff when it's string not array

Bug: T181760
Change-Id: Idac3c907944eee1b748e9d6c72de9111acccb6d2
---
M lib/includes/Changes/EntityChange.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/lib/includes/Changes/EntityChange.php 
b/lib/includes/Changes/EntityChange.php
index c10438b..9c6755c 100644
--- a/lib/includes/Changes/EntityChange.php
+++ b/lib/includes/Changes/EntityChange.php
@@ -374,7 +374,9 @@
$info['diff'] = $factory->newFromArray( $info['diff'] );
}
 
-   if ( isset( $info['compactDiff'] ) && is_array( 
$info['compactDiff'] ) && $info['compactDiff'] ) {
+   if ( isset( $info['compactDiff'] ) && is_string( 
$info['compactDiff'] ) &&
+   $info['compactDiff']
+   ) {
$compactDiff = ( new EntityDiffChangedAspectsFactory() 
)->newFromEntityDiff(
new Diff()
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idac3c907944eee1b748e9d6c72de9111acccb6d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Ladsgroup 
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]: Remove ArticleCreationWorkflow from extension-list-labs, it'...

[Chad (Code Review)]

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

Change subject: Remove ArticleCreationWorkflow from extension-list-labs, it's 
in prod
..

Remove ArticleCreationWorkflow from extension-list-labs, it's in prod

Change-Id: I853c393a92978ceeb3c94066b5a9a92e8924377f
---
M wmf-config/extension-list-labs
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index e61c08c..f4fd45c 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,3 @@
-$IP/extensions/ArticleCreationWorkflow/extension.json
 $IP/extensions/EmailAuth/extension.json
 $IP/extensions/FileImporter/extension.json
 $IP/extensions/FileExporter/extension.json

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove some dumb headers with my name in it

[Chad (Code Review)]

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

Change subject: Remove some dumb headers with my name in it
..

Remove some dumb headers with my name in it

Change-Id: Ib34b623b47fb92f1383bc5c55c50a16dd6d49abd
---
M includes/api/ApiPurge.php
M includes/db/CloneDatabase.php
M maintenance/Maintenance.php
M maintenance/doMaintenance.php
4 files changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/394500/1

diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index 4b8ce7f..b7cfc2c 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -1,12 +1,6 @@
 
- * https://www.mediawiki.org/
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 10082e9..255892b 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -50,7 +50,6 @@
  * is the execute() method. See docs/maintenance.txt for more info
  * and a quick demo of how to use it.
  *
- * @author Chad Horohoe 
  * @since 1.16
  * @ingroup Maintenance
  */
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index b5beef6..2ac756c 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @author Chad Horohoe 
  * @file
  * @ingroup Maintenance
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib34b623b47fb92f1383bc5c55c50a16dd6d49abd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

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

[jenkins-bot (Code Review)]

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

Change subject: wdbuild: Add wikidata extensions to extension-list
..


wdbuild: Add wikidata extensions to extension-list

Also removes the code adding a file from the build
to $wgExtensionEntryPointListFiles

Bug: T177060
Change-Id: Ie321c43f91c87bc6848afcbf8c685f0725810d22
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
3 files changed, 9 insertions(+), 14 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 93ab2d5..b529ac4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3136,11 +3136,6 @@
$wgWikiDiff2MovedParagraphDetectionCutoff = 25;
 }
 
-// XXX: T177060
-if ( $wmfRealm !== 'labs' ) {
-   $wgExtensionEntryPointListFiles[] = 
"$IP/extensions/Wikidata/extension-list-wikidata";
-}
-
 if ( $wmgUseCognate ) {
wfLoadExtension( 'Cognate' );
$wgCognateDb = 'cognate_' . $wmgUseCognate;
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 4b0bd29..3b78ade 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -4,6 +4,7 @@
 $IP/extensions/AntiSpoof/extension.json
 $IP/extensions/ApiFeatureUsage/extension.json
 $IP/extensions/ArticleCreationWorkflow/extension.json
+$IP/extensions/ArticlePlaceholder/ArticlePlaceholder.php
 $IP/extensions/Babel/extension.json
 $IP/extensions/BetaFeatures/extension.json
 $IP/extensions/BounceHandler/extension.json
@@ -108,6 +109,7 @@
 $IP/extensions/Poem/extension.json
 $IP/extensions/Popups/extension.json
 $IP/extensions/ProofreadPage/extension.json
+$IP/extensions/PropertySuggester/PropertySuggester.php
 $IP/extensions/PoolCounter/extension.json
 $IP/extensions/QuickSurveys/extension.json
 $IP/extensions/Quiz/extension.json
@@ -149,10 +151,16 @@
 $IP/extensions/UserMerge/extension.json
 $IP/extensions/VipsScaler/extension.json
 $IP/extensions/VisualEditor/extension.json
+$IP/extensions/Wikibase/client/WikibaseClient.php
+$IP/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/WikibaseQuality/WikibaseQuality.php
+$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php
+$IP/extensions/Wikidata.org/WikidataOrg.php
 $IP/extensions/WikidataPageBanner/extension.json
 $IP/extensions/WikiEditor/extension.json
 $IP/extensions/wikihiero/extension.json
 $IP/extensions/WikiLove/extension.json
+$IP/extensions/WikimediaBadges/extension.json
 $IP/extensions/WikimediaEvents/extension.json
 $IP/extensions/WikimediaIncubator/extension.json
 $IP/extensions/WikimediaMessages/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 4e560b1..e61c08c 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -5,12 +5,4 @@
 $IP/extensions/PerformanceInspector/extension.json
 $IP/extensions/ReadingLists/extension.json
 $IP/extensions/Sentry/extension.json
-$IP/extensions/ArticlePlaceholder/ArticlePlaceholder.php
-$IP/extensions/PropertySuggester/PropertySuggester.php
-$IP/extensions/Wikibase/client/WikibaseClient.php
-$IP/extensions/Wikibase/repo/Wikibase.php
-$IP/extensions/Wikidata.org/WikidataOrg.php
-$IP/extensions/WikimediaBadges/extension.json
-$IP/extensions/WikibaseQuality/WikibaseQuality.php
-$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php
-$IP/extensions/Wikidata/extensions/Wikidata.credits.php
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie321c43f91c87bc6848afcbf8c685f0725810d22
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: All-Users and All-Projects to #wikimedia-releng reporting

[jenkins-bot (Code Review)]

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

Change subject: All-Users and All-Projects to #wikimedia-releng reporting
..


All-Users and All-Projects to #wikimedia-releng reporting

Change-Id: I86d31e9e5cb9cc7aae8ac02327815105606d1a5b
---
M gerrit-channels.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index 54b14b6..2af8ce8 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -160,6 +160,8 @@
 mediawiki/tools/release:
 mediawiki/tools/releng:
 mediawiki/tools/scap:
+All-Projects:
+All-Users:
 # All commits to a betacluster branch goes here
 .*:
 branch: "betacluster"
@@ -220,4 +222,3 @@
  labs/tools/zppixbot:
  labs/tools/quarrybot-enwiki:
  labs/icinga2:
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86d31e9e5cb9cc7aae8ac02327815105606d1a5b
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix composer-test example-run.sh

[Thcipriani (Code Review)]

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

Change subject: Fix composer-test example-run.sh
..

Fix composer-test example-run.sh

The example-run for this image has not been updated since the creation
of ci-src-setup. As a result, the example-run will fail since the image
no longer checks out source code by itself.

Change-Id: I81bc37b6f125d9db4a8790e7eaebe75de20c7563
---
M dockerfiles/composer-test/example-run.sh
1 file changed, 15 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/99/394499/1

diff --git a/dockerfiles/composer-test/example-run.sh 
b/dockerfiles/composer-test/example-run.sh
index a9b3a36..dc759d1 100644
--- a/dockerfiles/composer-test/example-run.sh
+++ b/dockerfiles/composer-test/example-run.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
 
-install --mode 777 --directory log
+mkdir -m 2777 -p log src cache
+
+git init src
+git -C src fetch --quiet --depth 1 \
+"https://gerrit.wikimedia.org/r/integration/jenkins; \
+"refs/changes/31/316231/4"
+git -C src checkout FETCH_HEAD
+
 docker run \
 --rm --tty \
---env ZUUL_URL=https://gerrit.wikimedia.org/r \
---env ZUUL_PROJECT=integration/jenkins \
---env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \
---env ZUUL_REF=refs/changes/31/316231/4 \
---volume /$(pwd)/log://var/lib/jenkins/log \
- wmfreleng/composer-test:latest
+--volume /$(pwd)/log:/log \
+--volume /$(pwd)/cache:/cache \
+--volume /$(pwd)/src:/src \
+wmfreleng/composer-test:latest
+# docker-registry.wikimedia.org/releng/composer-test:0.1.0
+
+rm -rf src log cache

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wdbuild: Remove Wikibase-buildentry.php config file (empty)

[jenkins-bot (Code Review)]

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

Change subject: wdbuild: Remove Wikibase-buildentry.php config file (empty)
..


wdbuild: Remove Wikibase-buildentry.php config file (empty)

Change-Id: I0af71546ad4bd1d74dabbfc3a0832ac7f779d273
---
D wmf-config/Wikibase-buildentry.php
M wmf-config/Wikibase.php
2 files changed, 17 insertions(+), 25 deletions(-)

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



diff --git a/wmf-config/Wikibase-buildentry.php 
b/wmf-config/Wikibase-buildentry.php
deleted file mode 100644
index 573420c..000
--- a/wmf-config/Wikibase-buildentry.php
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/wikimedia/mediawiki-extensions-Wikidata/blob/master/Wikidata.php
- * This file has been created as part of 
https://phabricator.wikimedia.org/T176948 (Killing the Wikidata build)
- * Various things have been changed (with the originals left commented)
- */
-
-if ( !empty( $wmgUseWikibaseRepo ) ) {
-   include_once "$IP/extensions/Wikibase/repo/Wikibase.php";
-   include_once "$IP/extensions/Wikidata.org/WikidataOrg.php";
-   include_once "$IP/extensions/PropertySuggester/PropertySuggester.php";
-   include_once "$IP/extensions/WikibaseQuality/WikibaseQuality.php";
-   include_once 
"$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php";
-}
-
-if ( !empty( $wmgUseWikibaseClient ) ) {
-   include_once "$IP/extensions/Wikibase/client/WikibaseClient.php";
-   wfLoadExtension( 'WikimediaBadges' );
-   if ( !empty( $wmgUseArticlePlaceholder ) ) {
-   wfLoadExtension( 'ArticlePlaceholder' );
-   }
-}
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index dba9874..2ea0822 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -1,8 +1,22 @@
 https://gerrit.wikimedia.org/r/394216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0af71546ad4bd1d74dabbfc3a0832ac7f779d273
Gerrit-PatchSet: 8
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Remove deprecated minifier config vars

[jenkins-bot (Code Review)]

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

Change subject: resourceloader: Remove deprecated minifier config vars
..


resourceloader: Remove deprecated minifier config vars

Unused, their values have been hard-coded since 1.27.
No uses anywhere in Wikimedia Git, besides their definition
in this file.

Change-Id: I6689274d0ad028e2c468560816ab753b345048e9
---
M RELEASE-NOTES-1.31
M includes/DefaultSettings.php
2 files changed, 2 insertions(+), 17 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index b32e3e7..4b55f4b 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -17,6 +17,8 @@
   not have the right to mark things patrolled.
 * Wikis that contain imported revisions or CentralAuth global blocks should run
   maintenance/cleanupUsersWithNoId.php.
+* $wgResourceLoaderMinifierStatementsOnOwnLine and 
$wgResourceLoaderMinifierMaxLineLength
+  were removed (deprecated since 1.27).
 
 === New features in 1.31 ===
 * Wikimedia\Rdbms\IDatabase->select() and similar methods now support
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cc9622e..21efb28 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3686,23 +3686,6 @@
 $wgResourceLoaderDebug = false;
 
 /**
- * Put each statement on its own line when minifying JavaScript. This makes
- * debugging in non-debug mode a bit easier.
- *
- * @deprecated since 1.27: Always false; no longer configurable.
- */
-$wgResourceLoaderMinifierStatementsOnOwnLine = false;
-
-/**
- * Maximum line length when minifying JavaScript. This is not a hard maximum:
- * the minifier will try not to produce lines longer than this, but may be
- * forced to do so in certain cases.
- *
- * @deprecated since 1.27: Always 1,000; no longer configurable.
- */
-$wgResourceLoaderMinifierMaxLineLength = 1000;
-
-/**
  * Whether to ensure the mediawiki.legacy library is loaded before other 
modules.
  *
  * @deprecated since 1.26: Always declare dependencies.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6689274d0ad028e2c468560816ab753b345048e9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jforrester 
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...ProofreadPage[master]: Make PageContentHander::getAutosummary() compatible with its...

[jenkins-bot (Code Review)]

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

Change subject: Make PageContentHander::getAutosummary() compatible with its 
parents
..


Make PageContentHander::getAutosummary() compatible with its parents

Bug: T181760
Change-Id: Ie5b796af9944c6e14fe491dd859a32064bcdc9ba
---
M includes/page/PageContentHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index ac160ca..55b3ed3 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -291,7 +291,7 @@
 * @see ContentHandler::getAutosummary
 */
public function getAutosummary(
-   Content $oldContent = null, Content $newContent = null, $flags
+   Content $oldContent = null, Content $newContent = null, $flags 
= 0
) {
$summary = parent::getAutosummary( $oldContent, $newContent, 
$flags );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5b796af9944c6e14fe491dd859a32064bcdc9ba
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Ladsgroup 
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]: Make ChronologyProtector actually use cpPosTime cookies

[jenkins-bot (Code Review)]

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

Change subject: Make ChronologyProtector actually use cpPosTime cookies
..


Make ChronologyProtector actually use cpPosTime cookies

Setup.php was only injected the value from $_GET. LBFactory used
to check both before 0e5cd18b74d83c50, with the cookie check left
in LBFactoryMW. After d175b391ae2a7, LBFactoryMW class switched to
the default LBFactory method for making a ChronologyProtector
instance, so the cookie check was lost there too.

This means that an HTTP GET request due to a redirect from a POST
request will still make sure the DB position store is up-to-date.
This only matters is that store uses replication (e.g. cross DC).

Also refactor LBFactory handling of the cpPosTime URL parameter.

Change-Id: Ie5744577609f4c193cacd71334f92b30f02e3846
---
M includes/Setup.php
M includes/libs/rdbms/lbfactory/ILBFactory.php
M includes/libs/rdbms/lbfactory/LBFactory.php
3 files changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index 4c281b1..081ea68 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -734,13 +734,18 @@
$wgDBerrorLogTZ = $wgLocaltimezone;
 }
 
-// initialize the request object in $wgRequest
+// Initialize the request object in $wgRequest
 $wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
 // Set user IP/agent information for causal consistency purposes
 MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
-   'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' 
)
+   'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' 
),
+   // The cpPosTime cookie has no prefix and is set by 
MediaWiki::preOutputCommit()
+   'ChronologyPositionTime' => $wgRequest->getFloat(
+   'cpPosTime',
+   $wgRequest->getCookie( 'cpPosTime', '' )
+   )
 ] );
 
 // Useful debug output
diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php 
b/includes/libs/rdbms/lbfactory/ILBFactory.php
index f6d080e..697af0e 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -319,6 +319,7 @@
 *   - IPAddress : IP address
 *   - UserAgent : User-Agent HTTP header
 *   - ChronologyProtection : cookie/header value specifying 
ChronologyProtector usage
+*   - ChronologyPositionTime: timestamp used to get up-to-date DB 
positions for the agent
 */
public function setRequestInfo( array $info );
 }
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php 
b/includes/libs/rdbms/lbfactory/LBFactory.php
index c891fb6..ef716b6 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -115,7 +115,8 @@
$this->requestInfo = [
'IPAddress' => isset( $_SERVER[ 'REMOTE_ADDR' ] ) ? 
$_SERVER[ 'REMOTE_ADDR' ] : '',
'UserAgent' => isset( $_SERVER['HTTP_USER_AGENT'] ) ? 
$_SERVER['HTTP_USER_AGENT'] : '',
-   'ChronologyProtection' => 'true'
+   'ChronologyProtection' => 'true',
+   'ChronologyPositionTime' => isset( $_GET['cpPosTime'] ) 
? $_GET['cpPosTime'] : null
];
 
$this->cliMode = isset( $conf['cliMode'] ) ? $conf['cliMode'] : 
PHP_SAPI === 'cli';
@@ -440,7 +441,7 @@
'ip' => $this->requestInfo['IPAddress'],
'agent' => $this->requestInfo['UserAgent'],
],
-   isset( $_GET['cpPosTime'] ) ? $_GET['cpPosTime'] : null
+   $this->requestInfo['ChronologyPositionTime']
);
$this->chronProt->setLogger( $this->replLogger );
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make EntityHandler::getAutosummary() compatible with its par...

[jenkins-bot (Code Review)]

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

Change subject: Make EntityHandler::getAutosummary() compatible with its parents
..


Make EntityHandler::getAutosummary() compatible with its parents

Bug: T181760
Change-Id: Icf1a45bc83b1ee2a4872cb06c79c865b8cbb9a15
---
M repo/includes/Content/EntityHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index fe2752f..9daf89e 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -264,7 +264,7 @@
public function getAutosummary(
Content $oldContent = null,
Content $newContent = null,
-   $flags
+   $flags = 0
) {
return '';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf1a45bc83b1ee2a4872cb06c79c865b8cbb9a15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wdbuild: Remove wmgUseWikidataBuild

[jenkins-bot (Code Review)]

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

Change subject: wdbuild: Remove wmgUseWikidataBuild
..


wdbuild: Remove wmgUseWikidataBuild

Change-Id: Ia3569683a9e04066b2262fed402cb02079b44452
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase-buildentry.php
3 files changed, 12 insertions(+), 50 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 243f463..00c2683 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -430,10 +430,6 @@
'default' => false, // T69651
],
 
-   'wmgUseWikidataBuild' => [
-   'default' => false,
-   ],
-
'wmgUseArticlePlaceholder' => [
'default' => false,
'wikidataclient' => true,
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9664855..cd59a11 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18010,10 +18010,6 @@
'wikidata' => true,
 ],
 
-'wmgUseWikidataBuild' => [
-   'default' => false,
-],
-
 'wmgUseWikibaseRepo' => [
'default' => false,
'wikidata' => true,
diff --git a/wmf-config/Wikibase-buildentry.php 
b/wmf-config/Wikibase-buildentry.php
index 11f740b..573420c 100644
--- a/wmf-config/Wikibase-buildentry.php
+++ b/wmf-config/Wikibase-buildentry.php
@@ -5,48 +5,18 @@
  * Various things have been changed (with the originals left commented)
  */
 
-$wgWikidataBuildBaseDir = $IP . '/extensions/Wikidata';
+if ( !empty( $wmgUseWikibaseRepo ) ) {
+   include_once "$IP/extensions/Wikibase/repo/Wikibase.php";
+   include_once "$IP/extensions/Wikidata.org/WikidataOrg.php";
+   include_once "$IP/extensions/PropertySuggester/PropertySuggester.php";
+   include_once "$IP/extensions/WikibaseQuality/WikibaseQuality.php";
+   include_once 
"$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php";
+}
 
-if ( $wmgUseWikidataBuild === false ) {
-   if ( !empty( $wmgUseWikibaseRepo ) ) {
-   include_once "$IP/extensions/Wikibase/repo/Wikibase.php";
-   include_once "$IP/extensions/Wikidata.org/WikidataOrg.php";
-   include_once 
"$IP/extensions/PropertySuggester/PropertySuggester.php";
-   include_once 
"$IP/extensions/WikibaseQuality/WikibaseQuality.php";
-   include_once 
"$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php";
+if ( !empty( $wmgUseWikibaseClient ) ) {
+   include_once "$IP/extensions/Wikibase/client/WikibaseClient.php";
+   wfLoadExtension( 'WikimediaBadges' );
+   if ( !empty( $wmgUseArticlePlaceholder ) ) {
+   wfLoadExtension( 'ArticlePlaceholder' );
}
-
-   if ( !empty( $wmgUseWikibaseClient ) ) {
-   include_once 
"$IP/extensions/Wikibase/client/WikibaseClient.php";
-   wfLoadExtension( 'WikimediaBadges' );
-   if ( !empty( $wmgUseArticlePlaceholder ) ) {
-   wfLoadExtension( 'ArticlePlaceholder' );
-   }
-   }
-
-} else {
-   if ( file_exists( $wgWikidataBuildBaseDir . '/vendor/autoload.php' ) ) {
-   include_once $wgWikidataBuildBaseDir . '/vendor/autoload.php';
-   }
-
-   if ( !empty( $wmgUseWikibaseRepo ) ) {
-   include_once 
"$wgWikidataBuildBaseDir/extensions/Wikibase/repo/Wikibase.php";
-   include_once 
"$wgWikidataBuildBaseDir/extensions/Wikidata.org/WikidataOrg.php";
-   include_once 
"$wgWikidataBuildBaseDir/extensions/PropertySuggester/PropertySuggester.php";
-   include_once 
"$wgWikidataBuildBaseDir/extensions/Quality/WikibaseQuality.php";
-   include_once 
"$wgWikidataBuildBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
-   }
-
-   if ( !empty( $wmgUseWikibaseClient ) ) {
-   include_once 
"$wgWikidataBuildBaseDir/extensions/Wikibase/client/WikibaseClient.php";
-   wfLoadExtension( 'WikimediaBadges', 
"$wgWikidataBuildBaseDir/extensions/WikimediaBadges/extension.json" );
-   if ( !empty( $wmgUseArticlePlaceholder ) ) {
-   wfLoadExtension( 'ArticlePlaceholder', 
"$wgWikidataBuildBaseDir/extensions/ArticlePlaceholder/extension.json" );
-   }
-   }
-
-   // This should be kept until the Wikidata build extension is actually 
turned off
-   // so that we can keep track of the version deployed on Special:Version
-   require_once "$wgWikidataBuildBaseDir/Wikidata.credits.php";
-
 }

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: All-Users and All-Projects to #wikimedia-releng reporting

[Chad (Code Review)]

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

Change subject: All-Users and All-Projects to #wikimedia-releng reporting
..

All-Users and All-Projects to #wikimedia-releng reporting

Change-Id: I86d31e9e5cb9cc7aae8ac02327815105606d1a5b
---
M gerrit-channels.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/98/394498/1

diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index 54b14b6..2af8ce8 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -160,6 +160,8 @@
 mediawiki/tools/release:
 mediawiki/tools/releng:
 mediawiki/tools/scap:
+All-Projects:
+All-Users:
 # All commits to a betacluster branch goes here
 .*:
 branch: "betacluster"
@@ -220,4 +222,3 @@
  labs/tools/zppixbot:
  labs/tools/quarrybot-enwiki:
  labs/icinga2:
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d31e9e5cb9cc7aae8ac02327815105606d1a5b
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...namespaceizer[master]: Added conflict and reserved word detection

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392364 )

Change subject: Added conflict and reserved word detection
..


Added conflict and reserved word detection

Detect conflicts due to two classes being renamed to the same thing.
Exempt existing class_alias() calls. Detect class names that use PHP
reserved words.

Change-Id: I91762c902b049fea472a189073acc87ab0ada85f
---
M bin/dumpCoreAliases.php
M src/CoreAliases.php
A src/ReservedWords.php
3 files changed, 333 insertions(+), 117 deletions(-)

Approvals:
  Tim Starling: Verified
  Anomie: Looks good to me, approved



diff --git a/bin/dumpCoreAliases.php b/bin/dumpCoreAliases.php
index e115c2b..f5b88e0 100644
--- a/bin/dumpCoreAliases.php
+++ b/bin/dumpCoreAliases.php
@@ -9,76 +9,94 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$self = array_shift( $argv );
-
-if ( !count( $argv ) ) {
-   echo "Usage: $self \n";
-   exit( 1 );
+function warnCallback( $msg ) {
+   fwrite( STDERR, "FYI: $msg\n" );
 }
 
-if ( $argv[0] === '--counts' ) {
-   $report = 'counts';
-   array_shift( $argv );
-} elseif ( $argv[0] === '--3col' ) {
-   $report = '3col';
-   array_shift( $argv );
-} elseif ( $argv[0] === '--classes' ) {
-   $report = 'classes';
-   array_shift( $argv );
-} else {
-   $report = 'php';
+function errorCallback( $msg ) {
+   fwrite( STDERR, "ERROR: $msg\n" );
 }
 
-if ( !count( $argv ) ) {
-   echo "Usage: $self \n";
-   exit( 1 );
-}
+function dumpCoreAliases() {
+   global $argv;
 
-$file = $argv[0];
+   $self = array_shift( $argv );
 
-$autoload = AutoloadLoader::getAutoloadClasses( $file );
-if ( $autoload === false ) {
-   echo "Unable to open autoload file $file\n";
-   exit( 1 );
-}
+   if ( !count( $argv ) ) {
+   echo "Usage: $self \n";
+   exit( 1 );
+   }
 
-$ca = new CoreAliases( $autoload );
-$aliases = $ca->getAliases();
-
-asort( $aliases );
-
-$counts = [];
-if ( $report === 'php' ) {
-   print " $new ) {
-   if ( $report === 'classes' ) {
-   print "$old\t$new\n";
-   } elseif ( $report === 'php' ) {
-   print "\t'" .
-   strtr( $old, [ "\\" => "", "'" => "\\'" ] ) .
-   "' => '" .
-   strtr( $new, [ "\\" => "", "'" => "\\'" ] ) .
-   "',\n";
+   if ( $argv[0] === '--counts' ) {
+   $report = 'counts';
+   array_shift( $argv );
+   } elseif ( $argv[0] === '--3col' ) {
+   $report = '3col';
+   array_shift( $argv );
+   } elseif ( $argv[0] === '--classes' ) {
+   $report = 'classes';
+   array_shift( $argv );
} else {
-   if ( preg_match( '/(.*)([^]*)$/', $new, $m ) ) {
-   if ( $report === 'counts' ) {
-   if ( !isset( $counts[$m[1]] ) ) {
-   $counts[$m[1]] = 0;
+   $report = 'php';
+   }
+
+   if ( !count( $argv ) ) {
+   echo "Usage: $self \n";
+   exit( 1 );
+   }
+
+   $file = $argv[0];
+
+   $autoload = AutoloadLoader::getAutoloadClasses( $file );
+   if ( $autoload === false ) {
+   echo "Unable to open autoload file $file\n";
+   exit( 1 );
+   }
+
+   $ca = new CoreAliases( $autoload, 'errorCallback', 'warnCallback' );
+   $aliases = $ca->getAliases();
+   
+   if ( $aliases === false ) {
+   exit( 1 );
+   }
+
+   asort( $aliases );
+
+   $counts = [];
+   if ( $report === 'php' ) {
+   print " $new ) {
+   if ( $report === 'classes' ) {
+   print "$old\t$new\n";
+   } elseif ( $report === 'php' ) {
+   print "\t'" .
+   strtr( $old, [ "\\" => "", "'" => "\\'" ] ) 
.
+   "' => '" .
+   strtr( $new, [ "\\" => "", "'" => "\\'" ] ) 
.
+   "',\n";
+   } else {
+   if ( preg_match( '/(.*)([^]*)$/', $new, $m ) ) {
+   if ( $report === 'counts' ) {
+   if ( !isset( $counts[$m[1]] ) ) {
+   $counts[$m[1]] = 0;
+   }
+   $counts[$m[1]]++;
+   } elseif ( $report === '3col' ) {
+   print "$old\t{$m[1]}\t{$m[2]}\n";
}
-   $counts[$m[1]]++;
-   } elseif ( $report === '3col' ) {
-   print 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Remove unneeded MP3 uploaders group (replaced by extended up...

[jenkins-bot (Code Review)]

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

Change subject: Remove unneeded MP3 uploaders group (replaced by extended 
uploaders)
..


Remove unneeded MP3 uploaders group (replaced by extended uploaders)

Also fixing capitalization of group-extended-uploader-member

Bug: T180002
Change-Id: Id3c8173108979447397ec6e81dfc09c9c9abbf9f
---
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
2 files changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 74f5381..473f714 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -28,11 +28,8 @@
"group-Image-reviewer": "Image reviewers",
"group-Image-reviewer-member": "{{GENDER:$1|image reviewer}}",
"grouppage-Image-reviewer": "{{ns:project}}:Image reviewers",
-   "group-mp3-uploader": "MP3 uploaders",
-   "group-mp3-uploader-member": "{{GENDER:$1|MP3 uploader}}",
-   "grouppage-mp3-uploader": "{{ns:project}}:MP3 uploaders",
"group-extended-uploader": "Extended uploaders",
-   "group-extended-uploader-member": "{{GENDER:$1|Extended uploader}}",
+   "group-extended-uploader-member": "{{GENDER:$1|extended uploader}}",
"grouppage-extended-uploader": "{{ns:project}}:Extended uploaders",
"group-OTRS-member": "OTRS members",
"group-OTRS-member-member": "{{GENDER:$1|OTRS member}}",
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index 50ddc3e..4919bf7 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -57,9 +57,6 @@
"group-Image-reviewer": "{{doc-group|Image-reviewer}}",
"group-Image-reviewer-member": "{{doc-group|Image-reviewer|member}}",
"grouppage-Image-reviewer": "{{doc-group|Image-reviewer|page}}",
-   "group-mp3-uploader": "{{doc-group|mp3-uploader}}",
-   "group-mp3-uploader-member": "{{doc-group|mp3-uploader|member}}",
-   "grouppage-mp3-uploader": "{{doc-group|mp3-uploader|page}}",
"group-extended-uploader": "{{doc-group|extended-uploader}}",
"group-extended-uploader-member": 
"{{doc-group|extended-uploader|member}}",
"grouppage-extended-uploader": "{{doc-group|extended-uploader|page}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3c8173108979447397ec6e81dfc09c9c9abbf9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Remove deprecated minifier config vars

[Krinkle (Code Review)]

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

Change subject: resourceloader: Remove deprecated minifier config vars
..

resourceloader: Remove deprecated minifier config vars

Unused, their values have been hard-coded since 1.27.
No uses anywhere in Wikimedia Git, besides their definition
in this file.

Change-Id: I6689274d0ad028e2c468560816ab753b345048e9
---
M RELEASE-NOTES-1.31
M includes/DefaultSettings.php
2 files changed, 2 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/394497/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index b32e3e7..4b55f4b 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -17,6 +17,8 @@
   not have the right to mark things patrolled.
 * Wikis that contain imported revisions or CentralAuth global blocks should run
   maintenance/cleanupUsersWithNoId.php.
+* $wgResourceLoaderMinifierStatementsOnOwnLine and 
$wgResourceLoaderMinifierMaxLineLength
+  were removed (deprecated since 1.27).
 
 === New features in 1.31 ===
 * Wikimedia\Rdbms\IDatabase->select() and similar methods now support
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cc9622e..21efb28 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3686,23 +3686,6 @@
 $wgResourceLoaderDebug = false;
 
 /**
- * Put each statement on its own line when minifying JavaScript. This makes
- * debugging in non-debug mode a bit easier.
- *
- * @deprecated since 1.27: Always false; no longer configurable.
- */
-$wgResourceLoaderMinifierStatementsOnOwnLine = false;
-
-/**
- * Maximum line length when minifying JavaScript. This is not a hard maximum:
- * the minifier will try not to produce lines longer than this, but may be
- * forced to do so in certain cases.
- *
- * @deprecated since 1.27: Always 1,000; no longer configurable.
- */
-$wgResourceLoaderMinifierMaxLineLength = 1000;
-
-/**
  * Whether to ensure the mediawiki.legacy library is loaded before other 
modules.
  *
  * @deprecated since 1.26: Always declare dependencies.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6689274d0ad028e2c468560816ab753b345048e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/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] mediawiki/core[master]: Fix phpdoc for Category::newFromName

[jenkins-bot (Code Review)]

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

Change subject: Fix phpdoc for Category::newFromName
..


Fix phpdoc for Category::newFromName

Change-Id: I78e18b41acda9aa143360a49fd161b8af1d218be
---
M includes/Category.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/Category.php b/includes/Category.php
index 629962d..9241730 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -119,9 +119,9 @@
/**
 * Factory function.
 *
-* @param array $name A category name (no "Category:" prefix).  It need
+* @param string $name A category name (no "Category:" prefix).  It need
 *   not be normalized, with spaces replaced by underscores.
-* @return mixed Category, or false on a totally invalid name
+* @return Category|bool Category, or false on a totally invalid name
 */
public static function newFromName( $name ) {
$cat = new self();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78e18b41acda9aa143360a49fd161b8af1d218be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wdbuild: Stop loading from build on all wikis

[jenkins-bot (Code Review)]

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

Change subject: wdbuild: Stop loading from build on all wikis
..


wdbuild: Stop loading from build on all wikis

Bug: T176948
Change-Id: I586c5eecf776d426fb5dc39bb58e7b5b40e51041
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1f59029..9664855 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18012,7 +18012,6 @@
 
 'wmgUseWikidataBuild' => [
'default' => false,
-   'enwiki' => true,
 ],
 
 'wmgUseWikibaseRepo' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I586c5eecf776d426fb5dc39bb58e7b5b40e51041
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makr PageContentHander::getAutosummary() compatible with its...

[Addshore (Code Review)]

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

Change subject: Makr PageContentHander::getAutosummary() compatible with its 
parents
..

Makr PageContentHander::getAutosummary() compatible with its parents

Bug: T181760
Change-Id: Ie5b796af9944c6e14fe491dd859a32064bcdc9ba
---
M includes/page/PageContentHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/96/394496/1

diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index ac160ca..55b3ed3 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -291,7 +291,7 @@
 * @see ContentHandler::getAutosummary
 */
public function getAutosummary(
-   Content $oldContent = null, Content $newContent = null, $flags
+   Content $oldContent = null, Content $newContent = null, $flags 
= 0
) {
$summary = parent::getAutosummary( $oldContent, $newContent, 
$flags );
 

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

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

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

[MediaWiki-commits] [Gerrit] All-Projects[refs/meta/config]: Enable lfs on mediawiki/services/ores/editquality

[Chad (Code Review)]

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

Change subject: Enable lfs on mediawiki/services/ores/editquality
..


Enable lfs on mediawiki/services/ores/editquality

set limit to 21gb for lfs objects.

Spoke to the ai team and they said they need at least 20gb on this repo.

Change-Id: I421808672a74c3f30f57e4374551e640463d
---
M lfs.config
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/lfs.config b/lfs.config
index 9c3dd8d..8f2f7c0 100644
--- a/lfs.config
+++ b/lfs.config
@@ -7,3 +7,8 @@
 enabled = true
 maxObjectSize = 3g
 backend = gerrit-fs
+
+[lfs "^mediawiki/services/ores/editquality"]
+enabled = true
+maxObjectSize = 21g
+backend = gerrit-fs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I421808672a74c3f30f57e4374551e640463d
Gerrit-PatchSet: 2
Gerrit-Project: All-Projects
Gerrit-Branch: refs/meta/config
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Halfak 

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