[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Activate subphrases autocomplete on wikisources, mw.org and ...

[jenkins-bot (Code Review)]

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

Change subject: Activate subphrases autocomplete on wikisources, mw.org and 
wikitech
..


Activate subphrases autocomplete on wikisources, mw.org and wikitech

Bug: T146208
Change-Id: I6a85f04ed4fc87c8a13b117f3d8726f86a8f570a
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  Zfilipin: Looks good to me, approved
  DCausse: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e8c1233..d794590 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16702,19 +16702,19 @@
],
'wikisource' => [
'build' => true,
-   'use' => false,
+   'use' => true,
'type' => 'anywords',
'limit' => 10,
],
'mediawikiwiki' => [
'build' => true,
-   'use' => false,
+   'use' => true,
'type' => 'anywords',
'limit' => 10,
],
'wikitech' => [
'build' => true,
-   'use' => false,
+   'use' => true,
'type' => 'anywords',
'limit' => 10,
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a85f04ed4fc87c8a13b117f3d8726f86a8f570a
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move the httpd Proxy rules from stat1002 to localhost for Pivot

[Elukey (Code Review)]

Elukey has uploaded a new change for review.

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

Change subject: Move the httpd Proxy rules from stat1002 to localhost for Pivot
..

Move the httpd Proxy rules from stat1002 to localhost for Pivot

The Pivot nodejs service has been running on a screen session on stat1002
while the Analytics team was working on testing it. A regular daemon running
behind firejail is now running in localhost:9090.

Bug: T138262
Change-Id: Ie73bb7aa6daedff49190f5c81360bfef9f61066e
---
M modules/statistics/templates/pivot.wikimedia.org.erb
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/315083/1

diff --git a/modules/statistics/templates/pivot.wikimedia.org.erb 
b/modules/statistics/templates/pivot.wikimedia.org.erb
index f3081f8..c1df67f 100644
--- a/modules/statistics/templates/pivot.wikimedia.org.erb
+++ b/modules/statistics/templates/pivot.wikimedia.org.erb
@@ -34,8 +34,6 @@
 
 LogLevel warn
 
-# The nodejs service is temporary running on stat1002
-# but it will be properly deployed and migrated.
-ProxyPass / http://stat1002.eqiad.wmnet:9090/
-ProxyPassReverse / http://stat1002.eqiad.wmnet:9090/
+ProxyPass / http://localhost:9090/
+ProxyPassReverse / http://localhost:9090/
 
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move the httpd Proxy rules from stat1002 to localhost for Pivot

[Elukey (Code Review)]

Elukey has submitted this change and it was merged.

Change subject: Move the httpd Proxy rules from stat1002 to localhost for Pivot
..


Move the httpd Proxy rules from stat1002 to localhost for Pivot

The Pivot nodejs service has been running on a screen session on stat1002
while the Analytics team was working on testing it. A regular daemon running
behind firejail is now running in localhost:9090.

Bug: T138262
Change-Id: Ie73bb7aa6daedff49190f5c81360bfef9f61066e
---
M modules/statistics/templates/pivot.wikimedia.org.erb
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/modules/statistics/templates/pivot.wikimedia.org.erb 
b/modules/statistics/templates/pivot.wikimedia.org.erb
index f3081f8..c1df67f 100644
--- a/modules/statistics/templates/pivot.wikimedia.org.erb
+++ b/modules/statistics/templates/pivot.wikimedia.org.erb
@@ -34,8 +34,6 @@
 
 LogLevel warn
 
-# The nodejs service is temporary running on stat1002
-# but it will be properly deployed and migrated.
-ProxyPass / http://stat1002.eqiad.wmnet:9090/
-ProxyPassReverse / http://stat1002.eqiad.wmnet:9090/
+ProxyPass / http://localhost:9090/
+ProxyPassReverse / http://localhost:9090/
 
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie73bb7aa6daedff49190f5c81360bfef9f61066e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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]: contint: unattended upgrade from distro

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: unattended upgrade from distro
..

contint: unattended upgrade from distro

Add rules that let unattended-upgrade to upgrade everything that comes
from the distribution. Including -updates.

Change-Id: I35a02a37cb5e4f01e51428b2b7298136e3155ea0
---
M modules/contint/manifests/packages/apt.pp
1 file changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/315084/1

diff --git a/modules/contint/manifests/packages/apt.pp 
b/modules/contint/manifests/packages/apt.pp
index b6bcf81..8a056c4 100644
--- a/modules/contint/manifests/packages/apt.pp
+++ b/modules/contint/manifests/packages/apt.pp
@@ -5,14 +5,26 @@
 class contint::packages::apt {
 include apt::unattendedupgrades
 
+# lint:ignore:single_quote_string_with_variables
+
+# In apt configuration, a key with trailing '::' to append to potentially
+# existing entry
 apt::conf { 'unattended-upgrades-wikimedia':
 priority => '51',
-# Key with trailing '::' to append to potentially existing entry
 key  => 'Unattended-Upgrade::Origins-Pattern::',
-# lint:ignore:single_quote_string_with_variables
 value=> 'origin=Wikimedia,codename=${distro_codename}-wikimedia',
-# lint:endignore
 }
+apt::conf { 'unattended-upgrades-distro':
+priority => '51',
+key  => 'Unattended-Upgrade::Origins-Pattern::',
+value=> 'origin=${distro_id},codename=${distro_codename}',
+}
+apt::conf { 'unattended-upgrades-distro-updates':
+priority => '51',
+key  => 'Unattended-Upgrade::Origins-Pattern::',
+value=> 'origin=${distro_id},codename=${distro_codename}-updates',
+}
+# lint:endignore
 
 if os_version('debian == jessie') {
 # Sanity check: only enable in labs

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Remove event_profiling_enabled

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: icinga: Remove event_profiling_enabled
..

icinga: Remove event_profiling_enabled

Newer versions of icinga spew out warning about it. It is no longer a
valid config setting

Warning: config setting 'event_profiling_enabled' unknown. Remove it
from your configuration!

Change-Id: If09bd2626c2176801eb06e6c91a88feb78129623
---
M modules/icinga/templates/icinga.cfg.erb
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/315085/1

diff --git a/modules/icinga/templates/icinga.cfg.erb 
b/modules/icinga/templates/icinga.cfg.erb
index 6ec5252..a3d4678 100644
--- a/modules/icinga/templates/icinga.cfg.erb
+++ b/modules/icinga/templates/icinga.cfg.erb
@@ -1417,11 +1417,3 @@
 # get out of control when debugging Icinga.
 
 max_debug_file_size=100
-
-# EVENT PROFILING
-# This option enables or disables event profiling for stats of event counts
-# and time taken for events.  Option can't be used on Solaris with gcc3.
-# Values: 0 - disabled
-# 1 - enabled
-
-event_profiling_enabled=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If09bd2626c2176801eb06e6c91a88feb78129623
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: normal_check_interval => check_interval

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: icinga: normal_check_interval => check_interval
..

icinga: normal_check_interval => check_interval

The directive has changed name in newer versions and the former is
deprecated

Change-Id: I0c429861b54ca5f45fcfc06890d9a892d9aeb69b
---
M modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/monitor/checkpaging.pp
M modules/icinga/manifests/monitor/legal.pp
M modules/icinga/manifests/monitor/ripeatlas.pp
M modules/icinga/manifests/monitor/wikidata.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
M modules/monitoring/manifests/service.pp
M modules/role/manifests/mediawiki/common.pp
10 files changed, 99 insertions(+), 99 deletions(-)


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

diff --git a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim 
b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
index 650b1a4..76571eb 100644
--- a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
+++ b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
@@ -67,7 +67,7 @@
 syn keyword nagiosDirective contained host_notification_period hostgroup_name 
servicegroup_name hostgroups servicegroups
 syn keyword nagiosDirective contained is_volatile last_notification
 syn keyword nagiosDirective contained low_flap_threshold max_check_attempts
-syn keyword nagiosDirective contained members monday normal_check_interval
+syn keyword nagiosDirective contained members monday check_interval
 syn keyword nagiosDirective contained notification_failure_criteria 
notification_failure_options
 syn keyword nagiosDirective contained notification_interval 
notification_options
 syn keyword nagiosDirective contained notification_period notifications_enabled
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 5ec109d..f3f26fb 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -152,9 +152,9 @@
 
 # Check that the icinga config is sane
 monitoring::service { 'check_icinga_config':
-description   => 'Check correctness of the icinga 
configuration',
-check_command => 'check_icinga_config',
-normal_check_interval => 10,
+description=> 'Check correctness of the icinga configuration',
+check_command  => 'check_icinga_config',
+check_interval => 10,
 }
 
 # script to schedule host downtimes
diff --git a/modules/icinga/manifests/monitor/checkpaging.pp 
b/modules/icinga/manifests/monitor/checkpaging.pp
index 23c2626..ffe7d62 100644
--- a/modules/icinga/manifests/monitor/checkpaging.pp
+++ b/modules/icinga/manifests/monitor/checkpaging.pp
@@ -4,11 +4,11 @@
 # is working properly
 class icinga::monitor::checkpaging {
 monitoring::service { 'check_to_check_nagios_paging':
-description   => 'check_to_check_nagios_paging',
-check_command => 'check_to_check_nagios_paging',
-normal_check_interval => 1,
-retry_check_interval  => 1,
-contact_group => 'admins',
-critical  => false
+description  => 'check_to_check_nagios_paging',
+check_command=> 'check_to_check_nagios_paging',
+check_interval   => 1,
+retry_check_interval => 1,
+contact_group=> 'admins',
+critical => false
 }
 }
diff --git a/modules/icinga/manifests/monitor/legal.pp 
b/modules/icinga/manifests/monitor/legal.pp
index fbf363e..d64ad13 100644
--- a/modules/icinga/manifests/monitor/legal.pp
+++ b/modules/icinga/manifests/monitor/legal.pp
@@ -15,29 +15,29 @@
 }
 
 monitoring::service { 'en.wp.o-legal-html':
-description   => 'Ensure legal html en.wp',
-check_command => 
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
-host  => 'en.wikipedia.org',
-normal_check_interval => 1440,
-retry_check_interval  => 30,
-contact_group => 'admins,legal',
+description  => 'Ensure legal html en.wp',
+check_command=> 
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
+host => 'en.wikipedia.org',
+check_interval   => 1440,
+retry_check_interval => 30,
+contact_group=> 'admins,legal',
 }
 
 monitoring::service { 'en.m.wp.o-legal-html':
-description   => 'Ensure legal html en.m.wp',
-check_command => 
'check_legal_html!https://en.m.wikipedia.org/wiki/Main_Page!mobile',
-host  => 'en.m.wikipedia.org',
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: retry_check_interval => retry_interval

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: icinga: retry_check_interval => retry_interval
..

icinga: retry_check_interval => retry_interval

The directive has changed name in newer versions and the former is
deprecated

Change-Id: Ie19d6cc4ed6315f56fcc62ffa276e51746ac7b5c
---
M modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
M modules/icinga/manifests/monitor/checkpaging.pp
M modules/icinga/manifests/monitor/legal.pp
M modules/icinga/manifests/monitor/ripeatlas.pp
M modules/icinga/manifests/monitor/wikidata.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
M modules/monitoring/manifests/service.pp
8 files changed, 93 insertions(+), 93 deletions(-)


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

diff --git a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim 
b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
index 76571eb..f13e659 100644
--- a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
+++ b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
@@ -74,7 +74,7 @@
 syn keyword nagiosDirective contained obsess_over_service pager 
parallelize_check
 syn keyword nagiosDirective contained parents passive_checks_enabled
 syn keyword nagiosDirective contained process_perf_data 
retain_nonstatus_information
-syn keyword nagiosDirective contained retain_status_information 
retry_check_interval
+syn keyword nagiosDirective contained retain_status_information retry_interval
 syn keyword nagiosDirective contained saturday service_description
 syn keyword nagiosDirective contained service_notification_commands
 syn keyword nagiosDirective contained service_notification_options
diff --git a/modules/icinga/manifests/monitor/checkpaging.pp 
b/modules/icinga/manifests/monitor/checkpaging.pp
index ffe7d62..4a2f481 100644
--- a/modules/icinga/manifests/monitor/checkpaging.pp
+++ b/modules/icinga/manifests/monitor/checkpaging.pp
@@ -4,11 +4,11 @@
 # is working properly
 class icinga::monitor::checkpaging {
 monitoring::service { 'check_to_check_nagios_paging':
-description  => 'check_to_check_nagios_paging',
-check_command=> 'check_to_check_nagios_paging',
-check_interval   => 1,
-retry_check_interval => 1,
-contact_group=> 'admins',
-critical => false
+description=> 'check_to_check_nagios_paging',
+check_command  => 'check_to_check_nagios_paging',
+check_interval => 1,
+retry_interval => 1,
+contact_group  => 'admins',
+critical   => false
 }
 }
diff --git a/modules/icinga/manifests/monitor/legal.pp 
b/modules/icinga/manifests/monitor/legal.pp
index d64ad13..9437393 100644
--- a/modules/icinga/manifests/monitor/legal.pp
+++ b/modules/icinga/manifests/monitor/legal.pp
@@ -15,29 +15,29 @@
 }
 
 monitoring::service { 'en.wp.o-legal-html':
-description  => 'Ensure legal html en.wp',
-check_command=> 
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
-host => 'en.wikipedia.org',
-check_interval   => 1440,
-retry_check_interval => 30,
-contact_group=> 'admins,legal',
+description=> 'Ensure legal html en.wp',
+check_command  => 
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
+host   => 'en.wikipedia.org',
+check_interval => 1440,
+retry_interval => 30,
+contact_group  => 'admins,legal',
 }
 
 monitoring::service { 'en.m.wp.o-legal-html':
-description  => 'Ensure legal html en.m.wp',
-check_command=> 
'check_legal_html!https://en.m.wikipedia.org/wiki/Main_Page!mobile',
-host => 'en.m.wikipedia.org',
-check_interval   => 1440,
-retry_check_interval => 30,
-contact_group=> 'admins,legal',
+description=> 'Ensure legal html en.m.wp',
+check_command  => 
'check_legal_html!https://en.m.wikipedia.org/wiki/Main_Page!mobile',
+host   => 'en.m.wikipedia.org',
+check_interval => 1440,
+retry_interval => 30,
+contact_group  => 'admins,legal',
 }
 
 monitoring::service { 'en.wb.o-legal-html':
-description  => 'Ensure legal html en.wb',
-check_command=> 
'check_legal_html!https://en.wikibooks.org!desktop_enwb',
-host => 'en.wikibooks.org',
-check_interval   => 1440,
-retry_check_interval => 30,
-contact_group=> 'admins,legal',
+description=> 'Ensure legal html en.wb',
+check_command  => 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_upload: remove varnish3 VCL compat

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: cache_upload: remove varnish3 VCL compat
..


cache_upload: remove varnish3 VCL compat

We have been running varnish4 on cache_upload for a while, drop v3
conditionals.

Bug: T131502
Change-Id: I9f5e7563105483afc28c67df7d6f5d3ecc212989
---
M modules/varnish/templates/upload-backend.inc.vcl.erb
M modules/varnish/templates/upload-common.inc.vcl.erb
M modules/varnish/templates/upload-frontend.inc.vcl.erb
3 files changed, 0 insertions(+), 47 deletions(-)

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



diff --git a/modules/varnish/templates/upload-backend.inc.vcl.erb 
b/modules/varnish/templates/upload-backend.inc.vcl.erb
index c320022..b92d381 100644
--- a/modules/varnish/templates/upload-backend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-backend.inc.vcl.erb
@@ -31,17 +31,9 @@
 
 sub cluster_be_recv_applayer_backend {
if (req.url ~ "^/+[^/]+/[^/]+/thumb/") {
-   <%- if @varnish_version4 -%>
set req.backend_hint = swift_thumbs.backend();
-   <%- else -%>
-   set req.backend = swift_thumbs;
-   <%- end -%>
} else {
-   <%- if @varnish_version4 -%>
set req.backend_hint = swift.backend();
-   <%- else -%>
-   set req.backend = swift;
-   <%- end -%>
}
 }
 
@@ -65,20 +57,11 @@
 
 sub cluster_be_pass { }
 
-<% if @varnish_version4 -%>
 sub cluster_be_backend_fetch {
call upload_common_set_range;
 }
-<% end -%>
 
 sub cluster_be_backend_response {
-   <%- if not @varnish_version4 -%>
-   // Stream large objects, >= 1 MB
-   if (std.integer(beresp.http.Content-Length, 0) >= 1048576 || 
beresp.http.Content-Length ~ "^[0-9]{9}") {
-   set beresp.do_stream = true;
-   }
-   <%- end -%>
-
call pick_stevedore;

if (beresp.http.Content-Range) {
diff --git a/modules/varnish/templates/upload-common.inc.vcl.erb 
b/modules/varnish/templates/upload-common.inc.vcl.erb
index 6fd33ad..7543350 100644
--- a/modules/varnish/templates/upload-common.inc.vcl.erb
+++ b/modules/varnish/templates/upload-common.inc.vcl.erb
@@ -20,11 +20,7 @@
 sub upload_common_miss {
 // Convert range requests into pass
 if (req.http.Range) {
-<%- if @varnish_version4 -%>
 call upload_common_set_xrange;
-<%- else -%>
-set bereq.http.Range = req.http.Range;
-<%- end -%>
 return (pass);
 }
 }
@@ -37,13 +33,11 @@
 }
 
 sub upload_common_backend_response {
-<% if @varnish_version4 -%>
// Debugging T144257. Don't cache 200 responses with CL:0.
if (beresp.http.Content-Length == "0" && beresp.status == 200) {
set beresp.ttl = 0s;
set beresp.uncacheable = true;
}
-<% end -%>
 }
 
 // Varnish strips the Range header before copying req into bereq. Save it into
diff --git a/modules/varnish/templates/upload-frontend.inc.vcl.erb 
b/modules/varnish/templates/upload-frontend.inc.vcl.erb
index e9f1bd0..a63d51d 100644
--- a/modules/varnish/templates/upload-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-frontend.inc.vcl.erb
@@ -50,32 +50,16 @@
 
 sub cluster_fe_pass { }
 
-<% if @varnish_version4 -%>
 sub cluster_fe_backend_fetch {
call upload_common_set_range;
 }
-<% end -%>
 
 sub cluster_fe_backend_response {
if (beresp.http.Content-Range) {
// Varnish itself doesn't ask for ranges, so this must have been
// a passed range request
set beresp.http.X-Content-Range = beresp.http.Content-Range;
-
-   <%- if not @varnish_version4 -%>
-   if (beresp.http.Content-Range ~ "\/[0-9]{8,}$") {
-   set beresp.do_stream = true;
-   }
-   <%- end -%>
}
-
-   <%- if not @varnish_version4 -%>
-   // Stream large objects, >= 1 or 32 MB
-<% stream_threshold = @cache_route == 'direct' ? 33554432 : 1048576 -%>
-   if (std.integer(beresp.http.Content-Length, 33554432) >= <%= 
stream_threshold %> || beresp.http.Content-Length ~ "^[0-9]{9}") {
-   set beresp.do_stream = true;
-   }
-   <%- end -%>
 
// Four-hit-wonder experiment: if the immediate backend does not 
indicate
// hit/4 or higher, deliver the object as normal but do not create a new
@@ -85,23 +69,15 @@
 && bereq.http.X-CDIS == "miss"
 && beresp.http.X-Cache-Int !~ " hit/([4-9]|[0-9]{2,})$") {
set beresp.ttl = 0s;
-   <%- if @varnish_version4 -%>
set beresp.uncacheable = true;
return (deliver);
-   <%- else -%>
-   return (hit_for_pass);
-   <%- end -%>
}
 
// hit-for-pass objects >= 256K size
if 

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

[jenkins-bot (Code Review)]

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

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


New Wikidata Build - 2016-10-10T10:00:01+

Change-Id: Ic5539dd4640f360def881f60153c8050f43fad90
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/hu.json
M extensions/ArticlePlaceholder/i18n/pt.json
M extensions/ArticlePlaceholder/i18n/qqq.json
M extensions/ExternalValidation/i18n/ast.json
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/ur.json
M 
extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
M extensions/Wikibase/lib/i18n/crh-cyrl.json
M extensions/Wikibase/lib/i18n/et.json
A 
extensions/Wikibase/lib/includes/Formatters/BinaryOptionDispatchingSnakFormatter.php
A 
extensions/Wikibase/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
M extensions/Wikibase/repo/i18n/crh-cyrl.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/et.json
M extensions/Wikibase/repo/i18n/sv.json
M extensions/Wikibase/repo/includes/Hooks/InfoActionHookHandler.php
M extensions/Wikibase/repo/includes/Store/Sql/SqlSubscriptionLookup.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
26 files changed, 398 insertions(+), 54 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 712468b..8017654 100644
--- a/composer.lock
+++ b/composer.lock
@@ -788,12 +788,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "78ec8a810e07302ca0c6815e400cf4dff593e0a1"
+"reference": "e7e044e64e972e767fb91821e8caeee792a65dec"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/78ec8a810e07302ca0c6815e400cf4dff593e0a1;,
-"reference": "78ec8a810e07302ca0c6815e400cf4dff593e0a1",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/e7e044e64e972e767fb91821e8caeee792a65dec;,
+"reference": "e7e044e64e972e767fb91821e8caeee792a65dec",
 "shasum": ""
 },
 "require-dev": {
@@ -818,7 +818,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-10-02 08:34:11"
+"time": "2016-10-09 20:42:21"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1256,7 +1256,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;,
-"reference": "a76eecdf925fb92279b6b8cf85fb4067c5bcd2d8"
+"reference": "c59be688e534b11714bc6966eb67839ac54d4817"
 },
 "require": {
 "data-values/common": ">=0.1 <0.4",
@@ -1308,7 +1308,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1203/;
 },
-"time": "2016-09-05 20:47:09"
+"time": "2016-10-09 20:58:56"
 },
 {
 "name": "wikibase/internal-serialization",
@@ -1574,12 +1574,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "826b84b61b770fac3e247ac85668bebe19adb4ac"
+"reference": "9ec07a285e3bbfd86855d19c47cd19fd25677d6d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/826b84b61b770fac3e247ac85668bebe19adb4ac;,
-"reference": "826b84b61b770fac3e247ac85668bebe19adb4ac",
+"url": 

[MediaWiki-commits] [Gerrit] analytics...deploy[master]: Update the src submodule's SHA to 2b19082

[Joal (Code Review)]

Joal has submitted this change and it was merged.

Change subject: Update the src submodule's SHA to 2b19082
..


Update the src submodule's SHA to 2b19082

In T146389 the pivot src repository was updated with the build
directory, containing type script files compiled to javascript.
The submodule SHA was not updated in the pivot/deploy repository
so git submodule update --init is not able to pick up the latest
version of the module before deploying.

Related change: https://gerrit.wikimedia.org/r/#/c/315067/

Bug: T146389
Change-Id: I96baa9da2a05568eb1bddb8a61ea0a3866c64cf1
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src b/src
index 7373347..2b19082 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 737334771a23c0846e9c5e679cc5df00ecc6caa8
+Subproject commit 2b19082c1cfbdcfe05c94bd7700b5c577a81fdd1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96baa9da2a05568eb1bddb8a61ea0a3866c64cf1
Gerrit-PatchSet: 4
Gerrit-Project: analytics/pivot/deploy
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Joal 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Links: Keep original and redirect resolved source title in l...

[jenkins-bot (Code Review)]

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

Change subject: Links: Keep original and redirect resolved source title in 
linkpair cache
..


Links: Keep original and redirect resolved source title in linkpair cache

Bug: T145691
Change-Id: I4c9f7a17b5e169468e21e512c9fd2970422f888a
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 18 insertions(+), 9 deletions(-)

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

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



diff --git a/modules/tools/ext.cx.tools.link.js 
b/modules/tools/ext.cx.tools.link.js
index 5ea1427..ddad7f7 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -98,25 +98,34 @@
redirects = jQuery.extend( {}, response.query.redirects 
);
 
$.each( response.query.pages, function ( pageId, page ) 
{
-   var i, key, title;
+   var i, redirectedSourceTitle, title;
+
+   if ( !page.langlinks ) {
+   return;
+   }
 
for ( i in redirects ) {
// Locate the title in redirects, if 
any.
if ( redirects[ i ].to === page.title ) 
{
-   key = redirects[ i ].from;
+   redirectedSourceTitle = 
redirects[ i ].from;
break;
}
}
 
-   if ( !key ) {
-   key = page.title;
+   // Add the redirected source title in link pair 
mapping.
+   if ( redirectedSourceTitle ) {
+   title = mw.Title.newFromText( 
redirectedSourceTitle );
}
-
-   title = mw.Title.newFromText( key );
-
if ( title ) {
-   linkPairs[ title.toText() ] = 
page.langlinks &&
-   page.langlinks[ 0 ][ '*' ];
+   linkPairs[ title.toText() ] = 
page.langlinks[ 0 ][ '*' ];
+   }
+   // Irrespective of redirect or not, add the 
original source title in link pair mapping.
+   // So if a paragraph has link to LuaJIT and Lua 
(programming language),
+   // both get resolved to Lua (programming 
language) mapped to hewiki:"לואה (שפת תכנות)"
+   // linkPairs will have keys for LuaJIT and Lua 
(programming language).
+   title = mw.Title.newFromText( page.title );
+   if ( title ) {
+   linkPairs[ title.toText() ] = 
page.langlinks[ 0 ][ '*' ];
}
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c9f7a17b5e169468e21e512c9fd2970422f888a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: TranslateSandbox: do not send email confirmation emails twice

[jenkins-bot (Code Review)]

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

Change subject: TranslateSandbox: do not send email confirmation emails twice
..


TranslateSandbox: do not send email confirmation emails twice

This is now included by default in the core.

Bug: T147570
Change-Id: I8a76b330a1b93b417d80908a4ca119870d06e417
---
M utils/TranslateSandbox.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/utils/TranslateSandbox.php b/utils/TranslateSandbox.php
index d9d1fc5..3970ec5 100644
--- a/utils/TranslateSandbox.php
+++ b/utils/TranslateSandbox.php
@@ -74,7 +74,6 @@
 
// group-translate-sandboxed group-translate-sandboxed-member
$user->addGroup( 'translate-sandboxed' );
-   $user->sendConfirmationMail();
 
return $user;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a76b330a1b93b417d80908a4ca119870d06e417
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight db1082

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Increase weight db1082
..


db-eqiad.php: Increase weight db1082

After getting its RAID controller firmware upgrade
increase its weight in the load balancer

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

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



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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[wmf/1.28.0-wmf.21]: Don't show warning confirmation dialog when there are no war...

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Don't show warning confirmation dialog when there are no 
warnings
..

Don't show warning confirmation dialog when there are no warnings

In JavaScript, an empty array isn't falsy...

Bug: T147659
Change-Id: Ibaace3d0c07e46c56694683facf00a0ccb2b2bfe
---
M resources/controller/uw.controller.Details.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/72/315072/1

diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index 9b06a38..f72607f 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -214,7 +214,7 @@
return result.concat( 
warnings );
}, [] );
 
-   if ( warnings ) {
+   if ( warnings.length ) {
// Update warning count before 
dialog
detailsController.showErrors();
return 
detailsController.confirmationDialog( warnings );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaace3d0c07e46c56694683facf00a0ccb2b2bfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.28.0-wmf.21]: Add EntityHandler::supportsCategories

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Add EntityHandler::supportsCategories
..

Add EntityHandler::supportsCategories

Bug: T126977
Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
(cherry picked from commit 010d446c2d3db4fb220fb5dd4bc000452bafa8bd)
---
M repo/includes/Content/EntityHandler.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
2 files changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index c335f08..ac57e82 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
 
/**
+* None of the Entity content models support categories.
+*
+* @return bool Always false.
+*/
+   public function supportsCategories() {
+   return false;
+   }
+
+   /**
 * @see ContentHandler::makeRedirectContent
 *
 * @warn Always throws an MWException, since an EntityRedirects needs 
to know it's own
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php 
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)', 
$context->getOutput()->getHTML() );
}
 
+   public function testSupportsCategories() {
+   $this->assertFalse( $this->getHandler()->supportsCategories() );
+   }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix the Pivot's systemd unit with the right exec path

[Elukey (Code Review)]

Elukey has submitted this change and it was merged.

Change subject: Fix the Pivot's systemd unit with the right exec path
..


Fix the Pivot's systemd unit with the right exec path

Bug: T138262
Change-Id: Ida0b060697bef7df3bf0ae2cb0bbab4f7349436a
---
M modules/pivot/templates/initscripts/pivot.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/pivot/templates/initscripts/pivot.systemd.erb 
b/modules/pivot/templates/initscripts/pivot.systemd.erb
index d5bc7cf..c7361e2 100644
--- a/modules/pivot/templates/initscripts/pivot.systemd.erb
+++ b/modules/pivot/templates/initscripts/pivot.systemd.erb
@@ -13,7 +13,7 @@
 # wait 60 seconds for a graceful restart before killing the master
 TimeoutStopSec=60
 WorkingDirectory=<%= @pivot_deployment_dir %>
-ExecStart=/usr/bin/firejail --profile=/etc/firejail/pivot.profile -- 
/usr/bin/nodejs <%= @pivot_deployment_dir %>/build/bin/pivot -p <%= @port %> -d 
<%= @druid_broker %>
+ExecStart=/usr/bin/firejail --profile=/etc/firejail/pivot.profile -- 
/usr/bin/nodejs <%= @pivot_deployment_dir %>/src/bin/pivot -p <%= @port %> -d 
<%= @druid_broker %>
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida0b060697bef7df3bf0ae2cb0bbab4f7349436a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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]: icinga: Delete check_nrpe.cfg

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: icinga: Delete check_nrpe.cfg
..


icinga: Delete check_nrpe.cfg

Not actually used anywhere

Change-Id: If438f00b5359ac66313ee3408f6cea86b39146c9
---
D modules/nagios_common/files/check_commands/check_nrpe.cfg
1 file changed, 0 insertions(+), 10 deletions(-)

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



diff --git a/modules/nagios_common/files/check_commands/check_nrpe.cfg 
b/modules/nagios_common/files/check_commands/check_nrpe.cfg
deleted file mode 100644
index 7f1d32e..000
--- a/modules/nagios_common/files/check_commands/check_nrpe.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-define command {
-   command_namecheck_nrpe
-   command_line/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c 
$ARG1$ -a $ARG2$
-}
-
-# this command runs a program $ARG1$ with no arguments
-define command {
-   command_namecheck_nrpe_1arg
-   command_line/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c 
$ARG1$
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If438f00b5359ac66313ee3408f6cea86b39146c9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
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]: db-eqiad.php: Restore db1082 original weight

[Marostegui (Code Review)]

Marostegui has uploaded a new change for review.

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

Change subject: db-eqiad.php: Restore db1082 original weight
..

db-eqiad.php: Restore db1082 original weight

db1082 has been slowly getting its weight increased and not this
is its original value, after getting the RAID controller firmware
updated.

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Postgresql / postgis: use full package name

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: Postgresql / postgis: use full package name
..


Postgresql / postgis: use full package name

postgresql-postgis package does not always have the same name, sometimes
including the version of postgis as a suffix. Previously, puppet would
install multiple postgresql-postgis packages on jessie. This fixes the
package name and ensure we only install a single version of postgis,
which should fix the broken pupet run.

Bug: T147780
Change-Id: Ib98d47db15345d8e137ea91976a0c4e736e137b3
---
M hieradata/role/common/maps/server.yaml
M modules/postgresql/manifests/postgis.pp
2 files changed, 9 insertions(+), 10 deletions(-)

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



diff --git a/hieradata/role/common/maps/server.yaml 
b/hieradata/role/common/maps/server.yaml
index 2dceaae..dc4d798 100644
--- a/hieradata/role/common/maps/server.yaml
+++ b/hieradata/role/common/maps/server.yaml
@@ -1,5 +1,4 @@
 cluster: maps
-postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 cassandra::cluster_name: maps
 cassandra::data_directory_base: /srv/cassandra
diff --git a/modules/postgresql/manifests/postgis.pp 
b/modules/postgresql/manifests/postgis.pp
index 0064f74..f559bb0 100644
--- a/modules/postgresql/manifests/postgis.pp
+++ b/modules/postgresql/manifests/postgis.pp
@@ -13,18 +13,18 @@
 # include postgresql::postgis
 #
 class postgresql::postgis(
-$ensure='present',
-$pgversion = $::lsbdistcodename ? {
-jessie  => '9.4',
-precise => '9.1',
-trusty  => '9.3',
+$ensure = 'present',
+$postgresql_postgis_package = $::lsbdistcodename ? {
+jessie  => 'postgresql-9.4-postgis-2.1',
+precise => 'postgresql-9.1-postgis',
+trusty  => 'postgresql-9.3-postgis-2.1',
 },
-) {
+) {
 
 package { [
-"postgresql-${pgversion}-postgis",
-'postgis',
-]:
+$postgresql_postgis_package,
+'postgis',
+]:
 ensure  => $ensure,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib98d47db15345d8e137ea91976a0c4e736e137b3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Restore db1082 original weight

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Restore db1082 original weight
..


db-eqiad.php: Restore db1082 original weight

db1082 has been slowly getting its weight increased and not this
is its original value, after getting the RAID controller firmware
updated.

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

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



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

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add the Druid's default port to Pivot's hieradata config

[Elukey (Code Review)]

Elukey has uploaded a new change for review.

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

Change subject: Add the Druid's default port to Pivot's hieradata config
..

Add the Druid's default port to Pivot's hieradata config

Bug: T138262
Change-Id: I2b8772b388790563d2da7790d308a12797da180d
---
M hieradata/role/common/analytics_cluster/druid/pivot.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/315081/1

diff --git a/hieradata/role/common/analytics_cluster/druid/pivot.yaml 
b/hieradata/role/common/analytics_cluster/druid/pivot.yaml
index e03ae79..c8049db 100644
--- a/hieradata/role/common/analytics_cluster/druid/pivot.yaml
+++ b/hieradata/role/common/analytics_cluster/druid/pivot.yaml
@@ -1 +1 @@
-pivot::druid_broker: 'druid1001.eqiad.wmnet'
\ No newline at end of file
+pivot::druid_broker: 'druid1001.eqiad.wmnet:8082'
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add the Druid's default port to Pivot's hieradata config

[Elukey (Code Review)]

Elukey has submitted this change and it was merged.

Change subject: Add the Druid's default port to Pivot's hieradata config
..


Add the Druid's default port to Pivot's hieradata config

Bug: T138262
Change-Id: I2b8772b388790563d2da7790d308a12797da180d
---
M hieradata/role/common/analytics_cluster/druid/pivot.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/analytics_cluster/druid/pivot.yaml 
b/hieradata/role/common/analytics_cluster/druid/pivot.yaml
index e03ae79..c8049db 100644
--- a/hieradata/role/common/analytics_cluster/druid/pivot.yaml
+++ b/hieradata/role/common/analytics_cluster/druid/pivot.yaml
@@ -1 +1 @@
-pivot::druid_broker: 'druid1001.eqiad.wmnet'
\ No newline at end of file
+pivot::druid_broker: 'druid1001.eqiad.wmnet:8082'
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b8772b388790563d2da7790d308a12797da180d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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]: icinga: Remove /etc/icinga/conf.d

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: icinga: Remove /etc/icinga/conf.d
..

icinga: Remove /etc/icinga/conf.d

It no longer gets populated by the upstream packages, neither do we use
it

Change-Id: I7158e002e321357eacb3f9c8c633b2bb63ef1cd1
---
M modules/icinga/templates/icinga.cfg.erb
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/modules/icinga/templates/icinga.cfg.erb 
b/modules/icinga/templates/icinga.cfg.erb
index c56da62..6ec5252 100644
--- a/modules/icinga/templates/icinga.cfg.erb
+++ b/modules/icinga/templates/icinga.cfg.erb
@@ -22,11 +22,6 @@
 # nagios-plugins package
 cfg_dir=/etc/nagios-plugins/config
 
-# Debian uses by default a configuration directory where nagios3-common,
-# other packages and the local admin can dump or link configuration
-# files into.
-cfg_dir=/etc/icinga/conf.d
-
 # OBJECT CONFIGURATION FILE(S)
 # These are the object configuration files in which you define hosts,
 # host groups, contacts, contact groups, services, etc.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7158e002e321357eacb3f9c8c633b2bb63ef1cd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add EntityHandler::supportsCategories

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Add EntityHandler::supportsCategories
..

Add EntityHandler::supportsCategories

Bug: T126977
Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
---
M repo/includes/Content/EntityHandler.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
2 files changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index c335f08..ac57e82 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
 
/**
+* None of the Entity content models support categories.
+*
+* @return bool Always false.
+*/
+   public function supportsCategories() {
+   return false;
+   }
+
+   /**
 * @see ContentHandler::makeRedirectContent
 *
 * @warn Always throws an MWException, since an EntityRedirects needs 
to know it's own
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php 
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)', 
$context->getOutput()->getHTML() );
}
 
+   public function testSupportsCategories() {
+   $this->assertFalse( $this->getHandler()->supportsCategories() );
+   }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Parsoid: Use Scap3 for config-file deploys

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Parsoid: Use Scap3 for config-file deploys
..

Parsoid: Use Scap3 for config-file deploys

This patch enables deployers to deploy Parsoid's config.yaml file
directly from the deployment repository.

Note that ruthenium's config still needs to be deployed via ops/puppet
for the time being, as it isn't using Scap as its dpeloyment method.

Bug: T144596
Change-Id: I3fd6c0cebb47e817eca903abfe92fe6e025af867
---
M hieradata/labs/deployment-prep/common.yaml
M modules/parsoid/manifests/init.pp
2 files changed, 15 insertions(+), 14 deletions(-)


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

diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 6b1643b..e204703 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -88,7 +88,6 @@
   text: {}
   upload: {}
   zotero: {}
-parsoid::settings_file: 'conf/wmf/betalabs.localsettings.js'
 cassandra::listen_address: '%{::ipaddress_eth0}'
 cassandra::rpc_address: '%{::ipaddress_eth0}'
 cassandra::seeds:
diff --git a/modules/parsoid/manifests/init.pp 
b/modules/parsoid/manifests/init.pp
index 2e7f99f..3ffee3d 100644
--- a/modules/parsoid/manifests/init.pp
+++ b/modules/parsoid/manifests/init.pp
@@ -32,21 +32,23 @@
 ) {
 
 service::node { 'parsoid':
-port=> $port,
-starter_module  => 'src/lib/index.js',
-entrypoint  => 'apiServiceWorker',
-starter_script  => 'src/bin/server.js',
-config  => {
+port  => $port,
+starter_module=> 'src/lib/index.js',
+entrypoint=> 'apiServiceWorker',
+starter_script=> 'src/bin/server.js',
+# NOTE: this is useful only when deployment == 'git'
+config=> {
 localsettings => $settings_file,
 },
-heap_limit  => 800,
-heartbeat_to=> 18,
-healthcheck_url => '/',
-has_spec=> false,
-logging_name=> $logging_name,
-statsd_prefix   => $statsd_prefix,
-auto_refresh=> false,
-deployment  => $deployment,
+heap_limit=> 800,
+heartbeat_to  => 18,
+healthcheck_url   => '/',
+has_spec  => false,
+logging_name  => $logging_name,
+statsd_prefix => $statsd_prefix,
+auto_refresh  => false,
+deployment=> $deployment,
+deployment_config => true,
 }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix the Pivot's systemd unit with the right exec path

[Elukey (Code Review)]

Elukey has uploaded a new change for review.

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

Change subject: Fix the Pivot's systemd unit with the right exec path
..

Fix the Pivot's systemd unit with the right exec path

Bug: T138262
Change-Id: Ida0b060697bef7df3bf0ae2cb0bbab4f7349436a
---
M modules/pivot/templates/initscripts/pivot.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/pivot/templates/initscripts/pivot.systemd.erb 
b/modules/pivot/templates/initscripts/pivot.systemd.erb
index d5bc7cf..c7361e2 100644
--- a/modules/pivot/templates/initscripts/pivot.systemd.erb
+++ b/modules/pivot/templates/initscripts/pivot.systemd.erb
@@ -13,7 +13,7 @@
 # wait 60 seconds for a graceful restart before killing the master
 TimeoutStopSec=60
 WorkingDirectory=<%= @pivot_deployment_dir %>
-ExecStart=/usr/bin/firejail --profile=/etc/firejail/pivot.profile -- 
/usr/bin/nodejs <%= @pivot_deployment_dir %>/build/bin/pivot -p <%= @port %> -d 
<%= @druid_broker %>
+ExecStart=/usr/bin/firejail --profile=/etc/firejail/pivot.profile -- 
/usr/bin/nodejs <%= @pivot_deployment_dir %>/src/bin/pivot -p <%= @port %> -d 
<%= @druid_broker %>
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add EntityHandler::supportsCategories

[jenkins-bot (Code Review)]

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

Change subject: Add EntityHandler::supportsCategories
..


Add EntityHandler::supportsCategories

Bug: T126977
Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
---
M repo/includes/Content/EntityHandler.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
2 files changed, 13 insertions(+), 0 deletions(-)

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 c335f08..ac57e82 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
 
/**
+* None of the Entity content models support categories.
+*
+* @return bool Always false.
+*/
+   public function supportsCategories() {
+   return false;
+   }
+
+   /**
 * @see ContentHandler::makeRedirectContent
 *
 * @warn Always throws an MWException, since an EntityRedirects needs 
to know it's own
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php 
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)', 
$context->getOutput()->getHTML() );
}
 
+   public function testSupportsCategories() {
+   $this->assertFalse( $this->getHandler()->supportsCategories() );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
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]: db-eqiad.php: Increase weight db1082

[Marostegui (Code Review)]

Marostegui has uploaded a new change for review.

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

Change subject: db-eqiad.php: Increase weight db1082
..

db-eqiad.php: Increase weight db1082

After getting its RAID controller firmware upgrade
increase its weight in the load balancer

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use when_present instead of when_visible in badges test

[jenkins-bot (Code Review)]

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

Change subject: Use when_present instead of when_visible in badges test
..


Use when_present instead of when_visible in badges test

Trying to work around the overlapping-issue described in
https://phabricator.wikimedia.org/T147401#2703382

Bug: T147401
Change-Id: Ib19cf54c6e58372704f1fccc705421f424e2d4d1
---
M tests/browser/features/step_definitions/sitelinks_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  WMDE-Fisch: Looks good to me, approved
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/sitelinks_steps.rb 
b/tests/browser/features/step_definitions/sitelinks_steps.rb
index f195ebb..eae155f 100644
--- a/tests/browser/features/step_definitions/sitelinks_steps.rb
+++ b/tests/browser/features/step_definitions/sitelinks_steps.rb
@@ -20,7 +20,7 @@
 
 When(/^I click the sitelink save button$/) do
   on(ItemPage) do |page|
-page.save_sitelink_link_element.when_visible.click
+page.save_sitelink_link_element.when_present.click
 page.wait_for_api_callback
   end
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib19cf54c6e58372704f1fccc705421f424e2d4d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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...Wikibase[wmf/1.28.0-wmf.21]: Add EntityHandler::supportsCategories

[jenkins-bot (Code Review)]

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

Change subject: Add EntityHandler::supportsCategories
..


Add EntityHandler::supportsCategories

Bug: T126977
Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
(cherry picked from commit 010d446c2d3db4fb220fb5dd4bc000452bafa8bd)
---
M repo/includes/Content/EntityHandler.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
2 files changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index c335f08..ac57e82 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
 
/**
+* None of the Entity content models support categories.
+*
+* @return bool Always false.
+*/
+   public function supportsCategories() {
+   return false;
+   }
+
+   /**
 * @see ContentHandler::makeRedirectContent
 *
 * @warn Always throws an MWException, since an EntityRedirects needs 
to know it's own
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php 
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)', 
$context->getOutput()->getHTML() );
}
 
+   public function testSupportsCategories() {
+   $this->assertFalse( $this->getHandler()->supportsCategories() );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia18c101a21af23b1536a5f86faab421e6137640c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.28.0-wmf.21]: Update Wikibase, add EntityHandler::supportsCategories

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Update Wikibase, add EntityHandler::supportsCategories
..

Update Wikibase, add EntityHandler::supportsCategories

Contains f7e8e4a23141948d5caf0515111fb7a63f5aaa40.

Will ease T147748.

Change-Id: I1761d0e1dbe88620969b0fc9e502358a0bfe3f0a
---
M composer.lock
M extensions/Wikibase/repo/includes/Content/EntityHandler.php
M extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
M vendor/composer/installed.json
4 files changed, 106 insertions(+), 93 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 0ce9e2d..3343e2f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1460,12 +1460,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6"
+"reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c756269cf3d0b6ea3e21084cba5756e2857fcbb6;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f7e8e4a23141948d5caf0515111fb7a63f5aaa40;,
+"reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40",
 "shasum": ""
 },
 "require": {
@@ -1539,7 +1539,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-10-03 18:04:02"
+"time": "2016-10-10 11:37:29"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/Content/EntityHandler.php 
b/extensions/Wikibase/repo/includes/Content/EntityHandler.php
index c335f08..ac57e82 100644
--- a/extensions/Wikibase/repo/includes/Content/EntityHandler.php
+++ b/extensions/Wikibase/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
 
/**
+* None of the Entity content models support categories.
+*
+* @return bool Always false.
+*/
+   public function supportsCategories() {
+   return false;
+   }
+
+   /**
 * @see ContentHandler::makeRedirectContent
 *
 * @warn Always throws an MWException, since an EntityRedirects needs 
to know it's own
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)', 
$context->getOutput()->getHTML() );
}
 
+   public function testSupportsCategories() {
+   $this->assertFalse( $this->getHandler()->supportsCategories() );
+   }
+
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ac18396..05e6598 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1342,95 +1342,6 @@
 ]
 },
 {
-"name": "wikibase/wikibase",
-"version": "dev-wmf/1.28.0-wmf.21",
-"version_normalized": "dev-wmf/1.28.0-wmf.21",
-"source": {
-"type": "git",
-"url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c756269cf3d0b6ea3e21084cba5756e2857fcbb6;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6",
-"shasum": ""
-},
-"require": {
-"data-values/common": "~0.3.0",
-"data-values/data-types": "~0.5.0",
-"data-values/data-values": "~1.0",
-"data-values/geo": "~1.0",
-"data-values/interfaces": "~0.2.0|~0.1.5",
-"data-values/javascript": "~0.8.0",
-"data-values/number": "~0.7.0",
-"data-values/serialization": "~1.1",
-"data-values/time": "~0.8.4",
-"data-values/validators": "~0.1.0",
-"data-values/value-view": "~0.17.3",
-"diff/diff": "~2.0",
-"php": ">=5.5.0",
-"wikibase/data-model": "~6.1",
-"wikibase/data-model-javascript": 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Delete check_nrpe.cfg

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: icinga: Delete check_nrpe.cfg
..

icinga: Delete check_nrpe.cfg

Not actually used anywhere

Change-Id: If438f00b5359ac66313ee3408f6cea86b39146c9
---
D modules/nagios_common/files/check_commands/check_nrpe.cfg
1 file changed, 0 insertions(+), 10 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_nrpe.cfg 
b/modules/nagios_common/files/check_commands/check_nrpe.cfg
deleted file mode 100644
index 7f1d32e..000
--- a/modules/nagios_common/files/check_commands/check_nrpe.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-define command {
-   command_namecheck_nrpe
-   command_line/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c 
$ARG1$ -a $ARG2$
-}
-
-# this command runs a program $ARG1$ with no arguments
-define command {
-   command_namecheck_nrpe_1arg
-   command_line/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c 
$ARG1$
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If438f00b5359ac66313ee3408f6cea86b39146c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.28.0-wmf.21]: Update Wikibase, add EntityHandler::supportsCategories

[jenkins-bot (Code Review)]

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

Change subject: Update Wikibase, add EntityHandler::supportsCategories
..


Update Wikibase, add EntityHandler::supportsCategories

Contains f7e8e4a23141948d5caf0515111fb7a63f5aaa40.

Will ease T147748.

Change-Id: I1761d0e1dbe88620969b0fc9e502358a0bfe3f0a
---
M composer.lock
M extensions/Wikibase/repo/includes/Content/EntityHandler.php
M extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
M vendor/composer/installed.json
4 files changed, 106 insertions(+), 93 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 0ce9e2d..3343e2f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1460,12 +1460,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6"
+"reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c756269cf3d0b6ea3e21084cba5756e2857fcbb6;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f7e8e4a23141948d5caf0515111fb7a63f5aaa40;,
+"reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40",
 "shasum": ""
 },
 "require": {
@@ -1539,7 +1539,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-10-03 18:04:02"
+"time": "2016-10-10 11:37:29"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/Content/EntityHandler.php 
b/extensions/Wikibase/repo/includes/Content/EntityHandler.php
index c335f08..ac57e82 100644
--- a/extensions/Wikibase/repo/includes/Content/EntityHandler.php
+++ b/extensions/Wikibase/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
 
/**
+* None of the Entity content models support categories.
+*
+* @return bool Always false.
+*/
+   public function supportsCategories() {
+   return false;
+   }
+
+   /**
 * @see ContentHandler::makeRedirectContent
 *
 * @warn Always throws an MWException, since an EntityRedirects needs 
to know it's own
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)', 
$context->getOutput()->getHTML() );
}
 
+   public function testSupportsCategories() {
+   $this->assertFalse( $this->getHandler()->supportsCategories() );
+   }
+
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ac18396..05e6598 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1342,95 +1342,6 @@
 ]
 },
 {
-"name": "wikibase/wikibase",
-"version": "dev-wmf/1.28.0-wmf.21",
-"version_normalized": "dev-wmf/1.28.0-wmf.21",
-"source": {
-"type": "git",
-"url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c756269cf3d0b6ea3e21084cba5756e2857fcbb6;,
-"reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6",
-"shasum": ""
-},
-"require": {
-"data-values/common": "~0.3.0",
-"data-values/data-types": "~0.5.0",
-"data-values/data-values": "~1.0",
-"data-values/geo": "~1.0",
-"data-values/interfaces": "~0.2.0|~0.1.5",
-"data-values/javascript": "~0.8.0",
-"data-values/number": "~0.7.0",
-"data-values/serialization": "~1.1",
-"data-values/time": "~0.8.4",
-"data-values/validators": "~0.1.0",
-"data-values/value-view": "~0.17.3",
-"diff/diff": "~2.0",
-"php": ">=5.5.0",
-"wikibase/data-model": "~6.1",
-"wikibase/data-model-javascript": "~3.0.0",
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Postgresql / postgis: use full package name

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

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

Change subject: Postgresql / postgis: use full package name
..

Postgresql / postgis: use full package name

postgresql-postgis package does not always have the same name, sometimes
including the version of postgis as a suffix. Previously, puppet would
install multiple postgresql-postgis packages on jessie. This fixes the
package name and ensure we only install a single version of postgis,
which should fix the broken pupet run.

Bug: T147780
Change-Id: Ib98d47db15345d8e137ea91976a0c4e736e137b3
---
M hieradata/role/common/maps/server.yaml
M modules/postgresql/manifests/postgis.pp
2 files changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/315077/1

diff --git a/hieradata/role/common/maps/server.yaml 
b/hieradata/role/common/maps/server.yaml
index 2dceaae..b486556 100644
--- a/hieradata/role/common/maps/server.yaml
+++ b/hieradata/role/common/maps/server.yaml
@@ -1,6 +1,5 @@
 cluster: maps
-postgresql::postgis::pgversion: 9.4
-postgresql::spatialdb::postgis_version: 2.1
+postgresql::spatialdb::postgis_version: 2.3
 cassandra::cluster_name: maps
 cassandra::data_directory_base: /srv/cassandra
 cassandra::data_file_directories: [/srv/cassandra/data]
diff --git a/modules/postgresql/manifests/postgis.pp 
b/modules/postgresql/manifests/postgis.pp
index 0064f74..abe0685 100644
--- a/modules/postgresql/manifests/postgis.pp
+++ b/modules/postgresql/manifests/postgis.pp
@@ -13,18 +13,18 @@
 # include postgresql::postgis
 #
 class postgresql::postgis(
-$ensure='present',
-$pgversion = $::lsbdistcodename ? {
-jessie  => '9.4',
-precise => '9.1',
-trusty  => '9.3',
+$ensure = 'present',
+$postgresql_postgis_package = $::lsbdistcodename ? {
+jessie  => 'postgresql-9.4-postgis-2.3',
+precise => 'postgresql-9.1-postgis',
+trusty  => 'postgresql-9.3-postgis-2.1',
 },
-) {
+) {
 
 package { [
-"postgresql-${pgversion}-postgis",
-'postgis',
-]:
+$postgresql_postgis_package,
+'postgis',
+]:
 ensure  => $ensure,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix the name of the Livvi-Karelian to fully Latin alphabet

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Fix the name of the Livvi-Karelian to fully Latin alphabet
..

Fix the name of the Livvi-Karelian to fully Latin alphabet

The letter "k" was for some reason written in the Cyrillic alphabet.
Everywhere else in the Wp/olo incubator it is written with the Latin
letter "k", so this must be a mistake.

Change-Id: I51eb44b4cdb6014aafb7e6b4e5a725434b86e877
---
M languages/data/Names.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/315078/1

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 836fb86..1ed9a44 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -316,7 +316,7 @@
'nv' => 'Diné bizaad', # Navajo
'ny' => 'Chi-Chewa', # Chichewa
'oc' => 'occitan', # Occitan
-   'olo' => 'Livvinкarjala', # Livvi-Karelian
+   'olo' => 'Livvinkarjala', # Livvi-Karelian
'om' => 'Oromoo', # Oromo
'or' => 'ଓଡ଼ିଆ', # Oriya
'os' => 'Ирон', # Ossetic, bug 29091

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: update unattended-upgrade setting

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: update unattended-upgrade setting
..

contint: update unattended-upgrade setting

Unattended-Upgrade::Allowed-Origins is marked as legacy even in Precise
version.  Replace it with Origins-Pattern.

Both are interchangeable and are merged. But lets drop the legacy use in
case it get removed in a future version.

Change-Id: I3f511f85fe409e608d1580c9b20a85ce49a0c611
---
M modules/contint/manifests/packages/apt.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/contint/manifests/packages/apt.pp 
b/modules/contint/manifests/packages/apt.pp
index d632dde..7783e24 100644
--- a/modules/contint/manifests/packages/apt.pp
+++ b/modules/contint/manifests/packages/apt.pp
@@ -8,7 +8,7 @@
 apt::conf { 'unattended-upgrades-wikimedia':
 priority => '51',
 # Key with trailing '::' to append to potentially existing entry
-key  => 'Unattended-Upgrade::Allowed-Origins::',
+key  => 'Unattended-Upgrade::Origins-Pattern::',
 # lint:ignore:single_quote_string_with_variables
 value=> 'Wikimedia:${distro_codename}-wikimedia',
 # lint:endignore

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Vary on puppet agent version

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: icinga: Vary on puppet agent version
..

icinga: Vary on puppet agent version

Puppet agent version 3.4 does not support the *mode* parameter. Vary on
the os version temporarily while the migration is ongoing

Change-Id: If7e0f4fcf7a68b62139d3ab5f359ef99946ca5a6
---
M modules/monitoring/manifests/group.pp
1 file changed, 32 insertions(+), 14 deletions(-)


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

diff --git a/modules/monitoring/manifests/group.pp 
b/modules/monitoring/manifests/group.pp
index 08b1df8..fb5e7ea 100644
--- a/modules/monitoring/manifests/group.pp
+++ b/modules/monitoring/manifests/group.pp
@@ -16,20 +16,38 @@
 $config_dir = '/etc/nagios'
 ) {
 # Nagios hostgroup instance
-nagios_hostgroup { $title:
-ensure => $ensure,
-target => "${config_dir}/puppet_hostgroups.cfg",
-hostgroup_name => $title,
-mode   => '0444',
-alias  => $description,
-}
+# TODO: Temporary, undo when neon is finally decomissioned
+if os_version('Debian >= jessie') {
+nagios_hostgroup { $title:
+ensure => $ensure,
+target => "${config_dir}/puppet_hostgroups.cfg",
+hostgroup_name => $title,
+mode   => '0444',
+alias  => $description,
+}
 
-# Nagios servicegroup instance
-nagios_servicegroup { $title:
-ensure=> $ensure,
-target=> "${config_dir}/puppet_servicegroups.cfg",
-servicegroup_name => $title,
-mode  => '0444',
-alias => $description,
+# Nagios servicegroup instance
+nagios_servicegroup { $title:
+ensure=> $ensure,
+target=> "${config_dir}/puppet_servicegroups.cfg",
+servicegroup_name => $title,
+mode  => '0444',
+alias => $description,
+}
+} else {
+nagios_hostgroup { $title:
+ensure => $ensure,
+target => "${config_dir}/puppet_hostgroups.cfg",
+hostgroup_name => $title,
+alias  => $description,
+}
+
+# Nagios servicegroup instance
+nagios_servicegroup { $title:
+ensure=> $ensure,
+target=> "${config_dir}/puppet_servicegroups.cfg",
+servicegroup_name => $title,
+alias => $description,
+}
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7e0f4fcf7a68b62139d3ab5f359ef99946ca5a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Vary on puppet agent version

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: icinga: Vary on puppet agent version
..


icinga: Vary on puppet agent version

Puppet agent version 3.4 does not support the *mode* parameter. Vary on
the os version temporarily while the migration is ongoing

Change-Id: If7e0f4fcf7a68b62139d3ab5f359ef99946ca5a6
---
M modules/monitoring/manifests/group.pp
1 file changed, 32 insertions(+), 14 deletions(-)

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



diff --git a/modules/monitoring/manifests/group.pp 
b/modules/monitoring/manifests/group.pp
index 08b1df8..fb5e7ea 100644
--- a/modules/monitoring/manifests/group.pp
+++ b/modules/monitoring/manifests/group.pp
@@ -16,20 +16,38 @@
 $config_dir = '/etc/nagios'
 ) {
 # Nagios hostgroup instance
-nagios_hostgroup { $title:
-ensure => $ensure,
-target => "${config_dir}/puppet_hostgroups.cfg",
-hostgroup_name => $title,
-mode   => '0444',
-alias  => $description,
-}
+# TODO: Temporary, undo when neon is finally decomissioned
+if os_version('Debian >= jessie') {
+nagios_hostgroup { $title:
+ensure => $ensure,
+target => "${config_dir}/puppet_hostgroups.cfg",
+hostgroup_name => $title,
+mode   => '0444',
+alias  => $description,
+}
 
-# Nagios servicegroup instance
-nagios_servicegroup { $title:
-ensure=> $ensure,
-target=> "${config_dir}/puppet_servicegroups.cfg",
-servicegroup_name => $title,
-mode  => '0444',
-alias => $description,
+# Nagios servicegroup instance
+nagios_servicegroup { $title:
+ensure=> $ensure,
+target=> "${config_dir}/puppet_servicegroups.cfg",
+servicegroup_name => $title,
+mode  => '0444',
+alias => $description,
+}
+} else {
+nagios_hostgroup { $title:
+ensure => $ensure,
+target => "${config_dir}/puppet_hostgroups.cfg",
+hostgroup_name => $title,
+alias  => $description,
+}
+
+# Nagios servicegroup instance
+nagios_servicegroup { $title:
+ensure=> $ensure,
+target=> "${config_dir}/puppet_servicegroups.cfg",
+servicegroup_name => $title,
+alias => $description,
+}
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7e0f4fcf7a68b62139d3ab5f359ef99946ca5a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
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] mediawiki...RevisionSlider[master]: Always apply data-pos attribute to pointers as well

[Tobias Gritschacher (Code Review)]

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Always apply data-pos attribute to pointers as well
..

Always apply data-pos attribute to pointers as well

Adding position data-attribute to the pointer elements and always
apply the same value as for the revision bars they are pointing to.

This will allow us to reduce the complexity of browsertests.

Bug: T146276
Change-Id: I6e6db55204b0c45fe94a5173e297a67a7ed38d00
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 24 insertions(+), 0 deletions(-)


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

diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index c1dfd48..36b03fa 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -213,6 +213,11 @@
 
self.refreshRevisions( revId1, revId2 );
 
+   self.updatePointerPositionAttributes(
+   self.getRevElementAtPosition( 
$revisions, self.pointerNewer.getPosition() ).data( 'pos' ),
+   self.getRevElementAtPosition( 
$revisions, self.pointerOlder.getPosition() ).data( 'pos' )
+   );
+
$( '.mw-revslider-revision-wrapper' 
).removeClass( 'mw-revslider-pointer-cursor' );
},
drag: function ( event, ui ) {
@@ -308,12 +313,14 @@
view.getRevElementAtPosition( 
$revisions, pOld.getPosition() ).data( 'revid' ),
$clickedRev.data( 'revid' )
);
+   view.updatePointerPositionAttributes( 
$clickedRev.attr( 'data-pos' ), null );
} else {
pOld.setPosition( parseInt( $clickedRev.attr( 
'data-pos' ), 10 ) );
view.refreshRevisions(
$clickedRev.data( 'revid' ),
view.getRevElementAtPosition( 
$revisions, pNew.getPosition() ).data( 'revid' )
);
+   view.updatePointerPositionAttributes( null, 
$clickedRev.attr( 'data-pos' ) );
}
 
view.resetPointerColorsBasedOnValues( 
view.pointerOlder.getPosition(), view.pointerNewer.getPosition() );
@@ -402,6 +409,7 @@
}
this.pointerNewer.setPosition( $newRevElement.data( 
'pos' ) );
this.resetPointerStylesBasedOnPosition();
+   this.updatePointerPositionAttributes( 
$newRevElement.data( 'pos' ), $oldRevElement.data( 'pos' ) )
},
 
/**
@@ -453,6 +461,22 @@
},
 
/**
+* Updates value of pointers' position data attribute
+*
+* @param {string|null} $newPos
+* @param {string|null} $oldPos
+*/
+   updatePointerPositionAttributes: function ( newPos, oldPos ) {
+   if ( newPos !== null ) {
+   
this.getNewRevPointer().getView().getElement().attr('data-pos', newPos);
+   }
+
+   if ( oldPos !== null ) {
+   
this.getOldRevPointer().getView().getElement().attr( 'data-pos', oldPos );
+   }
+   },
+
+   /**
 * @return {number}
 */
calculateSliderContainerWidth: function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e6db55204b0c45fe94a5173e297a67a7ed38d00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set default openldap log level to "sync"

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Set default openldap log level to "sync"
..


Set default openldap log level to "sync"

Remove "stats" from the default log level. We're already setting a lower
log level for the labs LDAP servers. Logging with "stats" is fairly
verbose and can lead to filled root partitions in times of high activity.

Bug: T147173

Change-Id: Ifb01a123f6ed5c1ba49ced4b3245e70eda2f52c9
---
M hieradata/hosts/seaborgium.yaml
M hieradata/hosts/serpens.yaml
M modules/openldap/manifests/init.pp
3 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Muehlenhoff: Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/hosts/seaborgium.yaml b/hieradata/hosts/seaborgium.yaml
index 68c97c5..f78160f 100644
--- a/hieradata/hosts/seaborgium.yaml
+++ b/hieradata/hosts/seaborgium.yaml
@@ -1,4 +1,3 @@
 openldap::master: ldap-labs.codfw.wikimedia.org
 openldap::server_id: 1
-openldap::logging: sync
 openldap::hash_passwords: SSHA
diff --git a/hieradata/hosts/serpens.yaml b/hieradata/hosts/serpens.yaml
index efc1d31..ef156ec 100644
--- a/hieradata/hosts/serpens.yaml
+++ b/hieradata/hosts/serpens.yaml
@@ -1,4 +1,3 @@
 openldap::master: ldap-labs.eqiad.wikimedia.org
 openldap::server_id: 2
-openldap::logging: sync
 openldap::hash_passwords: SSHA
diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index 32255d5..48d8177 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -39,7 +39,7 @@
 #   operation. May be set to a number or to 'unlimited'. If unset, the 
default
 #   is 2048.
 #$logging
-#   Optional. Specify the kind of logging desired. Defaults to "sync stats"
+#   Optional. Specify the kind of logging desired. Defaults to "sync"
 #   And it is not named loglevel cause that's a puppet metaparameter
 #$hash_passwords
 #   Optional. Specify what hashing scheme will be used by openldap to hash
@@ -72,7 +72,7 @@
 $extra_acls=undef,
 $extra_indices=undef,
 $size_limit=undef,
-$logging='sync stats',
+$logging='sync',
 $hash_passwords='SHA',
 ) {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb01a123f6ed5c1ba49ced4b3245e70eda2f52c9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Alexandros Kosiaris 
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] pywikibot/core[master]: [bugfix] reset the page.text content

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: [bugfix] reset the page.text content
..

[bugfix] reset the page.text content

- content retrieved from generator is saved in the page content
  yielded to the treat_page method. This content must be saved to
  a local variable and the page.text must be reseted to be updated
  from live wiki page.

Bug: T147766
Change-Id: I68fe4d61329b8827f3029d0ec7e184aa1a67446b
---
M scripts/pagefromfile.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/95/315095/1

diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py
index 23e5743..390f26f 100755
--- a/scripts/pagefromfile.py
+++ b/scripts/pagefromfile.py
@@ -130,7 +130,10 @@
 """Upload page content."""
 page = self.current_page
 title = page.title()
+# save the content retrieved from generator
 contents = page.text
+# delete page's text to get it from live wiki
+del page.text
 
 if self.getOption('summary'):
 comment = self.getOption('summary')
@@ -148,7 +151,7 @@
 if not self.getOption('redirect') and page.isRedirectPage():
 pywikibot.output(u"Page %s is redirect, skipping!" % title)
 return
-pagecontents = page.get(get_redirect=True)
+pagecontents = page.text
 nocontent = self.getOption('nocontent')
 if nocontent and (
 nocontent in pagecontents or

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix var_dump() and undefined var warning.

[jenkins-bot (Code Review)]

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

Change subject: Fix var_dump() and undefined var warning.
..


Fix var_dump() and undefined var warning.

Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 33d32aa..824328d 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -147,7 +147,9 @@
if ( !$lang ) {
$lang = $title->getPageLanguage();
}
-   $listOptions = $this->getFullRenderListOptions() + 
(array)$this->options;
+   $listOptions = $this->getFullRenderListOptions()
+   + (array)$this->options
+   + $this->getDefaultOptions();
$text = $this->convertToWikitext( $lang, $listOptions );
$output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
@@ -235,7 +237,6 @@
// you also need to change it in the 
stylesheet.
$text .= '[[File:' . $image->getName() 
. "|left|64px|alt=]]\n";
} else {
-var_dump( $options );
if ( $options['ismemberlist'] ) {
$placeholderIcon = 
'mw-ckicon-user-grey2';
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...citoid[master]: Fix typo that cause addItemType to fail

[jenkins-bot (Code Review)]

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

Change subject: Fix typo that cause addItemType to fail
..


Fix typo that cause addItemType to fail

A typo in lib/scraper caused the function addItemType to throw errors
and silently cause Promises to fail upstream. This would occur any time
there was dublinCore data but no highwirePress data.

Also Update two tests due to upstream metadata changes.

Bug: T98782
Change-Id: I6cf6aef8985e9ecc8aa0f38b605ee60a47df0a58
---
M lib/Scraper.js
M test/features/scraping/export.js
M test/features/scraping/index.js
3 files changed, 16 insertions(+), 7 deletions(-)

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



diff --git a/lib/Scraper.js b/lib/Scraper.js
index 6cc9efa..d352a49 100644
--- a/lib/Scraper.js
+++ b/lib/Scraper.js
@@ -254,7 +254,6 @@
 if (cr.doi && (citation.itemType === 'journalArticle' || 
citation.itemType === 'conferencePaper')){
 citation.DOI = cr.doi;
 }
-
 return cit;
 });
 
@@ -351,7 +350,6 @@
 function addItemType(metadata, citation){
 citation = citation || {};
 metadata = metadata || {};
-
 // Set citation type from metadata
 if (!citation.itemType){ // Don't overwrite itemtype
 if (metadata.bePress){
@@ -363,7 +361,7 @@
 else if (metadata.openGraph && metadata.openGraph['type'] && 
og.types[metadata.openGraph['type']]){ // if there is a type in the results and 
that type is defined   in openGraph.js
 citation.itemType = og.types[metadata.openGraph['type']];
 }
-else if (metadata.dublinCore && metadata.openGraph['type'] && 
dc.types[metadata.dublinCore['type']]){ // if there is a type in the results 
and that type is defined in dublinCore.js
+else if (metadata.dublinCore && metadata.dublinCore['type'] && 
dc.types[metadata.dublinCore['type']]){ // if there is a type in the results 
and that type is defined in dublinCore.js
 citation.itemType = dc.types[metadata.dublinCore['type']];
 }
 else {
diff --git a/test/features/scraping/export.js b/test/features/scraping/export.js
index c44c10d..613f320 100644
--- a/test/features/scraping/export.js
+++ b/test/features/scraping/export.js
@@ -65,7 +65,7 @@
 it('doi pointing to Zotero gotten response with name field instead of 
lastName in creators object', function() {
 return server.query('10.1001/jama.296.10.1274', 
'mwDeprecated').then(function(res) {
 assert.status(res, 200);
-assert.checkCitation(res, 'DOes this patient with headache 
have a migraine or need neuroimaging?');
+assert.checkCitation(res, 'Does This Patient With Headache 
Have a Migraine or Need Neuroimaging?');
 assert.deepEqual(!!res.body[0].accessDate, true, 'No 
accessDate present');
 assert.notDeepEqual(res.body[0].accessDate, 
'CURRENT_TIMESTAMP', 'Access date uncorrected');
 assert.ok(res.body[0]['author1-last']);
diff --git a/test/features/scraping/index.js b/test/features/scraping/index.js
index 3853c36..eb67b26 100644
--- a/test/features/scraping/index.js
+++ b/test/features/scraping/index.js
@@ -199,7 +199,8 @@
 });
 
 // Correctly adds authors from zotero 'name' field
-it('Correctly skips bad authors from Zotero whilst converting to 
mediawiki format', function() {
+// TODO: Add new tests to test this issue
+it.skip('Correctly skips bad authors from Zotero whilst converting to 
mediawiki format', function() {
 return 
server.query('http://dx.doi.org/10.1001/jama.296.10.1274').then(function(res) {
 var expectedAuthor = [
 [ '', 'Detsky ME'],
@@ -210,7 +211,7 @@
 ['','Booth CM']
 ];
 assert.status(res, 200);
-assert.checkCitation(res, 'DOes this patient with headache 
have a migraine or need neuroimaging?'); // Title from crossRef
+assert.checkCitation(res, 'Does This Patient With Headache 
Have a Migraine or Need Neuroimaging?'); // Title from crossRef
 assert.deepEqual(res.body[0].author, expectedAuthor);
 assert.deepEqual(res.body[0].itemType, 'journalArticle', 
'Wrong itemType; expected journalArticle, got' + res.body[0].itemType);
 });
@@ -313,7 +314,17 @@
 assert.checkCitation(res, 'Pinlig for Skåber');
 assert.isInArray(res.body[0].source, 'citoid');
 assert.deepEqual(res.body[0].itemType, 'newspaperArticle');
-assert.deepEqual(res.body[0].publicationTitle, 'Aftenposten')
+assert.deepEqual(res.body[0].publicationTitle, 'Aftenposten');
+});
+});
+
+it('dublinCore data but no highWire metadata', function() {
+return 

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare for next development iteration

[jenkins-bot (Code Review)]

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

Change subject: [maven-release-plugin] prepare for next development iteration
..


[maven-release-plugin] prepare for next development iteration

Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
---
M README.md
M pom.xml
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 7c3d3b8..3a4317d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,9 @@
 | 2.1.1   | 2.1.1 | 2016-05-12   |
 | 2.3.3.1 | 2.3.3 | 2016-06-27   |
 | 2.3.4   | 2.3.4 | 2016-08-03   |
+| 2.3.5   | 2.3.5 | 2016-09-09   |
 | 2.4.0   | 2.4.0 | 2016-09-09   |
+| 2.4.1   | 2.4.1 | 2016-10-10   |
 
 Only the versions in the table above should be used. The in-between releases
 were buggy and are not recommended.
diff --git a/pom.xml b/pom.xml
index cee6428..fd7356f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1
+2.4.2-SNAPSHOT
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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...CollaborationKit[master]: Fix transclusion of memberlist to still be memberlist.

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix transclusion of memberlist to still be memberlist.
..

Fix transclusion of memberlist to still be memberlist.

Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
---
M includes/content/CollaborationListContent.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 824328d..b45422b 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -155,6 +155,12 @@
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
}
 
+   private function getOverrideOptions() {
+   $this->decode();
+   $opts = (array)$this->options;
+   return [ 'ismemberlist' => !empty( $opts['ismemberlist'] ) ];
+   }
+
private function getFullRenderListOptions() {
return $listOptions = [
'includeDesc' => true,
@@ -172,7 +178,7 @@
 */
public function convertToWikitext( Language $lang, $options = [] ) {
$this->decode();
-   $options = $options + $this->getDefaultOptions();
+   $options = $options + $this->getOverrideOptions() + 
$this->getDefaultOptions();
$maxItems = $options['maxItems'];
$includeDesc = $options['includeDesc'];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist Pwirth <wi...@hallowelt.biz>

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Whitelist Pwirth 
..

Whitelist Pwirth 

See user contribution which is manly in BlueSpice* projects

https://gerrit.wikimedia.org/r/#/q/owner:%22Pwirth+%253Cwirth%2540hallowelt.biz%253E%22

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/16/315116/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fefad95..e89becd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -211,6 +211,7 @@
 | wiki@physikerwelt\.de
 | wikiposta@gmail\.com
 | wiki@strainu\.ro
+| wirth@hallowelt\.biz
 | xietaoecho@gmail\.com
 | yaron57@gmail\.com
 | yuriastrakhan@gmail\.com
@@ -444,6 +445,7 @@
- ^w@mzmcbride\.com$
- ^wctaiwan@gmail\.com$
- ^wiki@physikerwelt\.de$
+   - ^wirth@hallowelt\.biz$ # Pwirth
- ^yaron57@gmail\.com$
- ^zhorishna@gmail\.com$ # Isarra
- ^mwalker@khaosdev\.com$ # Matt Walker

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

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

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare release experimental-2.4.1

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare release experimental-2.4.1
..

[maven-release-plugin] prepare release experimental-2.4.1

Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
---
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/35/315135/1

diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index a7e128d..c85ff4a 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index bb3d6bc..4064c65 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 07c9b8a..180cc5b 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 9c8e489..0c0b744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1-SNAPSHOT
+  2.4.1
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-HEAD
+experimental-2.4.1
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare for next development iteration

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare for next development iteration
..

[maven-release-plugin] prepare for next development iteration

Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
---
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
5 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/36/315136/1

diff --git a/README.md b/README.md
index 594b66e..aa03864 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,9 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.4.0, master branch| 2.4.0   |
+| 2.4.1, master branch| 2.4.1   |
+| 2.4.0,  | 2.4.0   |
+| 2.3.5, 2.3 branch   | 2.3.5   |
 | 2.3.4   | 2.3.4   |
 | 2.3.3   | 2.3.3   |
 | 2.2.2, 2.2 branch   | 2.2.2   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index c85ff4a..edfb9fa 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 4064c65..82ef6ed 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 180cc5b..d2d409a 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 0c0b744..3c56d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1
+  2.4.2-SNAPSHOT
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-experimental-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 2.4.1

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Upgrade to elastic 2.4.1
..

Upgrade to elastic 2.4.1

Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/34/315134/1

diff --git a/pom.xml b/pom.xml
index 7d216f4..9c8e489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 
 5.5.2
@@ -294,7 +294,7 @@
   securemock

-  1.1
+  1.2
   test
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 2.4.1

[jenkins-bot (Code Review)]

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

Change subject: Upgrade to elastic 2.4.1
..


Upgrade to elastic 2.4.1

Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/pom.xml b/pom.xml
index 7d216f4..9c8e489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 
 5.5.2
@@ -294,7 +294,7 @@
   securemock

-  1.1
+  1.2
   test
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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]: Scap: modify deploy-local arguments

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Scap: modify deploy-local arguments
..

Scap: modify deploy-local arguments

For scap to make fewer (possibly bad) assumptions about the environment
into which it is deploying more information needs be passed from the
command line arguments.

This change modifies any puppetized invocations of deploy-local to use
the new argument format.

This change will need to land along side the deployment of the scap
package that supports this change.

Bug: T146602
Change-Id: I4e0421b6ea6dda854998a59ef3165002ff022355
---
M modules/scap/lib/puppet/provider/package/scap3.rb
M modules/scap/manifests/target.pp
M modules/scap/spec/types/package/scap3_spec.rb
M modules/service/manifests/node.pp
M modules/service/templates/node/apply-config.sh.erb
5 files changed, 22 insertions(+), 9 deletions(-)


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

diff --git a/modules/scap/lib/puppet/provider/package/scap3.rb 
b/modules/scap/lib/puppet/provider/package/scap3.rb
index 4a28799..45caf06 100644
--- a/modules/scap/lib/puppet/provider/package/scap3.rb
+++ b/modules/scap/lib/puppet/provider/package/scap3.rb
@@ -57,7 +57,7 @@
 
 uid = Etc.getpwnam(deploy_user).uid
 
-execute([self.class.command(:scap), 'deploy-local', '--repo', repo_path, 
'-D', 'log_json:False'],
+execute([self.class.command(:scap), 'deploy-local', '-D', 
'log_json:False', host_path, target_path],
 :uid => uid, :failonfail => true)
   end
 
@@ -124,6 +124,14 @@
 @deploy_user ||= install_option('owner', 'root')
   end
 
+  def host
+@host_name ||= install_option('host', 'deployment.eqiad.wmnet')
+  end
+
+  def host_path
+'http://' + File.join(host, repo_path)
+  end
+
   def repo
 resource[:name]
   end
diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp
index 00a9955..853114e 100644
--- a/modules/scap/manifests/target.pp
+++ b/modules/scap/manifests/target.pp
@@ -87,14 +87,13 @@
 }
 }
 
-
+$deployment_host = hiera('scap::deployment_server')
 
 if $::realm == 'labs' {
 if !defined(Security::Access::Config["scap-allow-${deploy_user}"]) {
 # Allow $deploy_user login from scap deployment host.
 # adds an exception in /etc/security/access.conf
 # to work around labs-specific restrictions
-$deployment_host = hiera('scap::deployment_server')
 $deployment_ip = ipresolve($deployment_host, 4, $::nameservers[0])
 security::access::config { "scap-allow-${deploy_user}":
 content  => "+ : ${deploy_user} : ${deployment_ip}\n",
@@ -104,8 +103,10 @@
 }
 
 package { $package_name:
-install_options => [{
-  owner => $deploy_user}],
+install_options  => [{
+  owner  => $deploy_user,
+  host => $deployment_host,
+}],
 provider=> 'scap3',
 require => [Package['scap'], User[$deploy_user]],
 }
diff --git a/modules/scap/spec/types/package/scap3_spec.rb 
b/modules/scap/spec/types/package/scap3_spec.rb
index 82cf391..650dc03 100644
--- a/modules/scap/spec/types/package/scap3_spec.rb
+++ b/modules/scap/spec/types/package/scap3_spec.rb
@@ -28,8 +28,9 @@
 it 'should specify the right repo' do
   allow(FileUtils).to receive(:cd)
   expect(@provider).to receive(:execute).
-with(['/usr/bin/scap', 'deploy-local', '--repo', 'foo/deploy', '-D', 
'log_json:False'],
- uid: 666, failonfail: true)
+with(['/usr/bin/scap', 'deploy-local', '-D', 'log_json:False',
+  'http://deployment.eqiad.wmnet/foo/deploy', 
'/srv/deployment/foo/deploy'],
+  uid: 666, failonfail: true)
   @provider.install
 end
   end
diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index fb466fc..f2c66ba 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -272,6 +272,7 @@
 # the file and install its symlink
 $chown_user = "${deployment_user}:${deployment_user}"
 $chown_target = "/etc/${title}/config.yaml"
+$deployment_host = hiera('scap::deployment_host')
 exec { "chown ${chown_target}":
 command => "/bin/chown ${chown_user} ${chown_target}",
 # perform the chown only if root is the effective owner
diff --git a/modules/service/templates/node/apply-config.sh.erb 
b/modules/service/templates/node/apply-config.sh.erb
index 5ae72d9..9437acd 100755
--- a/modules/service/templates/node/apply-config.sh.erb
+++ b/modules/service/templates/node/apply-config.sh.erb
@@ -3,5 +3,7 @@
 # Do not modify it manually
 
 set -e
-/usr/bin/scap deploy-local -D 'log_json:False' --repo <%= @repo %> --force 
config_deploy;
-<%- if @auto_refresh 

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix coding style, remove some outdated comments, extra var_dumb

[Isarra (Code Review)]

Isarra has uploaded a new change for review.

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

Change subject: Fix coding style, remove some outdated comments, extra var_dumb
..

Fix coding style, remove some outdated comments, extra var_dumb

Change-Id: Ia2a94ca954080721dcc5b7b7dec902bb3a672cb0
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentSchema.php
M includes/content/CollaborationListContent.php
3 files changed, 51 insertions(+), 67 deletions(-)


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

diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index 62c359d..f85d132 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -220,7 +220,6 @@
$html .= Html::rawElement(
'div',
[ 'class' => 'wp-header-image' ],
-   // TODO move all image stuff to ToC class (what is that 
class even going to be, anyway?)
$this->getParsedImage( $this->getImage(), 200 )
);
// get members list
@@ -316,31 +315,31 @@
if ( $membersTitle->exists() ) {
$membersContent = Revision::newFromTitle( $membersTitle 
)->getContent();
$wikitext = $membersContent->convertToWikitext(
-   $lang,
-   [
-   'includeDesc' 
=> false,
-   'maxItems' => 3,
-   'defaultSort' 
=> 'random'
-   ]
-   );
+   $lang,
+   [
+   'includeDesc' => false,
+   'maxItems' => 3,
+   'defaultSort' => 'random'
+   ]
+   );
$membersListHtml = $wgParser->parse( $wikitext, 
$membersTitle, $options )->getText();
 
// rawElement is used because we don't want [edit] 
links or usual header behavior
$membersHeader = Html::rawElement(
-   
'h3',
-   
[ 'style' => 'text-align: center; padding-bottom: 1em;' ],
-   
wfMessage( 'collaborationkit-hub-members-header' )
-   );
+   'h3',
+   [ 'style' => 'text-align: center; 
padding-bottom: 1em;' ],
+   wfMessage( 
'collaborationkit-hub-members-header' )
+   );
 
$membersViewButton = new OOUI\ButtonWidget( [
-   
'label' => wfMessage( 'collaborationkit-hub-members-view' 
)->inContentLanguage()->text(),
-   
'href' => $membersTitle->getLinkURL()
-   ] );
+   'label' => wfMessage( 
'collaborationkit-hub-members-view' )->inContentLanguage()->text(),
+   'href' => $membersTitle->getLinkURL()
+   ] );
$membersJoinButton = new OOUI\ButtonWidget( [
-   
'label' => wfMessage( 'collaborationkit-hub-members-signup' 
)->inContentLanguage()->text(),
-   
'href' => $membersTitle->getEditURL(), // Going through editor is non-JS 
fallback
-   
'flags' => [ 'primary', 'progressive' ]
-   ] );
+   'label' => wfMessage( 
'collaborationkit-hub-members-signup' )->inContentLanguage()->text(),
+   'href' => $membersTitle->getEditURL(), // Going 
through editor is non-JS fallback
+   'flags' => [ 'primary', 'progressive' ]
+   ] );
 
OutputPage::setupOOUI();

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: The second paramter in rawElement is attributes, not content

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: The second paramter in rawElement is attributes, not content
..

The second paramter in rawElement is attributes, not content

With proper typehinting this wouldn't have happened

Bug: T147789
Change-Id: I19ef9388acfd9159304b8141c54ce1ead27d0791
---
M includes/TemplatesOnThisPageFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/315144/1

diff --git a/includes/TemplatesOnThisPageFormatter.php 
b/includes/TemplatesOnThisPageFormatter.php
index c0ae374..494c7bf 100644
--- a/includes/TemplatesOnThisPageFormatter.php
+++ b/includes/TemplatesOnThisPageFormatter.php
@@ -93,11 +93,11 @@
}
 
if ( $more instanceof LinkTarget ) {
-   $outText .= Html::rawElement( 'li', 
$this->linkRenderer->makeLink(
+   $outText .= Html::rawElement( 'li', [], 
$this->linkRenderer->makeLink(
$more, $this->context->msg( 'moredotdotdot' 
)->text() ) );
} elseif ( $more ) {
// Documented as should already be escaped
-   $outText .= Html::rawElement( 'li', $more );
+   $outText .= Html::rawElement( 'li', [], $more );
}
 
$outText .= '';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Do not relocate first paragraph in new endpoint

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Do not relocate first paragraph in new endpoint
..

Do not relocate first paragraph in new endpoint

This moves the logic for relocating a lead paragraph into the routes
that serve it. Previously we did this for all endpoints but it doesn't
seem necessary for the media endpoint.

This means the transformation is not invoked in the new endpoint.

The method is also updated to take the lead as an input to avoid an
addition node lookup.

Change-Id: Iedd38dca724d62e7b9a86cf04d9858b213aae27c
---
M lib/parsoid-access.js
M lib/transformations/relocateFirstParagraph.js
M lib/transforms.js
M routes/mobile-sections.js
M routes/mobile-summary.js
5 files changed, 21 insertions(+), 15 deletions(-)


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

diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index abbd482..420589b 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -13,7 +13,6 @@
 var parseSection = require('./parseSection');
 var parseProperty = require('./parseProperty');
 var parseDefinition = require('./parseDefinition');
-var relocateFirstParagraph = 
require('./transformations/relocateFirstParagraph');
 var transforms = require('./transforms');
 var HTTPError = sUtil.HTTPError;
 
@@ -151,13 +150,6 @@
 transforms.stripUnneededMarkup(doc);
 addSectionDivs(doc);
 transforms.addRequiredMarkup(doc);
-
-// Move the first good paragraph up for any page except main pages.
-// It's ok to do unconditionally since we throw away the page
-// content if this turns out to be a main page.
-//
-// TODO: should we also exclude file and other special pages?
-relocateFirstParagraph(doc);
 
 page.sections = getSectionsText(doc);
 return page;
diff --git a/lib/transformations/relocateFirstParagraph.js 
b/lib/transformations/relocateFirstParagraph.js
index 5d5dcf1..b910600 100644
--- a/lib/transformations/relocateFirstParagraph.js
+++ b/lib/transformations/relocateFirstParagraph.js
@@ -77,12 +77,15 @@
 return leadSpan;
 }
 
-// Move the first non-empty paragraph (and related elements) of the lead 
section
-// to the top of the lead section.
-// This will have the effect of shifting the infobox and/or any images at the 
top of the page
-// below the first paragraph, allowing the user to start reading the page 
right away.
-function moveFirstGoodParagraphUp(doc) {
-var leadSection = doc.getElementById('section_0');
+/**
+ * Move the first non-empty paragraph (and related elements) of the lead 
section
+ * to the top of the lead section.
+ * This will have the effect of shifting the infobox and/or any images at the 
top of the page
+ * below the first paragraph, allowing the user to start reading the page 
right away.
+ * @param {Document} lead a document that has the lead section as the body
+ */
+function moveFirstGoodParagraphUp(lead) {
+var leadSection = lead.body;
 if ( !leadSection ) {
 return;
 }
@@ -92,7 +95,7 @@
 return;
 }
 
-var leadSpan = createLeadSpan( doc, childNodes );
+var leadSpan = createLeadSpan( lead, childNodes );
 leadSection.insertBefore( leadSpan, leadSection.firstChild );
 }
 
diff --git a/lib/transforms.js b/lib/transforms.js
index c20bfa9..08ce2e1 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -11,6 +11,7 @@
 var hideRedLinks = require('./transformations/hideRedLinks');
 var hideIPA = require('./transformations/hideIPA');
 var extractHatnotes = require('./transformations/extractHatnotes');
+var relocateFirstParagraph = 
require('./transformations/relocateFirstParagraph');
 
 var transforms = {};
 
@@ -258,6 +259,7 @@
 transforms._rmBracketSpans = _rmBracketSpans;
 transforms._rmElementsWithSelectors = _rmElementsWithSelectors;
 
+transforms.relocateFirstParagraph = relocateFirstParagraph;
 transforms.extractHatnotes = extractHatnotes;
 
 module.exports = transforms;
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index e1524ba..cd2d41e 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -84,6 +84,14 @@
  */
 function buildLead(input, removeNodes) {
 var lead = domino.createDocument(input.page.sections[0].text);
+if ( !removeNodes ) {
+// Move the first good paragraph up for any page except main pages.
+// It's ok to do unconditionally since we throw away the page
+// content if this turns out to be a main page.
+//
+// TODO: should we also exclude file and other special pages?
+transforms.relocateFirstParagraph(lead);
+}
 var hatnotes = transforms.extractHatnotes(lead, removeNodes);
 
 // update text after extractions have taken place
diff --git 

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare release extra-2.4.1

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare release extra-2.4.1
..

[maven-release-plugin] prepare release extra-2.4.1

Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/32/315132/1

diff --git a/pom.xml b/pom.xml
index 40f9725..07ee946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1-SNAPSHOT
+  2.4.1
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-HEAD
+extra-2.4.1
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare for next development iteration

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare for next development iteration
..

[maven-release-plugin] prepare for next development iteration

Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
---
M README.md
M pom.xml
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/33/315133/1

diff --git a/README.md b/README.md
index cf58f6f..0f7fbd9 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,9 @@
 
 | Extra Queries and Filters Plugin |  ElasticSearch  |
 |--|-|
-| 2.4.0, master| 2.4.0   |
+| 2.4.1, master| 2.4.1   |
+| 2.4.0| 2.4.0   |
+| 2.3.5, 2.3 branch| 2.3.5   |
 | 2.3.4| 2.3.4   |
 | 2.3.3| 2.3.3   |
 | 1.7.0 -> 1.7.1, 1.7 branch   | 1.7.X   |
diff --git a/pom.xml b/pom.xml
index 07ee946..46fc3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1
+  2.4.2-SNAPSHOT
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-extra-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare for next development iteration

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare for next development iteration
..

[maven-release-plugin] prepare for next development iteration

Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
---
M README.md
M pom.xml
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/30/315130/1

diff --git a/README.md b/README.md
index 7c3d3b8..3a4317d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,9 @@
 | 2.1.1   | 2.1.1 | 2016-05-12   |
 | 2.3.3.1 | 2.3.3 | 2016-06-27   |
 | 2.3.4   | 2.3.4 | 2016-08-03   |
+| 2.3.5   | 2.3.5 | 2016-09-09   |
 | 2.4.0   | 2.4.0 | 2016-09-09   |
+| 2.4.1   | 2.4.1 | 2016-10-10   |
 
 Only the versions in the table above should be used. The in-between releases
 were buggy and are not recommended.
diff --git a/pom.xml b/pom.xml
index cee6428..fd7356f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1
+2.4.2-SNAPSHOT
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare release swift-repository-plug...

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare release 
swift-repository-plugin-2.4.1
..

[maven-release-plugin] prepare release swift-repository-plugin-2.4.1

Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/29/315129/1

diff --git a/pom.xml b/pom.xml
index 8ea8beb..cee6428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1-SNAPSHOT
+2.4.1
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: Upgrade to elastic 2.4.1

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Upgrade to elastic 2.4.1
..

Upgrade to elastic 2.4.1

Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/28/315128/1

diff --git a/pom.xml b/pom.xml
index bfee359..8ea8beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
 
 UTF-8
-2.4.0
+2.4.1
 swift-repository
 1.7
 1.7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/extra[master]: Upgrade to elastic 2.4.1

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Upgrade to elastic 2.4.1
..

Upgrade to elastic 2.4.1

Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/31/315131/1

diff --git a/pom.xml b/pom.xml
index 88b84bc..40f9725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 5.5.2
 1.7
 1.7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Mark 1 hooks deprecated by ContentHandler as such

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Mark 1 hooks deprecated by ContentHandler as such
..

Mark 1 hooks deprecated by ContentHandler as such

EditFilterMerged hook now marked as deprecated in 1.21.

Bug: T145728
Change-Id: I1c0589b617b5aa3dc444259fad06d9c10379728f
---
M RELEASE-NOTES-1.28
M includes/EditPage.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/315137/1

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 8a25a05..8065a6b 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -225,8 +225,8 @@
   migrate to using the same functions on a ProxyLookup instance, obtainable 
from
   MediaWikiServices.
 * The ArticleAfterFetchContent, ArticleInsertComplete, ArticleSave, 
ArticleSaveComplete,
-  ArticleViewCustom, EditPageGetDiffText, EditPageGetPreviewText and 
ShowRawCssJs hooks
-  will now emit deprecation warnings if used.
+  ArticleViewCustom, EditFilterMerged, EditPageGetDiffText, 
EditPageGetPreviewText
+  and ShowRawCssJs hooks will now emit deprecation warnings if used.
 
 == Compatibility ==
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8226da5..3c9ec41 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1613,7 +1613,7 @@
protected function runPostMergeFilters( Content $content, Status 
$status, User $user ) {
// Run old style post-section-merge edit filter
if ( !ContentHandler::runLegacyHooks( 'EditFilterMerged',
-   [ $this, $content, &$this->hookError, $this->summary ]
+   [ $this, $content, &$this->hookError, $this->summary ], 
'1.21'
) ) {
# Error messages etc. could be handled within the 
hook...
$status->fatal( 'hookaborted' );

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

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

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare release swift-repository-plug...

[jenkins-bot (Code Review)]

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

Change subject: [maven-release-plugin] prepare release 
swift-repository-plugin-2.4.1
..


[maven-release-plugin] prepare release swift-repository-plugin-2.4.1

Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index 8ea8beb..cee6428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1-SNAPSHOT
+2.4.1
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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/repository-swift[master]: Upgrade to elastic 2.4.1

[jenkins-bot (Code Review)]

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

Change subject: Upgrade to elastic 2.4.1
..


Upgrade to elastic 2.4.1

Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index bfee359..8ea8beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
 
 UTF-8
-2.4.0
+2.4.1
 swift-repository
 1.7
 1.7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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...CollaborationKit[master]: Adding WikiProject scope to CollaborationHubContent schema.

[jenkins-bot (Code Review)]

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

Change subject: Adding WikiProject scope to CollaborationHubContent schema.
..


Adding WikiProject scope to CollaborationHubContent schema.

This adds a new scope object to the CollaborationHubContent schema in 
anticipation of its future use. We are not currently designing a UI around it, 
however.

Bug: T129247
Change-Id: I7412faad9916e50de078cf5b0063263959efa985
---
M includes/content/CollaborationHubContentSchema.php
1 file changed, 71 insertions(+), 0 deletions(-)

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



diff --git a/includes/content/CollaborationHubContentSchema.php 
b/includes/content/CollaborationHubContentSchema.php
index 05df63a..937d9be 100644
--- a/includes/content/CollaborationHubContentSchema.php
+++ b/includes/content/CollaborationHubContentSchema.php
@@ -77,6 +77,77 @@
],
],
],
+   'scope' =>
+   [
+   'type' => 'object',
+   'properties' =>
+   [
+   'included_categories' =>
+   [
+   'type' => 'array',
+   'items' =>
+   [
+   [
+   'type' => 'object',
+   'properties' =>
+   [
+   'category_name' 
=>
+   [
+   'type' 
=> 'string'
+   ],
+   
'category_depth' =>
+   [
+   'type' 
=> 'number',
+   
'default' => 9
+   ]
+   ]
+   ]
+   ]
+   ],
+   'excluded_categories' =>
+   [
+   'type' => 'array',
+   'items' =>
+   [
+   [
+   'type' => 'object',
+   'properties' =>
+   [
+   'category_name' 
=>
+   [
+   'type' 
=> 'string'
+   ],
+   
'category_depth' =>
+   [
+   'type' 
=> 'number',
+   
'default' => 9
+   ]
+   ]
+   ]
+   ]
+   ],
+   'included_pages' =>
+   [
+   'type' => 'array',
+   'items' =>
+   [
+   [
+   'type' => 'string'
+   ]
+   ]
+   ],
+   'excluded_pages' =>
+   [
+   'type' => 'array',
+   'items' =>
+   [
+   [
+   'type' => 'string'
+   ]
+   ]
+   ]
+   ]
+

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: QA: Re-enable VisualEditor integration test

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: QA: Re-enable VisualEditor integration test
..

QA: Re-enable VisualEditor integration test

Change-Id: I0bb4a2b7a609a8fa38dc8675f9a0799849cc0a69
---
M tests/browser/features/editor_ve.feature
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/editor_ve.feature 
b/tests/browser/features/editor_ve.feature
index 2f38719..8eca3d1 100644
--- a/tests/browser/features/editor_ve.feature
+++ b/tests/browser/features/editor_ve.feature
@@ -1,4 +1,4 @@
-@chrome @editing @en.m.wikipedia.beta.wmflabs.org @extension-visualeditor 
@firefox @skip @vagrant
+@chrome @editing @en.m.wikipedia.beta.wmflabs.org @integration 
@extension-visualeditor @firefox @vagrant
 Feature: VisualEditor Mobile
 
   # Tests are skipped due to https://phabricator.wikimedia.org/T88559

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bb4a2b7a609a8fa38dc8675f9a0799849cc0a69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable signature button in Portal: on de.wikipedia

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Enable signature button in Portal: on de.wikipedia
..

Enable signature button in Portal: on de.wikipedia

The German Wikipedia community discussed several strategies to offer
a signature button in the interface.

James Forrester stresses on the fact we shouldn't offer antifeature,
ie features contributors shouldn't use as frowned upon by the community
like put a signature in an article.

As such, we deploy it to a somewhat safe namespace, Portal:,
as a rather consensual option inside the German Wikipedia community,
and avoiding the antifeature pattern.

Reference: 
https://de.wikipedia.org/wiki/Wikipedia:Umfragen/Unterschriften-Icon_in_Bearbeiten-Werkzeugleiste

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d794590..c931b78 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11222,6 +11222,7 @@
'+wikimedia' => [ NS_MAIN ],
'+special' => [ NS_MAIN ],
 
+   '+dewiki' => [ 100 ], // Portal - T145619
'+dewikivoyage' => [ 102 ], // T119420
'+frwiki' => [ 102 ], // T127688
'+itwiki' => [ 102 ],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace ArticleSaveComplete hook usage

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I8536dd78d03772f40ffb4815354ef59a204db086
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage 
refs/changes/24/315124/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8536dd78d03772f40ffb4815354ef59a204db086
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
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...CategorySlideShow[master]: Remove dependency on 'jquery' and 'mediawiki' modules

[jenkins-bot (Code Review)]

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

Change subject: Remove dependency on 'jquery' and 'mediawiki' modules
..


Remove dependency on 'jquery' and 'mediawiki' modules

Follows-up ec77226078.

Not needed since these are base modules, which are not valid
dependencies (PHPUnit structure test fails).

Change-Id: I2129de25d78ce68ab4aa875f62276dcf801a8216
---
M CategorySlideShow.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/CategorySlideShow.php b/CategorySlideShow.php
index 11404db..65c79ea 100644
--- a/CategorySlideShow.php
+++ b/CategorySlideShow.php
@@ -40,10 +40,8 @@
),
 
'dependencies' => array(
-   'mediawiki',
'mediawiki.Title',
-   'mediawiki.api.query',
-   'jquery',
+   'mediawiki.api',
'jquery.ui.dialog',
),
 ) + $moduleInfo;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2129de25d78ce68ab4aa875f62276dcf801a8216
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CategorySlideShow
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.28.0-wmf.21]: Fixup maintenance/CleanDuplicateScores.php

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Fixup maintenance/CleanDuplicateScores.php
..

Fixup maintenance/CleanDuplicateScores.php

Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
---
M maintenance/CleanDuplicateScores.php
1 file changed, 12 insertions(+), 8 deletions(-)


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

diff --git a/maintenance/CleanDuplicateScores.php 
b/maintenance/CleanDuplicateScores.php
index 45f114e..578aac0 100644
--- a/maintenance/CleanDuplicateScores.php
+++ b/maintenance/CleanDuplicateScores.php
@@ -22,22 +22,26 @@
public function execute() {
$dbr = \wfGetDB( DB_REPLICA );
$dbw = \wfGetDB( DB_MASTER );
+   $groupConcat = $dbr->buildGroupConcatField(
+   '|',
+   'ores_classification AS OC',
+   'ores_classification.oresc_id',
+   'OC.oresc_id = ores_classification.oresc_id'
+   );
$res = $dbr->select(
'ores_classification',
-   [ 'oresc_id', 'oresc_rev', 'oresc_model', 'oresc_class' 
],
+   [ 'oresc_rev', 'oresc_model', 'oresc_class' , 'ids' => 
$groupConcat ],
'',
__METHOD__,
[ 'GROUP BY' => 'oresc_rev, oresc_model, oresc_class',
'HAVING' => 'COUNT(*) > 1' ]
);
$ids = [];
-   $dump = [];
-   foreach ( $row as $res ) {
-   $key = implode( ',', [ $row->oresc_rev, 
$row->oresc_model, $row->oresc_class ] );
-   if ( array_has_key( $key, $dump ) ) {
-   $ids[] = $row->oresc_id;
-   } else {
-   $dump[] = $key;
+   foreach ( $res as $row ) {
+   $rowIds = explode( '|', $row->ids );
+   if ( $rowIds > 1 ) { // Sanity
+   $newIds = array_slice( $rowIds, 1 );
+   $ids = array_merge( $ids, $newIds );
}
}
$c = count( $ids );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[wmf/1.28.0-wmf.21]: Don't show warning confirmation dialog when there are no war...

[jenkins-bot (Code Review)]

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

Change subject: Don't show warning confirmation dialog when there are no 
warnings
..


Don't show warning confirmation dialog when there are no warnings

In JavaScript, an empty array isn't falsy...

Bug: T147659
Change-Id: Ibaace3d0c07e46c56694683facf00a0ccb2b2bfe
---
M resources/controller/uw.controller.Details.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Prtksxna: Looks good to me, but someone else must approve
  Dereckson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index 9b06a38..0d4fe06 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -214,7 +214,7 @@
return result.concat( 
warnings );
}, [] );
 
-   if ( warnings ) {
+   if ( warnings.length > 0 ) {
// Update warning count before 
dialog
detailsController.showErrors();
return 
detailsController.confirmationDialog( warnings );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaace3d0c07e46c56694683facf00a0ccb2b2bfe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Prtksxna 
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]: Add documentation to systemd::syslog and an optional filepat...

[Elukey (Code Review)]

Elukey has uploaded a new change for review.

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

Change subject: Add documentation to systemd::syslog and an optional filepath 
variable
..

Add documentation to systemd::syslog and an optional filepath variable

Change-Id: I7f10206ae6015991c075d45b2a7cb9a502911141
---
M modules/systemd/manifests/syslog.pp
1 file changed, 36 insertions(+), 8 deletions(-)


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

diff --git a/modules/systemd/manifests/syslog.pp 
b/modules/systemd/manifests/syslog.pp
index 5a468c0..be4d469 100644
--- a/modules/systemd/manifests/syslog.pp
+++ b/modules/systemd/manifests/syslog.pp
@@ -1,8 +1,36 @@
+# == systemd::syslog ==
+#
+# Configures logging via rsyslog and logrotate for systemd units. 
+#
+# === Paramenters ===
+#
+# [*base_dir*]
+#  Base directory path for the logging directory. The 'title' will be appended
+#  to form the final string value (example: 'title' => 'servicebla',
+#  log dir => /var/log/servicebla) 
+#  Default: '/var/log'
+#
+# [*owner*]
+# User owner of the final logging directory.
+#
+# [*group*]
+# Group owner of the final logging directory.
+#
+# [*readable_by*]
+# Establish the File permissions assigned to the final logging directory.
+# Options available: 'user' (0600), 'group' (0640), all '0644'
+# Default: 'group'
+# 
+# [*logfilename*]
+# Filename of the logging file.
+# Default: 'syslog.log'
+#
 define systemd::syslog(
-$base_dir='/var/log',
-$owner=$title,
-$group=$title,
-$readable_by='group'
+$base_dir = '/var/log',
+$owner= $title,
+$group= $title,
+$readable_by  = 'group'
+$log_filename = 'syslog.log' 
 ) {
 if $::initsystem != 'systemd' {
 fail('systemd::syslog is useful only with systemd')
@@ -11,13 +39,13 @@
 # File permissions
 $dirmode = '0755'
 $filemode = $readable_by ? {
-'user' => '0600',
-'group' =>'0640',
-'all' => '0644'
+'user'  => '0600',
+'group' => '0640',
+'all'   => '0644'
 }
 
 $local_logdir = "${base_dir}/${title}"
-$local_syslogfile = "${local_logdir}/syslog.log"
+$local_syslogfile = "${local_logdir}/${log_filename}"
 
 if ! defined(File[$local_logdir]) {
 file { $local_logdir:

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

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

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare release extra-2.4.1

[jenkins-bot (Code Review)]

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

Change subject: [maven-release-plugin] prepare release extra-2.4.1
..


[maven-release-plugin] prepare release extra-2.4.1

Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/pom.xml b/pom.xml
index 40f9725..07ee946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1-SNAPSHOT
+  2.4.1
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-HEAD
+extra-2.4.1
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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/highlighter[master]: [maven-release-plugin] prepare release experimental-2.4.1

[jenkins-bot (Code Review)]

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

Change subject: [maven-release-plugin] prepare release experimental-2.4.1
..


[maven-release-plugin] prepare release experimental-2.4.1

Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
---
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
4 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index a7e128d..c85ff4a 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index bb3d6bc..4064c65 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 07c9b8a..180cc5b 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 9c8e489..0c0b744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1-SNAPSHOT
+  2.4.1
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-HEAD
+experimental-2.4.1
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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/extra[master]: Upgrade to elastic 2.4.1

[jenkins-bot (Code Review)]

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

Change subject: Upgrade to elastic 2.4.1
..


Upgrade to elastic 2.4.1

Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index 88b84bc..40f9725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 5.5.2
 1.7
 1.7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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/highlighter[master]: [maven-release-plugin] prepare for next development iteration

[jenkins-bot (Code Review)]

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

Change subject: [maven-release-plugin] prepare for next development iteration
..


[maven-release-plugin] prepare for next development iteration

Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
---
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
5 files changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/README.md b/README.md
index 594b66e..aa03864 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,9 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.4.0, master branch| 2.4.0   |
+| 2.4.1, master branch| 2.4.1   |
+| 2.4.0,  | 2.4.0   |
+| 2.3.5, 2.3 branch   | 2.3.5   |
 | 2.3.4   | 2.3.4   |
 | 2.3.3   | 2.3.3   |
 | 2.2.2, 2.2 branch   | 2.2.2   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index c85ff4a..edfb9fa 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 4064c65..82ef6ed 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 180cc5b..d2d409a 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 0c0b744..3c56d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1
+  2.4.2-SNAPSHOT
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-experimental-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
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[wmf/1.28.0-wmf.21]: Fixup maintenance/CleanDuplicateScores.php

[jenkins-bot (Code Review)]

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

Change subject: Fixup maintenance/CleanDuplicateScores.php
..


Fixup maintenance/CleanDuplicateScores.php

Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
---
M maintenance/CleanDuplicateScores.php
1 file changed, 12 insertions(+), 8 deletions(-)

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



diff --git a/maintenance/CleanDuplicateScores.php 
b/maintenance/CleanDuplicateScores.php
index 45f114e..578aac0 100644
--- a/maintenance/CleanDuplicateScores.php
+++ b/maintenance/CleanDuplicateScores.php
@@ -22,22 +22,26 @@
public function execute() {
$dbr = \wfGetDB( DB_REPLICA );
$dbw = \wfGetDB( DB_MASTER );
+   $groupConcat = $dbr->buildGroupConcatField(
+   '|',
+   'ores_classification AS OC',
+   'ores_classification.oresc_id',
+   'OC.oresc_id = ores_classification.oresc_id'
+   );
$res = $dbr->select(
'ores_classification',
-   [ 'oresc_id', 'oresc_rev', 'oresc_model', 'oresc_class' 
],
+   [ 'oresc_rev', 'oresc_model', 'oresc_class' , 'ids' => 
$groupConcat ],
'',
__METHOD__,
[ 'GROUP BY' => 'oresc_rev, oresc_model, oresc_class',
'HAVING' => 'COUNT(*) > 1' ]
);
$ids = [];
-   $dump = [];
-   foreach ( $row as $res ) {
-   $key = implode( ',', [ $row->oresc_rev, 
$row->oresc_model, $row->oresc_class ] );
-   if ( array_has_key( $key, $dump ) ) {
-   $ids[] = $row->oresc_id;
-   } else {
-   $dump[] = $key;
+   foreach ( $res as $row ) {
+   $rowIds = explode( '|', $row->ids );
+   if ( $rowIds > 1 ) { // Sanity
+   $newIds = array_slice( $rowIds, 1 );
+   $ids = array_merge( $ids, $newIds );
}
}
$c = count( $ids );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.21]: Do not normalise external links to special pages

[jenkins-bot (Code Review)]

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

Change subject: Do not normalise external links to special pages
..


Do not normalise external links to special pages

Bug: T147685
Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
---
M includes/Linker.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Linker.php b/includes/Linker.php
index 9011f17..d3d1f38 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -319,7 +319,7 @@
 * @return LinkTarget
 */
public static function normaliseSpecialPage( LinkTarget $target ) {
-   if ( $target->getNamespace() == NS_SPECIAL ) {
+   if ( $target->getNamespace() == NS_SPECIAL && 
!$target->isExternal() ) {
list( $name, $subpage ) = 
SpecialPageFactory::resolveAlias( $target->getDBkey() );
if ( !$name ) {
return $target;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Jackmcbarn 
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]: [BlueSpiceExtensions] Add dependance on extension BlueSpiceF...

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [BlueSpiceExtensions] Add dependance on extension 
BlueSpiceFoundation
..

[BlueSpiceExtensions] Add dependance on extension BlueSpiceFoundation

Change-Id: I9b808a7d24bbc33c240a3be27f90321cd812a52c
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/315123/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index a31be86..2fa8630 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -88,6 +88,7 @@
 'ApiFeatureUsage': ['Elastica'],
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
+'BlueSpiceExtensions': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Cite': ['VisualEditor'],
 'Citoid': ['Cite', 'VisualEditor'],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Replace EditFilterMerged hook usage

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Replace EditFilterMerged hook usage
..

Replace EditFilterMerged hook usage

Bug: T147390
Change-Id: Ic5a3b73db8d180c72f48be1368ff44f35dd9bb10
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5a3b73db8d180c72f48be1368ff44f35dd9bb10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
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...CollaborationKit[master]: Fix transclusion of memberlist to still be memberlist.

[jenkins-bot (Code Review)]

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

Change subject: Fix transclusion of memberlist to still be memberlist.
..


Fix transclusion of memberlist to still be memberlist.

Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
---
M includes/content/CollaborationListContent.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 824328d..b45422b 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -155,6 +155,12 @@
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
}
 
+   private function getOverrideOptions() {
+   $this->decode();
+   $opts = (array)$this->options;
+   return [ 'ismemberlist' => !empty( $opts['ismemberlist'] ) ];
+   }
+
private function getFullRenderListOptions() {
return $listOptions = [
'includeDesc' => true,
@@ -172,7 +178,7 @@
 */
public function convertToWikitext( Language $lang, $options = [] ) {
$this->decode();
-   $options = $options + $this->getDefaultOptions();
+   $options = $options + $this->getOverrideOptions() + 
$this->getDefaultOptions();
$maxItems = $options['maxItems'];
$includeDesc = $options['includeDesc'];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...CentralNotice[master]: campaignManager: jquery.throttle-debounce dependency

[jenkins-bot (Code Review)]

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

Change subject: campaignManager: jquery.throttle-debounce dependency
..


campaignManager: jquery.throttle-debounce dependency

Bug: T145447
Change-Id: Ic28aa8d60aacbec5b3fabc434edbe7eaf1b8afb9
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 6f5bf16..553a463 100644
--- a/extension.json
+++ b/extension.json
@@ -186,6 +186,7 @@
"ext.centralNotice.adminUi",
"jquery.ui.dialog",
"jquery.ui.slider",
+   "jquery.throttle-debounce",
"mediawiki.template",
"mediawiki.template.mustache"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic28aa8d60aacbec5b3fabc434edbe7eaf1b8afb9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Replace ArticleSaveComplete hook usage

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147561
Change-Id: Iaa9b5503cf63954b959fe82b91d3f6aa97873453
---
M ArticleInfo/ArticleInfo.class.php
M ExtendedSearch/ExtendedSearch.class.php
M PageAssignments/extension.json
M PageAssignments/includes/PageAssignmentsNotificationHooks.php
M SaferEdit/SaferEdit.class.php
M SmartList/SmartList.class.php
M WantedArticle/WantedArticle.class.php
7 files changed, 20 insertions(+), 20 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/15/315115/1

diff --git a/ArticleInfo/ArticleInfo.class.php 
b/ArticleInfo/ArticleInfo.class.php
index 4ecf0dd..06b87b6 100644
--- a/ArticleInfo/ArticleInfo.class.php
+++ b/ArticleInfo/ArticleInfo.class.php
@@ -59,7 +59,7 @@
$this->setHook( 'BSStateBarBeforeBodyViewAdd', 
'onStateBarBeforeBodyViewAdd' );
$this->setHook( 'BsAdapterAjaxPingResult' );
 
-   $this->setHook( 'ArticleSaveComplete' );
+   $this->setHook( 'PageContentSaveComplete' );
$this->setHook( 'ArticleDeleteComplete' );
$this->setHook( 'BeforePageDisplay');
 
@@ -543,7 +543,7 @@
 * Hook-Handler for Mediawiki hook ArticleDeleteComplete
 * @param Article $article
 * @param User $user
-* @param string $text
+* @param string $content Content
 * @param string $summary
 * @param integer $minoredit
 * @param type $watchthis
@@ -554,7 +554,7 @@
 * @param integer $baseRevId
 * @return boolean - always true
 */
-   public function onArticleSaveComplete( &$article, &$user, $text, 
$summary, $minoredit, $watchthis, $sectionanchor, &$flags, $revision, &$status, 
$baseRevId ) {
+   public function onPageContentSaveComplete( &$article, &$user, $content, 
$summary, $minoredit, $watchthis, $sectionanchor, &$flags, $revision, &$status, 
$baseRevId ) {
if( $status->value['new'] === false ) return true;
 
$oTitle = $article->getTitle();
diff --git a/ExtendedSearch/ExtendedSearch.class.php 
b/ExtendedSearch/ExtendedSearch.class.php
index a3a875f..c9e6bd0 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -96,7 +96,7 @@
BsConfig::registerVar( 'MW::ExtendedSearch::MltNS', array( 0 ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_INT|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-extendedsearch-pref-mltns', 'multiselectex' );
 
// Hooks
-   $this->setHook( 'ArticleSaveComplete' );
+   $this->setHook( 'PageContentSaveComplete' );
$this->setHook( 'ArticleDeleteComplete' );
$this->setHook( 'ArticleUndelete' );
$this->setHook( 'TitleMoveComplete' );
@@ -384,7 +384,7 @@
 * @param string $sText New text.
 * @return bool allow other hooked methods to be executed. Always true.
 */
-   public function onArticleSaveComplete( &$oArticle, &$oUser ) {
+   public function onPageContentSaveComplete( &$oArticle, &$oUser ) {
try {
BuildIndexMainControl::getInstance()->updateIndexWiki( 
$oArticle );
$oTitle = $oArticle->getTitle();
diff --git a/PageAssignments/extension.json b/PageAssignments/extension.json
index 085ec99..a4f854c 100644
--- a/PageAssignments/extension.json
+++ b/PageAssignments/extension.json
@@ -174,7 +174,7 @@
"BSStatebarAddSortTopVars": 
"PageAssignmentsStateBarHooks::onStatebarAddSortTopVars",
"BSStatebarAddSortBodyVars": 
"PageAssignmentsStateBarHooks::onStatebarAddSortBodyVars",
"BSWikiAdminMenuItems": 
"PageAssignmentsHooks::onBSWikiAdminMenuItems",
-   "ArticleSaveComplete": 
"PageAssignmentsNotificationHooks::onArticleSaveComplete",
+   "PageContentSaveComplete": 
"PageAssignmentsNotificationHooks::onPageContentSaveComplete",
"BSUserManagerAfterSetGroups": 
"PageAssignmentsNotificationHooks::onBSUserManagerAfterSetGroups",
"UserAddGroup": 
"PageAssignmentsUsersAdditionalPermissionsHooks::onUserAddGroup",
"userCan": 
"PageAssignmentsUsersAdditionalPermissionsHooks::onUserCan",
diff --git a/PageAssignments/includes/PageAssignmentsNotificationHooks.php 
b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
index 93c6bc8..8b9c0de 100644
--- a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
+++ b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
@@ -147,7 +147,7 @@
 *
 * @param Article $article
 * @param user $user
-* @param string $text
+* @param string $content Content
 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Stop adding "Category:Uploaded with UploadWizard"

[MarcoAurelio (Code Review)]

MarcoAurelio has uploaded a new change for review.

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

Change subject: Stop adding "Category:Uploaded with UploadWizard"
..

Stop adding "Category:Uploaded with UploadWizard"

Wikimedia Commons has discussed and agreed that uploads performed via
Special:UploadWizard should no longer contain this category anymore.

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f6f5bb1..e9128e5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1913,7 +1913,7 @@
# 'debug' => true,
'autoAdd' => [
'categories' => [
-   'Uploaded with UploadWizard',
+   '', // T147799
],
],
// Normally we don't include API keys in CommonSettings, but 
this key

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix var_dump() and undefined var warning.

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix var_dump() and undefined var warning.
..

Fix var_dump() and undefined var warning.

Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/27/315127/1

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 33d32aa..824328d 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -147,7 +147,9 @@
if ( !$lang ) {
$lang = $title->getPageLanguage();
}
-   $listOptions = $this->getFullRenderListOptions() + 
(array)$this->options;
+   $listOptions = $this->getFullRenderListOptions()
+   + (array)$this->options
+   + $this->getDefaultOptions();
$text = $this->convertToWikitext( $lang, $listOptions );
$output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
@@ -235,7 +237,6 @@
// you also need to change it in the 
stylesheet.
$text .= '[[File:' . $image->getName() 
. "|left|64px|alt=]]\n";
} else {
-var_dump( $options );
if ( $options['ismemberlist'] ) {
$placeholderIcon = 
'mw-ckicon-user-grey2';
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[REL1_27]: Fix undefined $user in OpenStackNovaProject::deleteMember

[jenkins-bot (Code Review)]

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

Change subject: Fix undefined $user in OpenStackNovaProject::deleteMember
..


Fix undefined $user in OpenStackNovaProject::deleteMember

Bug: T147716
Change-Id: Ie1f809375d66237fce85f61202a4e6f5e1eb4605
(cherry picked from commit 548194e2f3dcb2df8f8f87b565cbf5c469eb7979)
---
M nova/OpenStackNovaProject.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 8f938ac..bfedd7d 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -381,6 +381,7 @@
$ldap->printDebug( "Failed to remove 
$username from " . $sudoer->getSudoerName(), NONSENSITIVE );
}
}
+   $user = new OpenStackNovaUser( $username );
$ldap->printDebug( "Successfully removed $user->userDN 
from $this->projectname", NONSENSITIVE );
$this->deleteRoleCaches( $username );
$this->editArticle();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1f809375d66237fce85f61202a4e6f5e1eb4605
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Update reference images

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Update reference images
..

Update reference images

The images generated by mathoid have slightly changed recently.

Bug: T113708
Change-Id: I1f96306e30aaccb6038b3acf489815102f65820f
---
M images/reference-nospeech.svg
M images/reference.svg
2 files changed, 14 insertions(+), 29 deletions(-)


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

diff --git a/images/reference-nospeech.svg b/images/reference-nospeech.svg
index 77dba2c..d9e743b 100644
--- a/images/reference-nospeech.svg
+++ b/images/reference-nospeech.svg
@@ -1,14 +1 @@
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/1999/xlink; width="5.099ex" 
height="2.343ex" style="vertical-align: -0.505ex;" viewBox="0 -791.3 2195.4 
1008.6" xmlns="http://www.w3.org/2000/svg;>
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+http://www.w3.org/1999/xlink; width="5.099ex" 
height="2.343ex" style="vertical-align:-.505ex" viewBox="0 -791.3 2195.4 
1008.6" xmlns="http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/images/reference.svg b/images/reference.svg
index 2b7291f..36ebe87 100644
--- a/images/reference.svg
+++ b/images/reference.svg
@@ -1,16 +1,14 @@
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/1999/xlink; style="vertical-align: 
-0.505ex;" width="5.099ex" height="2.343ex" viewBox="0 -791.3 2195.4 1008.6" 
xmlns="http://www.w3.org/2000/svg; role="math" 
aria-labelledby="MathJax-SVG-1-Title MathJax-SVG-1-Desc">
-Equation
-a plus b
-
-
-
-
-
-
- 
- 
- 
-
+http://www.w3.org/1999/xlink; width="5.099ex" 
height="2.343ex" style="vertical-align: -0.505ex;" viewBox="0 -791.3 2195.4 
1008.6" xmlns="http://www.w3.org/2000/svg; role="math" 
aria-labelledby="MathJax-SVG-1-Title MathJax-SVG-1-Desc">
+ Equation
+ a plus b
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
 
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f96306e30aaccb6038b3acf489815102f65820f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: videoscalers: Restrict to domain networks

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: videoscalers: Restrict to domain networks
..


videoscalers: Restrict to domain networks

$INTERNAL is needlessly broad, use $DOMAIN_NETWORKS to restrict to
production networks when running in production and vice versa for
labs.

Change-Id: I29724545d0b04b3f3f2fb2f24c6eef8516c33e1e
---
M modules/role/manifests/mediawiki/videoscaler.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Elukey: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/mediawiki/videoscaler.pp 
b/modules/role/manifests/mediawiki/videoscaler.pp
index 63e4201..6ffeb7f 100644
--- a/modules/role/manifests/mediawiki/videoscaler.pp
+++ b/modules/role/manifests/mediawiki/videoscaler.pp
@@ -9,7 +9,7 @@
 proto   => 'tcp',
 port=> $::mediawiki::jobrunner::port,
 notrack => true,
-srange  => '$INTERNAL',
+srange  => '$DOMAIN_NETWORKS',
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29724545d0b04b3f3f2fb2f24c6eef8516c33e1e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
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...BlueSpiceExtensions[master]: Test

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/20/315120/1

diff --git a/composer.json b/composer.json
index bb57c0b..20d7e17 100644
--- a/composer.json
+++ b/composer.json
@@ -26,5 +26,6 @@
"test": [
"parallel-lint . --exclude vendor"
]
-   }
+   },
+   "minimum-stability": "dev"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec50d35e27e74637a1df4a95aac2f2ad35e55387
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Log only errors

[Halfak (Code Review)]

Halfak has submitted this change and it was merged.

Change subject: Log only errors
..


Log only errors

Bug: T146680
Change-Id: I3c35f6e82cf33cdddb72c1095d2e17874c00b073
---
M logging_config.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/logging_config.yaml b/logging_config.yaml
index ea23d81..9fdac18 100644
--- a/logging_config.yaml
+++ b/logging_config.yaml
@@ -5,10 +5,10 @@
 level: ERROR
 handlers: [stdout]
   ores:
-level: WARNING
+level: ERROR
 handlers: [stdout]
   celery:
-level: WARNING
+level: ERROR
 handlers: [stdout]
 
 handlers:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c35f6e82cf33cdddb72c1095d2e17874c00b073
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] mediawiki...EtherEditor[master]: Replace ArticleSaveComplete hook usage

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I3f835ad758685792b8be0d18746591122d81b476
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f835ad758685792b8be0d18746591122d81b476
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EtherEditor
Gerrit-Branch: master
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] search/extra[master]: [maven-release-plugin] prepare for next development iteration

[jenkins-bot (Code Review)]

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

Change subject: [maven-release-plugin] prepare for next development iteration
..


[maven-release-plugin] prepare for next development iteration

Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
---
M README.md
M pom.xml
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/README.md b/README.md
index cf58f6f..0f7fbd9 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,9 @@
 
 | Extra Queries and Filters Plugin |  ElasticSearch  |
 |--|-|
-| 2.4.0, master| 2.4.0   |
+| 2.4.1, master| 2.4.1   |
+| 2.4.0| 2.4.0   |
+| 2.3.5, 2.3 branch| 2.3.5   |
 | 2.3.4| 2.3.4   |
 | 2.3.3| 2.3.3   |
 | 1.7.0 -> 1.7.1, 1.7 branch   | 1.7.X   |
diff --git a/pom.xml b/pom.xml
index 07ee946..46fc3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1
+  2.4.2-SNAPSHOT
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-extra-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.21]: Do not normalise external links to special pages

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Do not normalise external links to special pages
..

Do not normalise external links to special pages

Bug: T147685
Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
---
M includes/Linker.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/315142/1

diff --git a/includes/Linker.php b/includes/Linker.php
index 9011f17..d3d1f38 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -319,7 +319,7 @@
 * @return LinkTarget
 */
public static function normaliseSpecialPage( LinkTarget $target ) {
-   if ( $target->getNamespace() == NS_SPECIAL ) {
+   if ( $target->getNamespace() == NS_SPECIAL && 
!$target->isExternal() ) {
list( $name, $subpage ) = 
SpecialPageFactory::resolveAlias( $target->getDBkey() );
if ( !$name ) {
return $target;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix coding style, remove some outdated comments, extra var_dumb

[jenkins-bot (Code Review)]

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

Change subject: Fix coding style, remove some outdated comments, extra var_dumb
..


Fix coding style, remove some outdated comments, extra var_dumb

Change-Id: Ia2a94ca954080721dcc5b7b7dec902bb3a672cb0
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentSchema.php
M includes/content/CollaborationListContent.php
3 files changed, 51 insertions(+), 67 deletions(-)

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



diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index 62c359d..f85d132 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -220,7 +220,6 @@
$html .= Html::rawElement(
'div',
[ 'class' => 'wp-header-image' ],
-   // TODO move all image stuff to ToC class (what is that 
class even going to be, anyway?)
$this->getParsedImage( $this->getImage(), 200 )
);
// get members list
@@ -316,31 +315,31 @@
if ( $membersTitle->exists() ) {
$membersContent = Revision::newFromTitle( $membersTitle 
)->getContent();
$wikitext = $membersContent->convertToWikitext(
-   $lang,
-   [
-   'includeDesc' 
=> false,
-   'maxItems' => 3,
-   'defaultSort' 
=> 'random'
-   ]
-   );
+   $lang,
+   [
+   'includeDesc' => false,
+   'maxItems' => 3,
+   'defaultSort' => 'random'
+   ]
+   );
$membersListHtml = $wgParser->parse( $wikitext, 
$membersTitle, $options )->getText();
 
// rawElement is used because we don't want [edit] 
links or usual header behavior
$membersHeader = Html::rawElement(
-   
'h3',
-   
[ 'style' => 'text-align: center; padding-bottom: 1em;' ],
-   
wfMessage( 'collaborationkit-hub-members-header' )
-   );
+   'h3',
+   [ 'style' => 'text-align: center; 
padding-bottom: 1em;' ],
+   wfMessage( 
'collaborationkit-hub-members-header' )
+   );
 
$membersViewButton = new OOUI\ButtonWidget( [
-   
'label' => wfMessage( 'collaborationkit-hub-members-view' 
)->inContentLanguage()->text(),
-   
'href' => $membersTitle->getLinkURL()
-   ] );
+   'label' => wfMessage( 
'collaborationkit-hub-members-view' )->inContentLanguage()->text(),
+   'href' => $membersTitle->getLinkURL()
+   ] );
$membersJoinButton = new OOUI\ButtonWidget( [
-   
'label' => wfMessage( 'collaborationkit-hub-members-signup' 
)->inContentLanguage()->text(),
-   
'href' => $membersTitle->getEditURL(), // Going through editor is non-JS 
fallback
-   
'flags' => [ 'primary', 'progressive' ]
-   ] );
+   'label' => wfMessage( 
'collaborationkit-hub-members-signup' )->inContentLanguage()->text(),
+   'href' => $membersTitle->getEditURL(), // Going 
through editor is non-JS fallback
+   'flags' => [ 'primary', 'progressive' ]
+   ] );
 
OutputPage::setupOOUI();
$text = $membersHeader . $membersListHtml . 

[MediaWiki-commits] [Gerrit] integration/config[master]: [PdfBook] Add jenkins tests

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [PdfBook] Add jenkins tests
..

[PdfBook] Add jenkins tests

Adds jsonlint and extension-unittests-generic tests

Repo is at
https://phabricator.wikimedia.org/diffusion/EPBO/repository/master/

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/43/315143/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fefad95..ea27d44 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5686,6 +5686,11 @@
   - name: jsonlint
   - name: extension-unittests-generic
 
+  - name: mediawiki/extensions/PdfBook 
+template:
+  - name: jsonlint
+  - name: extension-unittests-generic
+
   - name: mediawiki/extensions/PdfExport
 template:
   - name: jshint

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [PdfBook] Add jenkins tests

[jenkins-bot (Code Review)]

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

Change subject: [PdfBook] Add jenkins tests
..


[PdfBook] Add jenkins tests

Adds jsonlint and extension-unittests-generic tests

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fefad95..fcb937f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5686,6 +5686,11 @@
   - name: jsonlint
   - name: extension-unittests-generic
 
+  - name: mediawiki/extensions/PdfBook
+template:
+  - name: jsonlint
+  - name: extension-unittests-generic
+
   - name: mediawiki/extensions/PdfExport
 template:
   - name: jshint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I348442e47d57a46e2ddea29b25beaea914305e1e
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: install jenkins+CI site on contint1001

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: install jenkins+CI site on contint1001
..

contint: install jenkins+CI site on contint1001

Preliminary step to prepare contint1001 to receive Jenkins and Zuul. We
need a basic Jenkins setup, the website and the backup to be configured.
Will then let us migrate Jenkins cruft to contint1001.

There are no jobs defined. Thus this change has no impact beside
prepopulating contint1001.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/315146/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 94b6c1a..16850c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -285,6 +285,11 @@
 
 # New CI master
 node 'contint1001.wikimedia.org' {
+role(ci::master,
+ci::slave,
+ci::website,
+backup::host)
+
 include standard
 include contint::firewall
 }

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [BlueSpiceExtensions] Add dependance on extension BlueSpiceF...

[jenkins-bot (Code Review)]

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

Change subject: [BlueSpiceExtensions] Add dependance on extension 
BlueSpiceFoundation
..


[BlueSpiceExtensions] Add dependance on extension BlueSpiceFoundation

Change-Id: I9b808a7d24bbc33c240a3be27f90321cd812a52c
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, but someone else must approve
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index a31be86..2fa8630 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -88,6 +88,7 @@
 'ApiFeatureUsage': ['Elastica'],
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
+'BlueSpiceExtensions': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Cite': ['VisualEditor'],
 'Citoid': ['Cite', 'VisualEditor'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b808a7d24bbc33c240a3be27f90321cd812a52c
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
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] analytics/analytics.wikimedia.org[master]: Changing link to browsers to avoid a 301

[Mforns (Code Review)]

Mforns has submitted this change and it was merged.

Change subject: Changing link to browsers to avoid a 301
..


Changing link to browsers to avoid a 301

Change-Id: I348dbd998a5c7f919d54153b04cf09e677d43206
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/index.html b/index.html
index cc9324d..98501a1 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@
   
 Dashboards
 
-  Browser 
Statistics
+  Browser 
Statistics
   Readers:
 Pageviews and Unique Devices 
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I348dbd998a5c7f919d54153b04cf09e677d43206
Gerrit-PatchSet: 1
Gerrit-Project: analytics/analytics.wikimedia.org
Gerrit-Branch: master
Gerrit-Owner: Nuria 
Gerrit-Reviewer: Mforns 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace ArticleSave hook usage

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSave hook usage
..

Replace ArticleSave hook usage

Bug: T147390
Change-Id: I49c4fa76fdecc580fa36e4bc73fdb66da5cb5da3
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49c4fa76fdecc580fa36e4bc73fdb66da5cb5da3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
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...InterwikiIntegration[master]: Replace ArticleSaveComplete hook usage

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I6339a5f928f268c8a5219b996110955208c84659
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiIntegration 
refs/changes/88/315188/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6339a5f928f268c8a5219b996110955208c84659
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiIntegration
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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