[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Improve div-style form layout

[Samwilson (Code Review)]

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

Change subject: Improve div-style form layout
..

Improve div-style form layout

Bug: T179738
Change-Id: Ic3eddc49735b93c23605de1c2c73be477a683023
---
M includes/GlobalPreferencesForm.php
M resources/ext.GlobalPreferences.special.css
2 files changed, 30 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalPreferences 
refs/changes/11/403111/1

diff --git a/includes/GlobalPreferencesForm.php 
b/includes/GlobalPreferencesForm.php
index 5c36867..1aee82f 100644
--- a/includes/GlobalPreferencesForm.php
+++ b/includes/GlobalPreferencesForm.php
@@ -3,6 +3,7 @@
 namespace GlobalPreferences;
 
 use Html;
+use HTMLFormField;
 use IContextSource;
 use PreferencesForm;
 
@@ -28,6 +29,27 @@
}
 
/**
+* Override this in order to hide empty labels.
+* @param array[]|HTMLFormField[] $fields
+* @param string $sectionName
+* @param string $fieldsetIDPrefix
+* @param bool $hasUserVisibleFields
+* @return string
+*/
+   public function displaySection(
+   $fields, $sectionName = '', $fieldsetIDPrefix = '', 
&$hasUserVisibleFields = false
+   ) {
+   foreach ( $fields as $key => $value ) {
+   if ( $value instanceof HTMLFormField ) {
+   $value->setShowEmptyLabel( false );
+   }
+   }
+   return parent::displaySection(
+   $fields, $sectionName, $fieldsetIDPrefix, 
$hasUserVisibleFields
+   );
+   }
+
+   /**
 * Get the whole body of the form, adding the global preferences header 
text to the top of each
 * section. Javascript will later add the 'select all' checkbox to this 
header.
 * @return string
diff --git a/resources/ext.GlobalPreferences.special.css 
b/resources/ext.GlobalPreferences.special.css
index 4d42ba8..fa204d7 100644
--- a/resources/ext.GlobalPreferences.special.css
+++ b/resources/ext.GlobalPreferences.special.css
@@ -2,6 +2,14 @@
background-color: #eaecf0;
 }
 
+div.mw-input,
+div.mw-label {
+   display: inline-block;
+}
+div.mw-label {
+   padding-right: 0.5em;
+}
+
 /* Style fixes for Skin:Vector. The ID selector is whitelisted in .stylelintrc 
because Vector uses it. */
 body.skin-vector #preferences fieldset.ext-globalpreferences-select-all {
padding-bottom: 0;

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Setup s8 on dbstore2001

[Jcrespo (Code Review)]

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

Change subject: mariadb: Setup s8 on dbstore2001
..

mariadb: Setup s8 on dbstore2001

Bug: T177208
Change-Id: Ie654ca0142f0d4d49b674ffe2dc3317746793778
---
M hieradata/hosts/dbstore2001.yaml
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/hosts/dbstore2001.yaml b/hieradata/hosts/dbstore2001.yaml
index 283aaea..fe937fb 100644
--- a/hieradata/hosts/dbstore2001.yaml
+++ b/hieradata/hosts/dbstore2001.yaml
@@ -1,8 +1,9 @@
 # Buffer pool sizes/instance enabled
-role::mariadb::dbstore_multiinstance::num_instances: 6
+role::mariadb::dbstore_multiinstance::num_instances: 7
 role::mariadb::dbstore_multiinstance::s2: '15G'
 role::mariadb::dbstore_multiinstance::s3: '20G'
-role::mariadb::dbstore_multiinstance::s5: '25G'
+role::mariadb::dbstore_multiinstance::s5: '5G'
 role::mariadb::dbstore_multiinstance::s6: '15G'
 role::mariadb::dbstore_multiinstance::s7: '20G'
+role::mariadb::dbstore_multiinstance::s8: '20G'
 role::mariadb::dbstore_multiinstance::x1: '5G'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: apt: Set consistent /etc/apt/sources.list

[jenkins-bot (Code Review)]

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

Change subject: apt: Set consistent /etc/apt/sources.list
..


apt: Set consistent /etc/apt/sources.list

Set a default sources.list to smooth over differences caused by
different base images.

Bug: T175055
Change-Id: I181e07d9e5e9a49cd3768a15e0fce6e08773e7ff
---
M puppet/modules/apt/manifests/init.pp
A puppet/modules/apt/templates/sources.list.erb
2 files changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 092b570..14e5ad9 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -55,6 +55,17 @@
 # Trigger before we add any repos that are using HTTPS
 Exec['ins-apt-transport-https'] -> Apt::Repository <| |>
 
+# T175055: Set a default sources.list to smooth over differences caused by
+# different base images
+file { '/etc/apt/sources.list':
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('apt/sources.list.erb'),
+notify  => Exec['apt-get update'],
+}
+
 apt::repository { 'wikimedia':
 uri => 'https://apt.wikimedia.org/wikimedia',
 dist=> "${::lsbdistcodename}-wikimedia",
diff --git a/puppet/modules/apt/templates/sources.list.erb 
b/puppet/modules/apt/templates/sources.list.erb
new file mode 100644
index 000..5a9fe49
--- /dev/null
+++ b/puppet/modules/apt/templates/sources.list.erb
@@ -0,0 +1,8 @@
+# This file managed by Puppet
+# modules/apt/templates/sources.list.erb
+
+deb http://deb.debian.org/debian <%= scope['::lsbdistcodename'] %> main contrib
+deb-src http://deb.debian.org/debian  <%= scope['::lsbdistcodename'] %> main 
contrib
+
+deb http://security.debian.org/debian-security  <%= scope['::lsbdistcodename'] 
%>/updates main contrib
+deb-src http://security.debian.org/debian-security  <%= 
scope['::lsbdistcodename'] %>/updates main contrib

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

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

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

[MediaWiki-commits] [Gerrit] operations...apertium-pt-ca[master]: apertium-pt-ca: Cleanup

[KartikMistry (Code Review)]

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

Change subject: apertium-pt-ca: Cleanup
..

apertium-pt-ca: Cleanup

* Simplify debian/rules.
* Removed dependency on locales.

Change-Id: I2fe73eb93d6368223a39ca2c7fe404857d0a6ce2
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 17 insertions(+), 25 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-pt-ca
 refs/changes/09/403109/1

diff --git a/debian/changelog b/debian/changelog
index cf375c2..ecdd367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apertium-pt-ca (0.8.2+svn~57507-1+wmf2) jessie-wikimedia; urgency=low
+
+  * debian/rules:
++ Simplify rules file.
+  * debian/control:
++ Removed dependency on locales.
++ Updated Vcs-Git URL.
++ Updated to Standards-Version 3.9.8
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 11:54:37 +0530
+
 apertium-pt-ca (0.8.2+svn~57507-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index 56b296b..b25cdc1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 

-Uploaders: Tino Didriksen ,
+Uploaders: Tino Didriksen ,
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   debhelper (>= 8.0),
+   debhelper (>= 9),
dh-autoreconf,
gawk,
-   locales,
pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-pt-ca.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-ca.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-ca.git
 
 Package: apertium-pt-ca
diff --git a/debian/rules b/debian/rules
index 11004df..b5d222c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export LC_ALL=C.UTF-8
 
 %:
-   dh $@ --with autoreconf
-
-override_dh_auto_build:
-   mkdir -p debian/tmp/locale/
-   localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-   export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-   export LC_ALL=en_US.UTF-8 && \
-   dh_auto_build
+   dh $@ --fail-missing --with autoreconf

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fe73eb93d6368223a39ca2c7fe404857d0a6ce2
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-pt-ca
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: nfs: always provision NFS client

[jenkins-bot (Code Review)]

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

Change subject: nfs: always provision NFS client
..


nfs: always provision NFS client

NFS client packages are needed to use NFS shares, and if they are not
already in the VM the auto-provisioning that Vagrant tries to do will
fail after our first Puppet run because of the things we do that mess
with the default apt cache location.

Bug: T184497
Change-Id: I975c920e7da200a40939a83f89eb3f297111a583
---
M puppet/modules/mwv/manifests/packages.pp
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index b3a1c05..f0b2eee 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -18,6 +18,15 @@
 'tzdata',
 )
 
+# T184497: NFS client packages are needed to use NFS shares, and if they
+# are not already in the VM the auto-provisioning that Vagrant tries to do
+# will fail after our first Puppet run because of the things we do that
+# mess with the default apt cache location.
+require_package(
+'nfs-common',
+'portmap',
+)
+
 # Cron resources need a cron provider installed
 Package['anacron'] -> Cron <| |>
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: apt: Set consistent /etc/apt/sources.list

[BryanDavis (Code Review)]

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

Change subject: apt: Set consistent /etc/apt/sources.list
..

apt: Set consistent /etc/apt/sources.list

Set a default sources.list to smooth over differences caused by
different base images.

Bug: T175055
Change-Id: I181e07d9e5e9a49cd3768a15e0fce6e08773e7ff
---
M puppet/modules/apt/manifests/init.pp
A puppet/modules/apt/templates/sources.list.erb
2 files changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 092b570..14e5ad9 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -55,6 +55,17 @@
 # Trigger before we add any repos that are using HTTPS
 Exec['ins-apt-transport-https'] -> Apt::Repository <| |>
 
+# T175055: Set a default sources.list to smooth over differences caused by
+# different base images
+file { '/etc/apt/sources.list':
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('apt/sources.list.erb'),
+notify  => Exec['apt-get update'],
+}
+
 apt::repository { 'wikimedia':
 uri => 'https://apt.wikimedia.org/wikimedia',
 dist=> "${::lsbdistcodename}-wikimedia",
diff --git a/puppet/modules/apt/templates/sources.list.erb 
b/puppet/modules/apt/templates/sources.list.erb
new file mode 100644
index 000..5a9fe49
--- /dev/null
+++ b/puppet/modules/apt/templates/sources.list.erb
@@ -0,0 +1,8 @@
+# This file managed by Puppet
+# modules/apt/templates/sources.list.erb
+
+deb http://deb.debian.org/debian <%= scope['::lsbdistcodename'] %> main contrib
+deb-src http://deb.debian.org/debian  <%= scope['::lsbdistcodename'] %> main 
contrib
+
+deb http://security.debian.org/debian-security  <%= scope['::lsbdistcodename'] 
%>/updates main contrib
+deb-src http://security.debian.org/debian-security  <%= 
scope['::lsbdistcodename'] %>/updates main contrib

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I181e07d9e5e9a49cd3768a15e0fce6e08773e7ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations...apertium-oc-es[master]: apertium-oc-es: Cleanup

[KartikMistry (Code Review)]

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

Change subject: apertium-oc-es: Cleanup
..

apertium-oc-es: Cleanup

* Simplify debian/rules. Do not install duplicate changelog.
* Removed dependency on locales.
Change-Id: I6452cfa37214e789303759d7e717a702f6c0b0b9
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 19 insertions(+), 23 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-oc-es
 refs/changes/07/403107/1

diff --git a/debian/changelog b/debian/changelog
index e01e508..aa1476b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apertium-oc-es (1.0.6~r60161-1+wmf2) jessie-wikimedia; urgency=low
+
+  * debian/rules:
++ Simplify rules file.
++ Do not install duplicate upstream changelog.
+  * debian/control:
++ Removed dependency on locales.
++ Updated Vcs-Git URL.
++ Updated to Standards-Version 3.9.8
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 11:45:02 +0530
+
 apertium-oc-es (1.0.6~r60161-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index 4ba81bb..2d4107b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 

-Uploaders: Tino Didriksen ,
+Uploaders: Tino Didriksen ,
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
debhelper (>= 9),
dh-autoreconf,
gawk,
-   locales,
pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-oc-es.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-oc-es.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-oc-es.git
 
 Package: apertium-oc-es
diff --git a/debian/rules b/debian/rules
index 11004df..0539901 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,12 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export LC_ALL=C.UTF-8
 
 %:
-   dh $@ --with autoreconf
+   dh $@ --fail-missing --with autoreconf
 
-override_dh_auto_build:
-   mkdir -p debian/tmp/locale/
-   localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-   export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-   export LC_ALL=en_US.UTF-8 && \
-   dh_auto_build
+override_dh_installchangelogs:
+   dh_installchangelogs -k NEWS

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6452cfa37214e789303759d7e717a702f6c0b0b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-oc-es
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Check for PNG metadata before generating HTML

[jenkins-bot (Code Review)]

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

Change subject: Check for PNG metadata before generating HTML
..


Check for PNG metadata before generating HTML

When embedding the PNG file(s), the dimensions of the file are
placed into the `
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Matanya 
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: Set s5, s8 read only OFF

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Set s5, s8 read only OFF
..


db-eqiad.php: Set s5, s8 read only OFF

Bug: T177208
Bug: T181645
Change-Id: I8973b32ca76286376fa646b3f2bc2a94f9d92d6a
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 79cdbc1..0ce1729 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -763,10 +763,10 @@
# 's2'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 'DEFAULT' => 'This request is served by a passive datacenter. If you 
see this something is really wrong.', # s3
# 's4'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   's5'  => 'Temporary read-only time for maintenance, please try 
again in some minutes. 
https://www.wikidata.org/wiki/Wikidata:Project_chat#Wikidata_in_read-only_for_30min_on_January_9th',
+   # 's5'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 's6'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 's7'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   's8'  => 'Temporary read-only time for maintenance, please try 
again in some minutes. 
https://www.wikidata.org/wiki/Wikidata:Project_chat#Wikidata_in_read-only_for_30min_on_January_9th',
+   # 's8'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
 ],
 
 ];

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

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

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

[MediaWiki-commits] [Gerrit] operations...apertium-oc-ca[master]: apertium-oc-ca: Cleanup

[KartikMistry (Code Review)]

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

Change subject: apertium-oc-ca: Cleanup
..

apertium-oc-ca: Cleanup

* Simplify debian/rules. Do not install duplicate changelog.
* Removed dependency on locales.

Change-Id: Id1a8fe631d332d81f3587701b5b6fb7cf0a6ac47
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 19 insertions(+), 23 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-oc-ca
 refs/changes/06/403106/1

diff --git a/debian/changelog b/debian/changelog
index 6ae3487..9518576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apertium-oc-ca (1.0.6~r60158-2) jessie-wikimedia; urgency=low
+
+  * debian/rules:
++ Simplify rules file.
++ Do not install duplicate upstream changelog.
+  * debian/control:
++ Removed dependency on locales.
++ Updated Vcs-Git URL.
++ Updated to Standards-Version 3.9.8
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 11:40:42 +0530
+
 apertium-oc-ca (1.0.6~r60158-1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index 577568b..36aa5aa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 

-Uploaders: Tino Didriksen ,
+Uploaders: Tino Didriksen ,
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
debhelper (>= 9),
dh-autoreconf,
gawk,
-   locales,
pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-oc-ca.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-oc-ca.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-oc-ca.git
 
 Package: apertium-oc-ca
diff --git a/debian/rules b/debian/rules
index 11004df..0539901 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,12 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export LC_ALL=C.UTF-8
 
 %:
-   dh $@ --with autoreconf
+   dh $@ --fail-missing --with autoreconf
 
-override_dh_auto_build:
-   mkdir -p debian/tmp/locale/
-   localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-   export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-   export LC_ALL=en_US.UTF-8 && \
-   dh_auto_build
+override_dh_installchangelogs:
+   dh_installchangelogs -k NEWS

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1a8fe631d332d81f3587701b5b6fb7cf0a6ac47
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-oc-ca
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Point wikidatawiki to s8

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Point wikidatawiki to s8
..


db-eqiad.php: Point wikidatawiki to s8

Moving wikidatawiki to s8

Bug: T177208
Bug: T181645
Change-Id: I262196c81e2287de924ade772b70f0724b1b3f9d
---
M dblists/s5.dblist
A dblists/s8.dblist
A docroot/noc/conf/s8.dblist
M wmf-config/db-eqiad.php
4 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/dblists/s5.dblist b/dblists/s5.dblist
index cc78452..6466bea 100644
--- a/dblists/s5.dblist
+++ b/dblists/s5.dblist
@@ -1,2 +1 @@
 dewiki
-wikidatawiki
diff --git a/dblists/s8.dblist b/dblists/s8.dblist
new file mode 100644
index 000..2a493a4
--- /dev/null
+++ b/dblists/s8.dblist
@@ -0,0 +1 @@
+wikidatawiki
diff --git a/docroot/noc/conf/s8.dblist b/docroot/noc/conf/s8.dblist
new file mode 12
index 000..2b89c2e
--- /dev/null
+++ b/docroot/noc/conf/s8.dblist
@@ -0,0 +1 @@
+../../../dblists/s8.dblist
\ No newline at end of file
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 580366c..79cdbc1 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -51,9 +51,8 @@
# s4: commons
'commonswiki'  => 's4',
 
-   # s5: dewiki and wikidata
+   # s5: dewiki
'dewiki'   => 's5',
-   'wikidatawiki' => 's5',
 
# s6: large wikis
'frwiki'   => 's6',
@@ -75,8 +74,8 @@
'rowiki'   => 's7',
'kowiki'   => 's7',
 
-   # s8: future dedicated wikidata
-   # 'wikidatawiki' => 's8',
+   # s8: wikidata
+   'wikidatawiki' => 's8',
 
# labs-related wikis
'labswiki' => 'silver',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I262196c81e2287de924ade772b70f0724b1b3f9d
Gerrit-PatchSet: 7
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...apertium-nob[master]: apertium-nob: Update dependency on cg3

[KartikMistry (Code Review)]

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

Change subject: apertium-nob: Update dependency on cg3
..

apertium-nob: Update dependency on cg3

Bug: T171406
Change-Id: I30c81114ead6c7a775727cca8bc756e11bfb3bde
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-nob
 refs/changes/05/403105/1

diff --git a/debian/changelog b/debian/changelog
index 4184cc1..af5a345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-nob (0.9.0~r69513-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3.
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 11:25:22 +0530
+
 apertium-nob (0.9.0~r69513-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuilt for Jessie
diff --git a/debian/control b/debian/control
index e6cce2e..cac0c91 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,6 +18,9 @@
 
 Package: apertium-nob
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Norwegian Bokmål
  Data package providing Apertium language resources for Norwegian Bokmål

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30c81114ead6c7a775727cca8bc756e11bfb3bde
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-nob
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Set s5, s8 read only OFF

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Set s5, s8 read only OFF
..

db-eqiad.php: Set s5, s8 read only OFF

Bug: T177208
Bug: T181645
Change-Id: I8973b32ca76286376fa646b3f2bc2a94f9d92d6a
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 580366c..2e6e767 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -764,10 +764,10 @@
# 's2'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 'DEFAULT' => 'This request is served by a passive datacenter. If you 
see this something is really wrong.', # s3
# 's4'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   's5'  => 'Temporary read-only time for maintenance, please try 
again in some minutes. 
https://www.wikidata.org/wiki/Wikidata:Project_chat#Wikidata_in_read-only_for_30min_on_January_9th',
+   # 's5'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 's6'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 's7'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   's8'  => 'Temporary read-only time for maintenance, please try 
again in some minutes. 
https://www.wikidata.org/wiki/Wikidata:Project_chat#Wikidata_in_read-only_for_30min_on_January_9th',
+   # 's8'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
 ],
 
 ];

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Set s5 on read_only

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Set s5 on read_only
..


db-eqiad.php: Set s5 on read_only

s5 will be on read_only as part of the s5/s8 failover

Bug: T177208
Bug: T181645
Change-Id: I003c6ff3649aebb3bfd73dd169b2ceaca98c1c73
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 2bf53fb..580366c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -764,10 +764,10 @@
# 's2'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 'DEFAULT' => 'This request is served by a passive datacenter. If you 
see this something is really wrong.', # s3
# 's4'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   # 's5'  => 'Temporary read-only time for maintenance, please try 
again in some minutes.',
+   's5'  => 'Temporary read-only time for maintenance, please try 
again in some minutes. 
https://www.wikidata.org/wiki/Wikidata:Project_chat#Wikidata_in_read-only_for_30min_on_January_9th',
# 's6'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 's7'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   's8'  => 'Temporary read-only time for maintenance, please try 
again in some minutes.',
+   's8'  => 'Temporary read-only time for maintenance, please try 
again in some minutes. 
https://www.wikidata.org/wiki/Wikidata:Project_chat#Wikidata_in_read-only_for_30min_on_January_9th',
 ],
 
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I003c6ff3649aebb3bfd73dd169b2ceaca98c1c73
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Migrate ores in labs to the dedicated node

[Ladsgroup (Code Review)]

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

Change subject: Migrate ores in labs to the dedicated node
..


Migrate ores in labs to the dedicated node

Bug: T184282
Change-Id: I3efba4ce02a3571a1f2623d7d04a27d8c7167889
---
M scap/ores-web-labs
M scap/ores-worker-labs
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/scap/ores-web-labs b/scap/ores-web-labs
index 65cc71f..860eaf4 100644
--- a/scap/ores-web-labs
+++ b/scap/ores-web-labs
@@ -1 +1 @@
-deployment-sca03.deployment-prep.eqiad.wmflabs
+deployment-ores01.deployment-prep.eqiad.wmflabs
diff --git a/scap/ores-worker-labs b/scap/ores-worker-labs
index 65cc71f..860eaf4 100644
--- a/scap/ores-worker-labs
+++ b/scap/ores-worker-labs
@@ -1 +1 @@
-deployment-sca03.deployment-prep.eqiad.wmflabs
+deployment-ores01.deployment-prep.eqiad.wmflabs

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Migrate ores in labs to the dedicated node

[Ladsgroup (Code Review)]

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

Change subject: Migrate ores in labs to the dedicated node
..

Migrate ores in labs to the dedicated node

Bug: T184282
Change-Id: I3efba4ce02a3571a1f2623d7d04a27d8c7167889
---
M scap/ores-web-labs
M scap/ores-worker-labs
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy 
refs/changes/03/403103/1

diff --git a/scap/ores-web-labs b/scap/ores-web-labs
index 65cc71f..860eaf4 100644
--- a/scap/ores-web-labs
+++ b/scap/ores-web-labs
@@ -1 +1 @@
-deployment-sca03.deployment-prep.eqiad.wmflabs
+deployment-ores01.deployment-prep.eqiad.wmflabs
diff --git a/scap/ores-worker-labs b/scap/ores-worker-labs
index 65cc71f..860eaf4 100644
--- a/scap/ores-worker-labs
+++ b/scap/ores-worker-labs
@@ -1 +1 @@
-deployment-sca03.deployment-prep.eqiad.wmflabs
+deployment-ores01.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3efba4ce02a3571a1f2623d7d04a27d8c7167889
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
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...Translate[master]: Add MessageIndex::getKeys()

[jenkins-bot (Code Review)]

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

Change subject: Add MessageIndex::getKeys()
..


Add MessageIndex::getKeys()

And optimize the implementation in CdbMessageIndex. Trying to fix
a timeout in Special:TranslationStash by using the optimized getKeys().

Change-Id: I92eeaa38279053ea2fbf5dac5ec2412670312735
---
M messagegroups/SandboxMessageGroup.php
M utils/MessageIndex.php
2 files changed, 20 insertions(+), 9 deletions(-)

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



diff --git a/messagegroups/SandboxMessageGroup.php 
b/messagegroups/SandboxMessageGroup.php
index 6628128..f18fd9d 100644
--- a/messagegroups/SandboxMessageGroup.php
+++ b/messagegroups/SandboxMessageGroup.php
@@ -77,10 +77,8 @@
$list[$index] = '';
}
 
-   // Message index of all known messages
-   $mi = MessageIndex::singleton();
// Get some random keys
-   $all = array_keys( $mi->retrieve() );
+   $all = MessageIndex::singleton()->getKeys();
// In case there aren't any messages
if ( $all === [] ) {
return $list;
diff --git a/utils/MessageIndex.php b/utils/MessageIndex.php
index 3d132f9..37c91bc 100644
--- a/utils/MessageIndex.php
+++ b/utils/MessageIndex.php
@@ -126,6 +126,14 @@
 */
abstract public function retrieve( $forRebuild = false );
 
+   /**
+* @since 2018.01
+* @return string[]
+*/
+   public function getKeys() {
+   return array_keys( $this->retrieve() );
+   }
+
abstract protected function store( array $array, array $diff );
 
protected function lock() {
@@ -615,6 +623,16 @@
return $this->index;
}
 
+   $this->index = [];
+   foreach ( $this->getKeys() as $key ) {
+   $this->index[$key] = $this->unserialize( $reader->get( 
$key ) );
+   }
+
+   return $this->index;
+   }
+
+   public function getKeys() {
+   $reader = $this->getReader();
$keys = [];
while ( true ) {
$key = $keys === [] ? $reader->firstkey() : 
$reader->nextkey();
@@ -624,12 +642,7 @@
$keys[] = $key;
}
 
-   $this->index = [];
-   foreach ( $keys as $key ) {
-   $this->index[$key] = $this->unserialize( $reader->get( 
$key ) );
-   }
-
-   return $this->index;
+   return $keys;
}
 
protected function get( $key ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92eeaa38279053ea2fbf5dac5ec2412670312735
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: db1070.yaml: Update new socket location

[Marostegui (Code Review)]

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

Change subject: db1070.yaml: Update new socket location
..


db1070.yaml: Update new socket location

Bug: T177208
Change-Id: Ie5ec3f84854532c75fe4debacc98e6cdb785855f
---
M hieradata/hosts/db1070.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db1070.yaml b/hieradata/hosts/db1070.yaml
index f928d24..e5e62d0 100644
--- a/hieradata/hosts/db1070.yaml
+++ b/hieradata/hosts/db1070.yaml
@@ -1,4 +1,3 @@
 mariadb::shard: 's5'
 mariadb::mysql_role: 'master'
-mariadb::socket: '/tmp/mysql.sock'
 mariadb::binlog_format: 'STATEMENT'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: nfs: always provision NFS client

[BryanDavis (Code Review)]

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

Change subject: nfs: always provision NFS client
..

nfs: always provision NFS client

NFS client packages are needed to use NFS shares, and if they are not
already in the VM the auto-provisioning that Vagrant tries to do will
fail after our first Puppet run because of the things we do that mess
with the default apt cache location.

Bug: T184497
Change-Id: I975c920e7da200a40939a83f89eb3f297111a583
---
M puppet/modules/mwv/manifests/packages.pp
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/02/403102/1

diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index b3a1c05..f0b2eee 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -18,6 +18,15 @@
 'tzdata',
 )
 
+# T184497: NFS client packages are needed to use NFS shares, and if they
+# are not already in the VM the auto-provisioning that Vagrant tries to do
+# will fail after our first Puppet run because of the things we do that
+# mess with the default apt cache location.
+require_package(
+'nfs-common',
+'portmap',
+)
+
 # Cron resources need a cron provider installed
 Package['anacron'] -> Cron <| |>
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I975c920e7da200a40939a83f89eb3f297111a583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: CdbMessageIndex: do not store keys twice

[jenkins-bot (Code Review)]

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

Change subject: CdbMessageIndex: do not store keys twice
..


CdbMessageIndex: do not store keys twice

The CDB supports fetching the keys from the file. There is no need
to store the keys separately using #keys. Using the native interface
is both faster (because we do not need to serialize array of 75k
values) and saves space.

Change-Id: Ibd09ce9091e0251fa04f833624bff7a7a4a08f48
---
M utils/MessageIndex.php
1 file changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/utils/MessageIndex.php b/utils/MessageIndex.php
index 2e40718..3d132f9 100644
--- a/utils/MessageIndex.php
+++ b/utils/MessageIndex.php
@@ -615,7 +615,15 @@
return $this->index;
}
 
-   $keys = (array)$this->unserialize( $reader->get( '#keys' ) );
+   $keys = [];
+   while ( true ) {
+   $key = $keys === [] ? $reader->firstkey() : 
$reader->nextkey();
+   if ( $key === false ) {
+   break;
+   }
+   $keys[] = $key;
+   }
+
$this->index = [];
foreach ( $keys as $key ) {
$this->index[$key] = $this->unserialize( $reader->get( 
$key ) );
@@ -650,8 +658,6 @@
 
$file = TranslateUtils::cacheFile( $this->filename );
$cache = \Cdb\Writer::open( $file );
-   $keys = array_keys( $array );
-   $cache->set( '#keys', $this->serialize( $keys ) );
 
foreach ( $array as $key => $value ) {
$value = $this->serialize( $value );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd09ce9091e0251fa04f833624bff7a7a4a08f48
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Don't use generic ID parser when a PropertyId is required

[jenkins-bot (Code Review)]

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

Change subject: Don't use generic ID parser when a PropertyId is required
..


Don't use generic ID parser when a PropertyId is required

This fixes an issue Phan reports.

The generic parser can return any EntityId. But the very next line in
the same method does have a strict type hint against PropertyId.

What this patch effectively does is replacing a possible runtime
exception (an incompatible EntityId can be passed to a method that
expects a PropertyId) with a more expressive parsing exception (an ID
string does not result in a PropertyId).

This code might need more love, but I believe this small step is
already an improvement.

Change-Id: I0066fe188dc53ac9fd3cae3ab523d52477eeec06
---
M client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php 
b/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
index 306a3ff..872b29f 100644
--- a/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
+++ b/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
@@ -6,6 +6,7 @@
 use Wikibase\Client\DataAccess\StatementTransclusionInteractor;
 use Wikibase\Client\Usage\UsageAccumulator;
 use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\PropertyId;
 
 /**
  * Actual implementations of the functions to access Wikibase through the 
Scribunto extension
@@ -117,7 +118,7 @@
 */
public function addStatementUsage( $entityId, $propertyId ) {
$entityId = $this->entityIdParser->parse( $entityId );
-   $propertyId = $this->entityIdParser->parse( $propertyId );
+   $propertyId = new PropertyId( $propertyId );
 
$this->usageAccumulator->addStatementUsage( $entityId, 
$propertyId );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0066fe188dc53ac9fd3cae3ab523d52477eeec06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Type hint EntityDeserializer as DispatchableDeserializer

[jenkins-bot (Code Review)]

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

Change subject: Type hint EntityDeserializer as DispatchableDeserializer
..


Type hint EntityDeserializer as DispatchableDeserializer

The return value is going to be used in a context that expects this to
be a DispatchableDeserializer.

Reported by Phan.

Change-Id: If471fc3b2a4c10cafc587667ab11b1e12ed33beb
---
M repo/includes/WikibaseRepo.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 8c0990d..7291fae 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Repo;
 
+use Deserializers\DispatchableDeserializer;
 use Wikibase\Lib\Changes\CentralIdLookupFactory;
 use Wikibase\Lib\DataTypeFactory;
 use DataValues\DataValueFactory;
@@ -1358,7 +1359,7 @@
/**
 * Returns a deserializer to deserialize entities in current 
serialization only.
 *
-* @return Deserializer
+* @return DispatchableDeserializer
 */
private function getAllTypesEntityDeserializer() {
if ( $this->entityDeserializer === null ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If471fc3b2a4c10cafc587667ab11b1e12ed33beb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Drop symfony/process dependency, use Shell\Command instead

[jenkins-bot (Code Review)]

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

Change subject: Drop symfony/process dependency, use Shell\Command instead
..


Drop symfony/process dependency, use Shell\Command instead

We originally started using symfony/process because kzykhys/pygments
depended upon it. But that library was unmaintained and became broken,
so we stopped using it, and just used symfony/process directly.

At the time, the main reason in favor of symfony/process was that it
could pass stdin to pygments, while Shell\Command couldn't - but it can
now (T182463)! On top of that, there are downsides, like not respecting
the default MediaWiki shell limits, being incompatible with core's
firejail support, and requiring an external composer dependency.

Note that because Shell::command() will enforce MediaWiki's normal
limits, it's possible that some large pages may no longer render with
syntax highlighting if they pass those limits.

Bug: T182467
Bug: T181771
Change-Id: Ie1cb72b7eb17d943f79ecae4d94a2110546ef039
---
M README
M SyntaxHighlight.php
M composer.json
M extension.json
M maintenance/updateCSS.php
M maintenance/updateLexerList.php
6 files changed, 31 insertions(+), 53 deletions(-)

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



diff --git a/README b/README
index 61e774d..1384e9f 100644
--- a/README
+++ b/README
@@ -14,10 +14,7 @@
 
 == Installation ==
 
-First, you will need to ensure that this extension's Composer-managed
-dependencies are available. In the extension directory, run 'composer update'.
-
-Next, Add this line to your LocalSettings.php:
+Add this line to your LocalSettings.php:
 
 wfLoadExtension( 'SyntaxHighlight_GeSHi' );
 
diff --git a/SyntaxHighlight.php b/SyntaxHighlight.php
index ee7eda5..f17d531 100644
--- a/SyntaxHighlight.php
+++ b/SyntaxHighlight.php
@@ -17,7 +17,6 @@
  */
 
 use MediaWiki\Shell\Shell;
-use Symfony\Component\Process\ProcessBuilder;
 
 class SyntaxHighlight {
 
@@ -288,32 +287,23 @@
foreach ( $options as $k => $v ) {
$optionPairs[] = "{$k}={$v}";
}
-   $builder = new ProcessBuilder();
-   $builder->setPrefix( self::getPygmentizePath() );
-   $process = $builder
-   ->add( '-l' )->add( $lexer )
-   ->add( '-f' )->add( 'html' )
-   ->add( '-O' )->add( implode( ',', $optionPairs 
) )
-   ->getProcess();
+   $result = Shell::command(
+   self::getPygmentizePath(),
+   '-l', $lexer,
+   '-f', 'html',
+   '-O', implode( ',', $optionPairs )
+   )
+   ->input( $code )
+   ->execute();
 
-   $process->setInput( $code );
-
-   /* Workaround for T151523 (buggy $process->getOutput()).
-   If/when this issue is fixed in HHVM or Symfony,
-   replace this with "$process->run(); $output = 
$process->getOutput();"
-   */
-   $output = '';
-   $process->run( function ( $type, $capturedOutput ) use 
( &$output ) {
-   $output .= $capturedOutput;
-   } );
-
-   if ( !$process->isSuccessful() ) {
+   if ( $result->getExitCode() != 0 ) {
$status->warning( 
'syntaxhighlight-error-pygments-invocation-failure' );
-   wfWarn( 'Failed to invoke Pygments: ' . 
$process->getErrorOutput() );
+   wfWarn( 'Failed to invoke Pygments: ' . 
$result->getStderr() );
$status->value = self::highlight( $code, null, 
$args )->getValue();
return $status;
}
 
+   $output = $result->getStdout();
$cache->set( $cacheKey, $output );
}
 
diff --git a/composer.json b/composer.json
index e4c5736..dc73239 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,6 @@
 {
"name": "mediawiki/syntax-highlight",
"description": "Syntax highlighting extension for MediaWiki",
-   "require": {
-   "symfony/process": "~3.3"
-   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
diff --git a/extension.json b/extension.json
index 6c75514..fc4316c 100644
--- a/extension.json
+++ b/extension.json
@@ -14,7 +14,7 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix 'sql' script for multi-instance hosts

[Tim Starling (Code Review)]

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

Change subject: Fix 'sql' script for multi-instance hosts
..


Fix 'sql' script for multi-instance hosts

It needs to extract the port, if one is present, to pass host and port
separately to mysql's `-h` and `--port` options.

Bug: T182713
Change-Id: Icc0fdf43e226f21dbb5e7de7b7cf74f834382cf3
---
M modules/scap/files/sql
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/scap/files/sql b/modules/scap/files/sql
index 05fa44d..f699317 100755
--- a/modules/scap/files/sql
+++ b/modules/scap/files/sql
@@ -68,7 +68,13 @@
 exit 1
 fi
 
+port=3306
+if echo "$host" | grep -qP ':\d+\z'; then
+port=`echo "$host" | sed 's/.*://'`
+host=`echo "$host" | sed 's/:[0-9]\+$//'`
+fi
+
 pass=`echo 'echo \$wgDBadminpassword;' | /usr/local/bin/mwscript eval.php 
--wiki="$lookupdb"`
 
 # Execute mysql.
-exec mysql -u wikiadmin -p$pass -h $host -D $db "$@"
+exec mysql -u wikiadmin -p$pass -h "$host" --port $port -D $db "$@"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc0fdf43e226f21dbb5e7de7b7cf74f834382cf3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...apertium-nno-nob[master]: apertium-nno-nob: Update dependency on cg3

[KartikMistry (Code Review)]

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

Change subject: apertium-nno-nob: Update dependency on cg3
..

apertium-nno-nob: Update dependency on cg3

Bug: T171406
Change-Id: Ibd6436b10373b66bbcd6e75dedd33a02bc3b424b
---
M debian/changelog
M debian/control
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-nno-nob
 refs/changes/01/403101/1

diff --git a/debian/changelog b/debian/changelog
index 45b5c2c..41ad072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-nno-nob (1.1.0~r66076-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3.
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 09:51:53 +0530
+
 apertium-nno-nob (1.1.0~r66076-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index 8ad0925..533ceb9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@
apertium-nno (>= 0.6.0~r66076),
apertium-nob (>= 0.6.0~r66076),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -23,7 +23,7 @@
 Architecture: all
 Depends: apertium (>= 3.4),
  apertium-lex-tools,
- cg3,
+ cg3 (>= 1.0.0~r12254),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides: apertium-nob-nno

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd6436b10373b66bbcd6e75dedd33a02bc3b424b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-nno-nob
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] operations...apertium-nno[master]: apertium-nno: Update dependency on cg3

[KartikMistry (Code Review)]

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

Change subject: apertium-nno: Update dependency on cg3
..

apertium-nno: Update dependency on cg3

Bug: T171406
Change-Id: I2c654f4aaf800191d2d01a9e84aae2c52b7d1b8b
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-nno
 refs/changes/00/403100/1

diff --git a/debian/changelog b/debian/changelog
index 997065a..8509a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-nno (0.9.0~r69513-2+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3.
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 09:48:38 +0530
+
 apertium-nno (0.9.0~r69513-2+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie
diff --git a/debian/control b/debian/control
index 1d518e3..23fa03a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,6 +18,9 @@
 
 Package: apertium-nno
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Norwegian Nynorsk
  Data package providing Apertium language resources for Norwegian Nynorsk

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c654f4aaf800191d2d01a9e84aae2c52b7d1b8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-nno
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] operations...apertium-mlt-ara[master]: apertium-mlt-ara: Update dependency on cg3

[KartikMistry (Code Review)]

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

Change subject: apertium-mlt-ara: Update dependency on cg3
..

apertium-mlt-ara: Update dependency on cg3

Bug: T171406
Change-Id: I6c44cb7bdf6f2d5e62f926d82e2435a6c2178f69
---
M debian/changelog
M debian/control
2 files changed, 13 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-mlt-ara
 refs/changes/99/403099/1

diff --git a/debian/changelog b/debian/changelog
index 43c56cb..6da8ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-mlt-ara (0.2.0~r62623-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3.
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 09:45:04 +0530
+
 apertium-mlt-ara (0.2.0~r62623-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release and rebuild for Jessie.
diff --git a/debian/control b/debian/control
index be1d1cb..a3e5047 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,9 +18,12 @@
 
 Package: apertium-mlt-ara
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
-Provides: apertium-mt-ar, apertium-ar-mt, apertium-ara-mlt
-Conflicts: apertium-mt-ar, apertium-ar-mt, apertium-ara-mlt
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: apertium-ar-mt, apertium-ara-mlt, apertium-mt-ar
+Conflicts: apertium-ar-mt, apertium-ara-mlt, apertium-mt-ar
 Replaces: apertium-mt-ar
 Description: Apertium translation data for the Maltese-Arabic pair
  Data package providing Apertium language resources for translating

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c44cb7bdf6f2d5e62f926d82e2435a6c2178f69
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-mlt-ara
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-21634 Stdise search fields as they relate to contacts

[Eileen (Code Review)]

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

Change subject: CRM-21634 Stdise search fields as they relate to contacts
..

CRM-21634 Stdise search fields as they relate to contacts

https://github.com/civicrm/civicrm-core/pull/11492

Bug: 184496
Change-Id: Id7edd36e043a7a3ce0f693a53da6d05af746747d
---
M CRM/Contribute/Form/Search.php
M CRM/Core/Form/Search.php
M CRM/Event/Form/Search.php
M CRM/Member/Form/Search.php
M CRM/Pledge/Form/Search.php
A templates/CRM/Contact/Form/Search/ContactSearchFields.tpl
M templates/CRM/Contribute/Form/Search.tpl
M templates/CRM/Event/Form/Search.tpl
M templates/CRM/Member/Form/Search.tpl
M templates/CRM/Pledge/Form/Search.tpl
10 files changed, 195 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/98/403098/1

diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index e79c29b..30bb298 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -173,25 +173,7 @@
*/
   public function buildQuickForm() {
 parent::buildQuickForm();
-$this->addSortNameField();
-
-$this->_group = CRM_Core_PseudoConstant::nestedGroup();
-
-// multiselect for groups
-if ($this->_group) {
-  $this->add('select', 'group', ts('Groups'), $this->_group, FALSE,
-array('id' => 'group', 'multiple' => 'multiple', 'class' => 
'crm-select2')
-  );
-}
-
-// multiselect for tags
-$contactTags = CRM_Core_BAO_Tag::getTags();
-
-if ($contactTags) {
-  $this->add('select', 'contact_tags', ts('Tags'), $contactTags, FALSE,
-array('id' => 'contact_tags', 'multiple' => 'multiple', 'class' => 
'crm-select2')
-  );
-}
+$this->addContactSearchFields();
 
 CRM_Contribute_BAO_Query::buildSearchForm($this);
 
@@ -237,6 +219,36 @@
   }
 
   /**
+   * Get the label for the tag field.
+   *
+   * We do this in a function so the 'ts' wraps the whole string to allow
+   * better translation.
+   *
+   * @return string
+   */
+  protected function getTagLabel() {
+return ts('Contributor Tag(s)');
+  }
+
+  /**
+   * Get the label for the group field.
+   *
+   * @return string
+   */
+  protected function getGroupLabel() {
+return ts('Contributor Group(s)');
+  }
+
+  /**
+   * Get the label for the group field.
+   *
+   * @return string
+   */
+  protected function getContactTypeLabel() {
+return ts('Contributor Contact Type');
+  }
+
+  /**
* The post processing of the form gets done here.
*
* Key things done during post processing are
diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php
index ec2ef48..dabab86 100644
--- a/CRM/Core/Form/Search.php
+++ b/CRM/Core/Form/Search.php
@@ -199,4 +199,39 @@
 return 'search';
   }
 
+  /**
+   * Add generic fields that specify the contact.
+   */
+  protected function addContactSearchFields() {
+$this->addSortNameField();
+
+$this->_group = CRM_Core_PseudoConstant::nestedGroup();
+if ($this->_group) {
+  $this->add('select', 'group', $this->getGroupLabel(), $this->_group, 
FALSE,
+array(
+  'id' => 'group',
+  'multiple' => 'multiple',
+  'class' => 'crm-select2',
+)
+  );
+}
+
+$contactTags = CRM_Core_BAO_Tag::getTags();
+if ($contactTags) {
+  $this->add('select', 'contact_tags', $this->getTagLabel(), $contactTags, 
FALSE,
+array(
+  'id' => 'contact_tags',
+  'multiple' => 'multiple',
+  'class' => 'crm-select2',
+)
+  );
+}
+$this->addField('contact_type', array('entity' => 'Contact'));
+
+if (CRM_Core_Permission::check('access deleted contacts') && 
Civi::settings()->get('contact_undelete')) {
+  $this->addElement('checkbox', 'deleted_contacts', ts('Search in Trash') 
. '' . ts('(deleted contacts)'));
+}
+
+  }
+
 }
diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php
index 4552103..5f5783d 100644
--- a/CRM/Event/Form/Search.php
+++ b/CRM/Event/Form/Search.php
@@ -29,8 +29,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
  */
 
 /**
@@ -168,11 +166,7 @@
*/
   public function buildQuickForm() {
 parent::buildQuickForm();
-$this->addSortNameField();
-
-if (CRM_Core_Permission::check('access deleted contacts') and 
Civi::settings()->get('contact_undelete')) {
-  $this->addElement('checkbox', 'deleted_contacts', ts('Search in Trash') 
. '' . ts('(deleted contacts)'));
-}
+$this->addContactSearchFields();
 
 CRM_Event_BAO_Query::buildSearchForm($this);
 
@@ -273,6 +267,36 @@
   }
 
   /**
+   * Get the label for the tag field.
+   *
+   * We do this in a function so the 'ts' wraps the whole string to allow
+   * better translation.
+   *
+   * @return string
+   */
+  protected function getTagLabel() {
+return 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: CiviCRM submodule update

[jenkins-bot (Code Review)]

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

Change subject: CiviCRM submodule update
..


CiviCRM submodule update

9fbcd49 CRM-16819 improve on CRM_Utils_Request::retrieve
6134e93 Removed use of deprecated =

Change-Id: I67f33ad7064409a061514ff303fd26d3426bd1f5
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index bd3fadb..9fbcd49 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit bd3fadbf3335985e0b7ac425217b05ee5e963f11
+Subproject commit 9fbcd496bd919097cf6f87bebf9ff325aa184c7c

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: CiviCRM submodule update

[Eileen (Code Review)]

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

Change subject: CiviCRM submodule update
..

CiviCRM submodule update

9fbcd49 CRM-16819 improve on CRM_Utils_Request::retrieve
6134e93 Removed use of deprecated =

Change-Id: I67f33ad7064409a061514ff303fd26d3426bd1f5
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/97/403097/1

diff --git a/civicrm b/civicrm
index bd3fadb..9fbcd49 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit bd3fadbf3335985e0b7ac425217b05ee5e963f11
+Subproject commit 9fbcd496bd919097cf6f87bebf9ff325aa184c7c

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: [WIP] Revert "puppet: pin to version 3.*"

[BryanDavis (Code Review)]

Hello Dduvall, jenkins-bot,

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

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

to review the following change.


Change subject: [WIP] Revert "puppet: pin to version 3.*"
..

[WIP] Revert "puppet: pin to version 3.*"

Undo Puppet3 pinning when we have merged the stretch-migration branch which 
migrates our Puppet tree to a Puppet4 compatible format.

This reverts commit 458e47cff5ae09695d724e801e3b1c5d2fb49226.

Change-Id: I3eb187c047efa37a23263d5eb60b9bccdc26d57c
---
M puppet/modules/puppet/manifests/agent.pp
M support/puppet-bootstrap.sh
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/96/403096/1

diff --git a/puppet/modules/puppet/manifests/agent.pp 
b/puppet/modules/puppet/manifests/agent.pp
index a9c1cd1..82f6bab 100644
--- a/puppet/modules/puppet/manifests/agent.pp
+++ b/puppet/modules/puppet/manifests/agent.pp
@@ -18,11 +18,4 @@
 ensure => $ensure,
 enable => $enable,
 }
-
-# T184038: pin puppet to 3.x to prevent accidentally getting Puppet4
-apt::pin { 'puppet':
-package  => 'puppet',
-pin  => 'version 3.*',
-priority => 1001,
-}
 }
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
index afec9e8..cf64fff 100755
--- a/support/puppet-bootstrap.sh
+++ b/support/puppet-bootstrap.sh
@@ -17,4 +17,4 @@
 -y \
 -o Dpkg::Options::="--force-confdef" \
 -o Dpkg::Options::="--force-confold" \
-install puppet=3.\* puppet-common=3.\* >/dev/null 2>&1
+install puppet >/dev/null 2>&1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb187c047efa37a23263d5eb60b9bccdc26d57c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Replace yubikey nano key with yubikey 4 key for aaron

[Aaron Schulz (Code Review)]

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

Change subject: Replace yubikey nano key with yubikey 4 key for aaron
..

Replace yubikey nano key with yubikey 4 key for aaron

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


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f028283..d49f828 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -823,7 +823,7 @@
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EBJQAAAQEAljtlNa6pQX9gEyjrpCUqqQyO1HtYtHFSDuWBiWX5oiLnTSXRr0e7pECiuy9ISEI6oIt7KkaU68+cxSkqK6gwr9YwZ5Pmj3kkopT9LjguzBYxN3jEOj5+oGwdyK6ivQQA/PwPEtVgk8LgJ0EKf+74lQ4cQVsZXyu25HTq3cjfLgQRpwoYc9OBuuwIj//3uhLvIBKS3JvO3BGFsjZBPJmxoZr6+HJI7lXNfy6wWbbinXMS0gzVYhHvPwU5lFYSN0/njh3gCV8EwBYdzV6PmF0q6HXM0R1gLH2FfrhwJY3mnveWu30B7VXENYUHqc6H3wUt3rS2koTHOMvBgy3PbNCyXw==
 rsa-key-20130812
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC/0A3i4pU4rbrtwolYImIZrIYjhPnhxfAwEQ8v9QI6rIhoxS0dpYwjIF1lAeZLJoxrGk/zdHp3oI4X8Tzv6zX5MUpOsTxYY3CJulCJ1QosKqY3NPwHZs0E7xA50TGNZQYZCx/vOLjRYFsiiMgI3pacvrWwxKEDJYUZN3zUf9q1bSvdSvkk72a7YV8yQcmAO1wCr2I36ZhkKxkCjL/6K6yO/89oFsfXexGTYS11w8zvXfLNOvPSFu7wTcy1rqlWawtu0BizOKMvr6hSboLrNaNFUoyEor3G7RApOWsLj1gVyb40vMJIATapTvdfWLEJB2nXztxKRXWF6d5FUczqwrp1
 aaron/yubikey@20151218-UTC
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDaKuKntNsDJKlQbI7j5rg0QElmzS3Hq7wXi7kJSOmVSXrBURPx0OC6PMO5G/jbKS6MoBEj40OIuI7ng2z06uB7HQ3vP1bxSM9SlTjIWVsy9kBoJKbAUGW4SOuGRPBfaWn5ST16SKP9do37EK5xZfSiHIsgWSFF4FpD2blHxJ77y1rVEHi2sZDQz2zzKh9PHz0mewAKlDs3OC2iJDcg2uUkmKYphtyzURcicTGhCz7kMidGy1aYITxu1EMRTRPUkmO6zJ7qHIfNyCHZpje6HNoAjgL8DMi8YvCMWokz95x2csyMd0ZPjcgB7SVV0ddRh9gpvzh6a1390RNc1Fjezpfh
 aaron/yubikey@20171125-UTC
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCxGViKORtXynNrQ2QC89yhkCL5NQn36ZqujEb1xscbTkbW0HiwfL2wNYb8LuASop2sqLKcVBu4Ve/Wf1tXFVrfZk4nVrplw/to5Xg4HFu1MJkTLPfMJguXmq5KqeM8ljSb2O7kDh9KMt7FbxJeLobJbxfWkjWoKdwkojVBypp/SpjB/tz9+yTJAWIYnoE+OmIteVoe3YuqtFnmj10zHnHfWxSn5UaMYxo9WSWCq2WMhWLk+5Pk+MsOH+aMHbF27P1odOkQFhnpH0Uu3Jjru5uwbeVgmRd2vowqTtlJvhs68GqVRiGjGL/yg0azdyY2/VwfiU2UgHrkoyJFGx7Zjqwp
 aaron/yubikey@20180108-UTC
 uid: 544
 email: asch...@wikimedia.org
   dr0ptp4kt:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I374f3fde984418967997f4f411b6ca204ecf604d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: remove duplicate firewall include

[Dzahn (Code Review)]

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

Change subject: prometheus: remove duplicate firewall include
..


prometheus: remove duplicate firewall include

The firewall is already included in the role classes.
Compare to prometheus eqiad.

Change-Id: Ieaab30cbcfd73fb1b83c03482b0be85d3007588c
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 4e6abe4..4397bd6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1820,7 +1820,6 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus)
-include ::base::firewall
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: remove duplicate firewall include

[Dzahn (Code Review)]

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

Change subject: prometheus: remove duplicate firewall include
..

prometheus: remove duplicate firewall include

The firewall is already included in the role classes.
Compare to prometheus eqiad.

Change-Id: Ieaab30cbcfd73fb1b83c03482b0be85d3007588c
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4e6abe4..4397bd6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1820,7 +1820,6 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus)
-include ::base::firewall
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: puppet: pin to version 3.*

[jenkins-bot (Code Review)]

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

Change subject: puppet: pin to version 3.*
..


puppet: pin to version 3.*

Prevent `apt-get update && apt-get upgrade` from picking Puppet4 as the
version to install by pinning to Puppet 3.x with apt.

Bug: T184038
Change-Id: I309b193596735d409978132e6784f4ad703151d3
---
M puppet/modules/puppet/manifests/agent.pp
M support/puppet-bootstrap.sh
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/puppet/modules/puppet/manifests/agent.pp 
b/puppet/modules/puppet/manifests/agent.pp
index 82f6bab..a9c1cd1 100644
--- a/puppet/modules/puppet/manifests/agent.pp
+++ b/puppet/modules/puppet/manifests/agent.pp
@@ -18,4 +18,11 @@
 ensure => $ensure,
 enable => $enable,
 }
+
+# T184038: pin puppet to 3.x to prevent accidentally getting Puppet4
+apt::pin { 'puppet':
+package  => 'puppet',
+pin  => 'version 3.*',
+priority => 1001,
+}
 }
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
index cf64fff..afec9e8 100755
--- a/support/puppet-bootstrap.sh
+++ b/support/puppet-bootstrap.sh
@@ -17,4 +17,4 @@
 -y \
 -o Dpkg::Options::="--force-confdef" \
 -o Dpkg::Options::="--force-confold" \
-install puppet >/dev/null 2>&1
+install puppet=3.\* puppet-common=3.\* >/dev/null 2>&1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I309b193596735d409978132e6784f4ad703151d3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix return in PFTemplate and PFOpenLayersInput

[jenkins-bot (Code Review)]

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

Change subject: Fix return in PFTemplate and PFOpenLayersInput
..


Fix return in PFTemplate and PFOpenLayersInput

PFTemplate::loadTemplateFieldsSMWAndOther return void, no need for
another return
PFOpenLayersInput::parseCoordinatesString needs a return value, choose
null and adjust the condition to evaluate correct. trim(null) gives ''

Change-Id: Id58350acfe01a3c92d9307a37ddf789c1405a94d
---
M .phpcs.xml
M includes/PF_Template.php
M includes/forminputs/PF_OpenLayersInput.php
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 4764e29..30ee060 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -18,7 +18,6 @@



-   



diff --git a/includes/PF_Template.php b/includes/PF_Template.php
index 6de0603..3483ee2 100644
--- a/includes/PF_Template.php
+++ b/includes/PF_Template.php
@@ -64,7 +64,7 @@
return;
}
}
-   return $this->loadTemplateFieldsSMWAndOther();
+   $this->loadTemplateFieldsSMWAndOther();
}
 
/**
diff --git a/includes/forminputs/PF_OpenLayersInput.php 
b/includes/forminputs/PF_OpenLayersInput.php
index 99b836d..1e897d9 100644
--- a/includes/forminputs/PF_OpenLayersInput.php
+++ b/includes/forminputs/PF_OpenLayersInput.php
@@ -202,11 +202,12 @@
 * Copied from CargoStore::parseCoordinateString() in the Cargo
 * extension.
 * @param string $coordinatesString
+* @return string|null
 */
public static function parseCoordinatesString( $coordinatesString ) {
$coordinatesString = trim( $coordinatesString );
-   if ( $coordinatesString == null ) {
-   return;
+   if ( $coordinatesString === '' ) {
+   return null;
}
 
// This is safe to do, right?

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id58350acfe01a3c92d9307a37ddf789c1405a94d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: CSSMin: Remove XML declaration from SVGs

[VolkerE (Code Review)]

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

Change subject: CSSMin: Remove XML declaration from SVGs
..

CSSMin: Remove XML declaration from SVGs

Removing unnecessary XML declaration prolog when embedding SVGs
as data URI.

Bug: T175318
Change-Id: Ibec8c2ab498554a6ad33b4420ae6258dcc80fcdf
---
M includes/libs/CSSMin.php
M tests/phpunit/includes/libs/CSSMinTest.php
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/403093/1

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index e85f02d..20f52f8 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -132,6 +132,9 @@
 */
public static function encodeStringAsDataURI( $contents, $type, 
$ie8Compat = true ) {
// Try #1: Non-encoded data URI
+
+   // Remove XML declaration, it's not needed with data URI usage
+   $contents = preg_replace( "/<\\?xml.*\\?>/", '', $contents );
// The regular expression matches ASCII whitespace and 
printable characters.
if ( preg_match( '/^[\r\n\t\x20-\x7e]+$/', $contents ) ) {
// Do not base64-encode non-binary files (sane SVGs).
@@ -151,6 +154,7 @@
$encoded = preg_replace( '/ {2,}/', ' ', $encoded );
// Remove leading and trailing spaces
$encoded = preg_replace( '/^ | $/', '', $encoded );
+
$uri = 'data:' . $type . ',' . $encoded;
if ( !$ie8Compat || strlen( $uri ) < 
self::DATA_URI_SIZE_LIMIT ) {
return $uri;
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php 
b/tests/phpunit/includes/libs/CSSMinTest.php
index 81ceb59..a1b9393 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -271,9 +271,8 @@
// data: URIs for red.gif, green.gif, circle.svg
$red   = 
'data:image/gif;base64,R0lGODlhAQABAIAAAP8AADAAACwAAQABAAACAkQBADs=';
$green = 
'data:image/gif;base64,R0lGODlhAQABAICAADAAACwAAQABAAACAkQBADs=';
-   $svg = 'data:image/svg+xml,%3C%3Fxml version=%221.0%22 
encoding=%22UTF-8%22%3F%3E '
-   . '%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 
width=%228%22 height='
-   . '%228%22%3E %3Ccircle cx=%224%22 cy=%224%22 
r=%222%22/%3E %3C/svg%3E';
+   $svg = 'data:image/svg+xml,%3Csvg 
xmlns=%22http://www.w3.org/2000/svg%22 width=%228'
+   . '%22 height=%228%22%3E %3Ccircle cx=%224%22 
cy=%224%22 r=%222%22/%3E %3C/svg%3E';
 
// phpcs:disable Generic.Files.LineLength
return [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Re-introduce CSSMin: Mangle whitespace in embedded SVGs

[VolkerE (Code Review)]

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

Change subject: Re-introduce CSSMin: Mangle whitespace in embedded SVGs
..

Re-introduce CSSMin: Mangle whitespace in embedded SVGs

Convert newlines and tabs to spaces (which can be unencoded),
and consolidate runs of multiple spaces into a single space.
Also remove any leading and trailing spaces that might result
(most files end in a newline, for example).
Follow-up to Iddc98332d. This was reverted as dependency for the
original issues causing patch, but works perfectly fine.

Bug: T175318
Change-Id: Ic25d73caeb42ba7a32ef304806d401047b5a1997
---
M includes/libs/CSSMin.php
M tests/phpunit/includes/libs/CSSMinTest.php
2 files changed, 9 insertions(+), 2 deletions(-)


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

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index a9cbba2..e85f02d 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -143,7 +143,14 @@
'%2F' => '/', // Unencode slashes
'%3A' => ':', // Unencode colons
'%3D' => '=', // Unencode equals signs
+   '%0A' => ' ', // Change newlines to spaces
+   '%0D' => ' ', // Change carriage returns to 
spaces
+   '%09' => ' ', // Change tabs to spaces
] );
+   // Consolidate runs of multiple spaces in a row
+   $encoded = preg_replace( '/ {2,}/', ' ', $encoded );
+   // Remove leading and trailing spaces
+   $encoded = preg_replace( '/^ | $/', '', $encoded );
$uri = 'data:' . $type . ',' . $encoded;
if ( !$ie8Compat || strlen( $uri ) < 
self::DATA_URI_SIZE_LIMIT ) {
return $uri;
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php 
b/tests/phpunit/includes/libs/CSSMinTest.php
index a6efc85..81ceb59 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -271,9 +271,9 @@
// data: URIs for red.gif, green.gif, circle.svg
$red   = 
'data:image/gif;base64,R0lGODlhAQABAIAAAP8AADAAACwAAQABAAACAkQBADs=';
$green = 
'data:image/gif;base64,R0lGODlhAQABAICAADAAACwAAQABAAACAkQBADs=';
-   $svg = 'data:image/svg+xml,%3C%3Fxml version=%221.0%22 
encoding=%22UTF-8%22%3F%3E%0A'
+   $svg = 'data:image/svg+xml,%3C%3Fxml version=%221.0%22 
encoding=%22UTF-8%22%3F%3E '
. '%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 
width=%228%22 height='
-   . '%228%22%3E%0A%09%3Ccircle cx=%224%22 cy=%224%22 
r=%222%22/%3E%0A%3C/svg%3E%0A';
+   . '%228%22%3E %3Ccircle cx=%224%22 cy=%224%22 
r=%222%22/%3E %3C/svg%3E';
 
// phpcs:disable Generic.Files.LineLength
return [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "adding imarlier to groups"

[RobH (Code Review)]

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

Change subject: Revert "adding imarlier to groups"
..


Revert "adding imarlier to groups"

after merging getting puppet compile failures

This reverts commit 98fac434a6022464a745b8c6ad10d6c2e71ef673.

Change-Id: I010dd111a1908cfb9c12af0ee734f78e2687e0b9
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fc17bc9..f028283 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -194,7 +194,7 @@
   leila, nettrom, mforns, bmansurov, tbayer, joal,
   madhuvishy, tjones, legoktm, dcausse, bearloga, dpatrick, 
atgomez, dstrine,
   joewalsh, marktraceur, mtizzoni, panisson, paolotti, ciro, 
melodykramer,
-  fdans, shiladsen, imarlier]
+  fdans, shiladsen]
   statistics-users:
 gid: 726
 description: Access statistics number crunching hosts. NO PRIVS.
@@ -234,7 +234,7 @@
  This will grant shell access on Hadoop client nodes and on
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
-members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak, 
imarlier,
+members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak,
   halfak, dr0ptp4kt, bearloga, elukey, ppchelko,
   nuria, otto, deskana, arnad, jgonsior, jgreen,
   bsitzmann, dbrant, nettrom, leila, cwdent,
@@ -460,7 +460,7 @@
   perf-team:
 gid: 796
 description: performance team members with access to 'webperf' and 'xhgui' 
servers
-members: [krinkle, gilles, phedenskog, imarlier]
+members: [krinkle, gilles, phedenskog]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   perf-roots:
 gid: 766

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I010dd111a1908cfb9c12af0ee734f78e2687e0b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "adding imarlier to groups"

[RobH (Code Review)]

Hello Alex Monk, Muehlenhoff, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "adding imarlier to groups"
..

Revert "adding imarlier to groups"

after merging getting puppet compile failures

This reverts commit 98fac434a6022464a745b8c6ad10d6c2e71ef673.

Change-Id: I010dd111a1908cfb9c12af0ee734f78e2687e0b9
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fc17bc9..f028283 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -194,7 +194,7 @@
   leila, nettrom, mforns, bmansurov, tbayer, joal,
   madhuvishy, tjones, legoktm, dcausse, bearloga, dpatrick, 
atgomez, dstrine,
   joewalsh, marktraceur, mtizzoni, panisson, paolotti, ciro, 
melodykramer,
-  fdans, shiladsen, imarlier]
+  fdans, shiladsen]
   statistics-users:
 gid: 726
 description: Access statistics number crunching hosts. NO PRIVS.
@@ -234,7 +234,7 @@
  This will grant shell access on Hadoop client nodes and on
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
-members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak, 
imarlier,
+members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak,
   halfak, dr0ptp4kt, bearloga, elukey, ppchelko,
   nuria, otto, deskana, arnad, jgonsior, jgreen,
   bsitzmann, dbrant, nettrom, leila, cwdent,
@@ -460,7 +460,7 @@
   perf-team:
 gid: 796
 description: performance team members with access to 'webperf' and 'xhgui' 
servers
-members: [krinkle, gilles, phedenskog, imarlier]
+members: [krinkle, gilles, phedenskog]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   perf-roots:
 gid: 766

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I010dd111a1908cfb9c12af0ee734f78e2687e0b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Alex Monk 
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]: [doc] Prepare next release

[jenkins-bot (Code Review)]

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

Change subject: [doc] Prepare next release
..


[doc] Prepare next release

Change-Id: Iaa88a6e057a52d8d486d83dedcf84d293c56e04c
---
M HISTORY.rst
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/HISTORY.rst b/HISTORY.rst
index 71052a5..c88b72a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@
 Current release
 ---
 
+* Bugfixes and improvements
+* Localisation updates
+
+3.0.20180108
+
+
 * Maintenance script to download Wikimedia database dump
 * Option to auto-create accounts when logging in
 * Ship wikimania family file

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] Cleanup doc string

[jenkins-bot (Code Review)]

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

Change subject: [DOC] Cleanup doc string
..


[DOC] Cleanup doc string

Change-Id: Ice48b587d60beed0eed8a08e25e720fd3950f35f
---
M generate_family_file.py
1 file changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/generate_family_file.py b/generate_family_file.py
index cd1caa7..018166a 100755
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -1,15 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-"""
-This script generates a family file from a given URL.
-
-Hackish, etc. Regexps, yes. Sorry, jwz.
-"""
+"""This script generates a family file from a given URL."""
 from __future__ import (absolute_import, division,
 print_function, unicode_literals)
 #
 # (C) Merlijn van Deen, 2010-2013
-# (C) Pywikibot team, 2010-2016
+# (C) Pywikibot team, 2010-2018
 #
 # Distributed under the terms of the MIT license
 #

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding imarlier to groups

[RobH (Code Review)]

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

Change subject: adding imarlier to groups
..


adding imarlier to groups

This patchset includes adding imarlier to sudo group perf-team and must
be approved in the operations meeting (or have director of ops approval)
before it can be merged live.  Also adds user to
statistics-privatedata-users & analytics-privatedata-users.

DO NOT MERGE THIS UNLESS YOU ARE CERTAIN ACCESS HAS BEEN APPROVED.

Bug: T184190
Change-Id: I515666caf7734593695c422db2c54ddce83454d8
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f028283..fc17bc9 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -194,7 +194,7 @@
   leila, nettrom, mforns, bmansurov, tbayer, joal,
   madhuvishy, tjones, legoktm, dcausse, bearloga, dpatrick, 
atgomez, dstrine,
   joewalsh, marktraceur, mtizzoni, panisson, paolotti, ciro, 
melodykramer,
-  fdans, shiladsen]
+  fdans, shiladsen, imarlier]
   statistics-users:
 gid: 726
 description: Access statistics number crunching hosts. NO PRIVS.
@@ -234,7 +234,7 @@
  This will grant shell access on Hadoop client nodes and on
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
-members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak,
+members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak, 
imarlier,
   halfak, dr0ptp4kt, bearloga, elukey, ppchelko,
   nuria, otto, deskana, arnad, jgonsior, jgreen,
   bsitzmann, dbrant, nettrom, leila, cwdent,
@@ -460,7 +460,7 @@
   perf-team:
 gid: 796
 description: performance team members with access to 'webperf' and 'xhgui' 
servers
-members: [krinkle, gilles, phedenskog]
+members: [krinkle, gilles, phedenskog, imarlier]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   perf-roots:
 gid: 766

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I515666caf7734593695c422db2c54ddce83454d8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adds cy534 to analytics-users

[RobH (Code Review)]

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

Change subject: adds cy534 to analytics-users
..

adds cy534 to analytics-users

second of two patches to add user cy534 to shell access and the
analytics-user group.

DO NOT MERGE UNLESS YOU ARE ON OPS CLINIC DUTY.  This has to have all
checklist steps reviewed on the task.

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


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index a20ccb6..4b7b1dd 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -247,7 +247,7 @@
   jdlrobson, chelsyx, ovasileva, mtizzoni, panisson, paolotti, 
ciro,
   flemmerich, mkroetzsch, akrausetud, filippo, pmiazga, faidon,
   piccardi, fdans, eevans, anomie, demon, ladsgroup, musikanimal, 
joewalsh,
-  kaldari, goransm, ema, dsaez, shiladsen, rho, mirrys, slaporte, 
jk]
+  kaldari, goransm, ema, dsaez, shiladsen, rho, mirrys, slaporte, 
jk, cy534]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Special:Stats as an alias for Special:Statistics

[Kaldari (Code Review)]

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

Change subject: Add Special:Stats as an alias for Special:Statistics
..

Add Special:Stats as an alias for Special:Statistics

Change-Id: Ib3dd0498f6ae77b522ddee786655994b24f63350
---
M languages/messages/MessagesEn.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/403089/1

diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index a3173d4..16a12de 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -488,7 +488,7 @@
'Search'=> [ 'Search' ],
'Shortpages'=> [ 'ShortPages' ],
'Specialpages'  => [ 'SpecialPages' ],
-   'Statistics'=> [ 'Statistics' ],
+   'Statistics'=> [ 'Statistics', 'Stats' ],
'Tags'  => [ 'Tags' ],
'TrackingCategories'=> [ 'TrackingCategories' ],
'Unblock'   => [ 'Unblock' ],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "prometheus: move duplicate include, use profile::bas...

[Dzahn (Code Review)]

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

Change subject: Revert "prometheus: move duplicate include, use 
profile::base::firewall"
..


Revert "prometheus: move duplicate include, use profile::base::firewall"

This reverts commit 23389f1c4d4e6698dac960c3105da8f757cf05dd.

Change-Id: I96ed9d4b841f1fc99a9973daad9d4be8aa7bf7da
---
M manifests/site.pp
M modules/role/manifests/prometheus/global.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 4397bd6..4e6abe4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1820,6 +1820,7 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus)
+include ::base::firewall
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {
diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index 409ac73..1c0533e 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -3,8 +3,7 @@
 description => 'Prometheus server (global)',
 }
 
-include ::standard
-include ::profile::base::firewall
+include ::base::firewall
 
 # Pull selected metrics from all DC-local Prometheus servers.
 $federation_jobs = [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding shell user cy534

[RobH (Code Review)]

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

Change subject: adding shell user cy534
..

adding shell user cy534

this patchset simply adds the shell user, but doesn't add cy534 to any
actual groups.  This is done in two patchsets, otherwise ci testing will
occassionally hit a race condition where it processes group membership
before users, and not understand the new user in the patchset.

Another patchset will follow to add the user to groups.

DO NOT MERGE THIS UNLESS YOU ARE ON OPS CLINIC DUTY AND HAVE REVIEWED
THE TASK FOR ALL STEPS.

Bug: T184473
Change-Id: I427c6af5fecc38bb816d5238e58e287e0fbeb55f
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f028283..a20ccb6 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2667,6 +2667,15 @@
 email: vinitha...@gmail.com
 expiry_date: 2018-03-31
 expiry_contact: nu...@wikimedia.org
+  cy534:
+ensure: present
+gid: 500
+name: cy534
+realname:  Christian Covington
+ssh_keys:
+- 
B3NzaC1yc2EDAQABAAACAQDBxzztOka1AJvg4W3N4OnYbvr4nz+iDg3mgWlG8f0jbIc1tY9Ned8yfxd8mK+/K/TGMRBGxIwanODE+tvvKHOsULtYrlElIbd25eZY1PAAhWalrhbVZefPHgW3OLuA60FKcZeggJAiOYs9Q4jV0m8ZngIgVPSkrbF/Kr9Jg+HSERDaFmZL/CDy4f9QHsPBU+E6R0C5A06wnCmPwPE3aUhhBwahwxqgkftBywepszho3GTuDYRtS1XuCBobVpmCqkArchY9938AfBb4gI6sf+0ooaxt5e3O9QU1iLphGoRxEfe+u33Crqcf7HXfGnE750q4auNA4UpPJseOLhW7o43zKwJKrR/kb4s5qx91nq0P1HOChHEFrbzPQlAfnGrz3Cw8SLD38+eUryHpVwIw2WNr43a584Qye+CVzWCylcSjEzLsN+PCG4hlukAcWok+W8gQjfTgUCCpMuWG42Wb5GwAGlTtiy8iqLqYSLauWDP5DMm6bYUKFOgzHYseUYZ4CbvCol6SSuy61qt7BHveIvK4G60OkqdJ7LVB62scm714/VkrHJzX0pu3k7C0/89evHKZ1CuN3KNIQn7fMdVpY41kn7wNxHC/VYO2f2v8cmFxv0Ewr31ILPU2zUJz0+Pj0Bpd92ePtre6FJP76IOBHyGjchGFTn+2qwStMuIQ0uFKHw==
 christian@christian-XPS-15-9550
+uid: 18627
+email: christian.t.coving...@gmail.com
 
 ldap_only_users:
   abartov:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "prometheus: move duplicate include, use profile::bas...

[Dzahn (Code Review)]

Hello Giuseppe Lavagetto, Alexandros Kosiaris, jenkins-bot, Filippo Giunchedi,

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

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

to review the following change.


Change subject: Revert "prometheus: move duplicate include, use 
profile::base::firewall"
..

Revert "prometheus: move duplicate include, use profile::base::firewall"

This reverts commit 23389f1c4d4e6698dac960c3105da8f757cf05dd.

Change-Id: I96ed9d4b841f1fc99a9973daad9d4be8aa7bf7da
---
M manifests/site.pp
M modules/role/manifests/prometheus/global.pp
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4397bd6..4e6abe4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1820,6 +1820,7 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus)
+include ::base::firewall
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {
diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index 409ac73..1c0533e 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -3,8 +3,7 @@
 description => 'Prometheus server (global)',
 }
 
-include ::standard
-include ::profile::base::firewall
+include ::base::firewall
 
 # Pull selected metrics from all DC-local Prometheus servers.
 $federation_jobs = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96ed9d4b841f1fc99a9973daad9d4be8aa7bf7da
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added Tests for Composer Installed

[Ryan10145 (Code Review)]

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

Change subject: Added Tests for Composer Installed
..

Added Tests for Composer Installed

Bug: T183899
Change-Id: Id822caad044a079884795dbea37baf10514bcf5c
---
A tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
1 file changed, 499 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/403086/1

diff --git a/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php 
b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
new file mode 100644
index 000..c7c9d66
--- /dev/null
+++ b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
@@ -0,0 +1,499 @@
+installed = 
"$IP/tests/phpunit/data/composer/installed.json";
+   }
+
+   /**
+* @covers ComposerInstalled::__construct
+* @covers ComposerInstalled::getInstalledDependencies
+*/
+   public function testGetInstalledDependencies() {
+   $installed = new ComposerInstalled( $this->installed );
+   $this->assertArrayEquals( [
+   'leafo/lessphp' => [
+   'version' => '0.5.0',
+   'type' => 'library',
+   'licenses' => [ 'MIT', 'GPL-3.0' ],
+   'authors' => [
+   [
+   'name' => 'Leaf Corcoran',
+   'email' => 'lea...@gmail.com',
+   'homepage' => 'http://leafo.net',
+   ],
+   ],
+   'description' => 'lessphp is a compiler for LESS 
written in PHP.',
+   ],
+   'psr/log' => [
+   'version' => '1.0.0',
+   'type' => 'library',
+   'licenses' => [ 'MIT' ],
+   'authors' => [
+   [
+   'name' => 'PHP-FIG',
+   'homepage' => 'http://www.php-fig.org/',
+   ],
+   ],
+   'description' => 'Common interface for logging 
libraries',
+   ],
+   'cssjanus/cssjanus' => [
+   'version' => '1.1.1',
+   'type' => 'library',
+   'licenses' => [ 'Apache-2.0' ],
+   'authors' => [
+   ],
+   'description' => 'Convert CSS stylesheets between 
left-to-right ' .
+   'and right-to-left.',
+   ],
+   'cdb/cdb' => [
+   'version' => '1.0.0',
+   'type' => 'library',
+   'licenses' => [ 'GPLv2' ],
+   'authors' => [
+   [
+   'name' => 'Tim Starling',
+   'email' => 'tstarl...@wikimedia.org',
+   ],
+   [
+   'name' => 'Chad Horohoe',
+   'email' => 'c...@wikimedia.org',
+   ],
+   ],
+   'description' => 'Constant Database (CDB) wrapper 
library for PHP. ' .
+   'Provides pure-PHP fallback when dba_* 
functions are absent.',
+   ],
+   'sebastian/version' => [
+   'version' => '2.0.1',
+   'type' => 'library',
+   'licenses' => [ 'BSD-3-Clause' ],
+   'authors' => [
+   [
+   'name' => 'Sebastian Bergmann',
+   'email' => 'sebast...@phpunit.de',
+   'role' => 'lead',
+   ],
+   ],
+   'description' => 'Library that helps with managing the 
version ' .
+   'number of Git-hosted PHP projects',
+   ],
+   'sebastian/resource-operations' => [
+   'version' => '1.0.0',
+   'type' => 'library',
+   'licenses' => [ 'BSD-3-Clause' ],
+   'authors' => [
+   [
+   'name' => 'Sebastian Bergmann',
+   'email' => 'sebast...@phpunit.de',
+   ],
+   ],
+   'description' => 'Provides a list of PHP built-in 
functions that ' .
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: move duplicate include, use profile::base::firewall

[Dzahn (Code Review)]

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

Change subject: prometheus: move duplicate include, use profile::base::firewall
..


prometheus: move duplicate include, use profile::base::firewall

Change-Id: I2421f6c9236160438d43d929e9ea616aad00c3a1
---
M manifests/site.pp
M modules/role/manifests/prometheus/global.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 4e6abe4..4397bd6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1820,7 +1820,6 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus)
-include ::base::firewall
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {
diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index 1c0533e..409ac73 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -3,7 +3,8 @@
 description => 'Prometheus server (global)',
 }
 
-include ::base::firewall
+include ::standard
+include ::profile::base::firewall
 
 # Pull selected metrics from all DC-local Prometheus servers.
 $federation_jobs = [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Prefix icons in Minerva

[Jdlrobson (Code Review)]

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

Change subject: Prefix icons in Minerva
..

Prefix icons in Minerva

Changes:
* MinervaUI will now prefix any icons with `minerva`
* Update definitions in skin.json, retaining selectors for cached
HTML for icons that are rendered via PHP.
Move skins.minerva.icons.images.variants into MobileFrontend?
* anonymous and user icons actually live in MobileFrontend. They
are not needed/used here so are removed
* In I9021c53c2c04bdd7ce395eed33d89986acbfea6d watch and watched
are moved to MobileFrontend so are removed here as they are not
used directly in this repo.

Depends-On: I9021c53c2c04bdd7ce395eed33d89986acbfea6d
Bug: T182162
Change-Id: I93264024f4915fc910c792b1905b89cdc6b8b546
---
M includes/MinervaUI.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/skins/user_page_links.mustache
D resources/skins.minerva.icons.images.scripts/watch.svg
D resources/skins.minerva.icons.images.scripts/watched.svg
M resources/skins.minerva.scripts/DownloadIcon.js
M skin.json
8 files changed, 23 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/85/403085/1

diff --git a/includes/MinervaUI.php b/includes/MinervaUI.php
index d800514..416dc0f 100644
--- a/includes/MinervaUI.php
+++ b/includes/MinervaUI.php
@@ -22,7 +22,7 @@
$base = 'mw-ui-icon';
$modifiers = 'mw-ui-icon-' . $iconType;
if ( $iconName ) {
-   $modifiers .= ' mw-ui-icon-' . $iconName;
+   $modifiers .= ' mw-ui-icon-minerva-' . $iconName;
}
return $base . ' ' . $modifiers . ' ' . $additionalClassNames;
}
diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 7726d05..bf150d2 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -279,7 +279,7 @@
// which is problematic in Opera Mini (see T140490)
'searchButton' => Html::rawElement( 'button', [
'id' => 'searchIcon',
-   'class' => MinervaUI::iconClass( 
'magnifying-glass', 'element' ),
+   'class' => MinervaUI::iconClass( 
'minerva-magnifying-glass', 'element' ),
], wfMessage( 'searchbutton' ) ),
'secondaryButtonData' => $data['secondaryButtonData'],
'mainmenuhtml' => $this->getMainMenuHtml( $data ),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b0fc312..1704247 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -460,7 +460,7 @@
->addComponent(
$this->msg( 
'mobile-frontend-main-menu-contributions' )->escaped(),
SpecialPage::getTitleFor( 'Contributions', 
$user->getName() )->getLocalUrl(),
-   MinervaUI::iconClass( 'mf-contributions', 
'before' ),
+   MinervaUI::iconClass( 'contributions', 'before' 
),
[ 'data-event-name' => 'contributions' ]
);
}
@@ -498,7 +498,7 @@
'mobile-frontend-watchlist-purpose',
$watchlistQuery
),
-   MinervaUI::iconClass( 'mf-watchlist', 'before' 
),
+   MinervaUI::iconClass( 'watchlist', 'before' ),
[ 'data-event-name' => 'watchlist' ]
);
}
@@ -520,7 +520,7 @@
$this->msg( 
'mobile-frontend-main-menu-settings' )->escaped(),
SpecialPage::getTitleFor( 
'MobileOptions' )->
getLocalUrl( [ 'returnto' => 
$returnToTitle ] ),
-   MinervaUI::iconClass( 'mf-settings', 
'before' ),
+   MinervaUI::iconClass( 'settings', 
'before' ),
[ 'data-event-name' => 'settings' ]
);
 
@@ -535,7 +535,7 @@
SpecialPage::getTitleFor( 
'Preferences' ),
'prefsnologintext2'
),
-   MinervaUI::iconClass( 'mf-settings', 
'before' ),
+   MinervaUI::iconClass( 'settings', 
'before' ),
[ 'data-event-name' => 'preferences' ]
);

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Remove unused methods & update codes to lambda

[Cooltey (Code Review)]

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

Change subject: Hygiene: Remove unused methods & update codes to lambda
..

Hygiene: Remove unused methods & update codes to lambda

Change-Id: I6da7c39a709a06eb2cc5d67ce274ca14601d3430
---
M app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
M app/src/main/java/org/wikipedia/page/NoDimBottomSheetDialog.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/page/PageInfoDialog.java
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewOverlayView.java
D app/src/main/java/org/wikipedia/page/linkpreview/PageExtract.java
M app/src/main/java/org/wikipedia/page/shareafact/ShareHandler.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
15 files changed, 208 insertions(+), 465 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java 
b/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
index ba79089..cbee546 100644
--- a/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
+++ b/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
@@ -32,12 +32,7 @@
 public void show(@NonNull FragmentManager manager, @NonNull Dialog dialog) 
{
 dismiss(manager);
 currentDialog = dialog;
-currentDialog.setOnDismissListener(new 
DialogInterface.OnDismissListener() {
-@Override
-public void onDismiss(DialogInterface dialogInterface) {
-currentDialog = null;
-}
-});
+currentDialog.setOnDismissListener((dialogInterface) -> currentDialog 
= null);
 currentDialog.show();
 }
 
diff --git a/app/src/main/java/org/wikipedia/page/NoDimBottomSheetDialog.java 
b/app/src/main/java/org/wikipedia/page/NoDimBottomSheetDialog.java
index b2b9ed8..ca369a8 100644
--- a/app/src/main/java/org/wikipedia/page/NoDimBottomSheetDialog.java
+++ b/app/src/main/java/org/wikipedia/page/NoDimBottomSheetDialog.java
@@ -37,13 +37,10 @@
 https://code.google.com/p/android/issues/detail?id=202174
 TODO: remove when this is improved in the library.
 */
-getWindow().getDecorView().post(new Runnable() {
-@Override
-public void run() {
-FrameLayout bottomSheet = 
getWindow().getDecorView().findViewById(android.support.design.R.id.design_bottom_sheet);
-BottomSheetBehavior behavior = 
BottomSheetBehavior.from(bottomSheet);
-behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-}
+getWindow().getDecorView().post(() -> {
+FrameLayout bottomSheet = 
getWindow().getDecorView().findViewById(android.support.design.R.id.design_bottom_sheet);
+BottomSheetBehavior behavior = 
BottomSheetBehavior.from(bottomSheet);
+behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
 });
 }
 }
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 8b7db6b..b4d9cca 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -435,27 +435,24 @@
 return;
 }
 
-tabsContainerView.post(new Runnable() {
-@Override
-public void run() {
-if (!pageFragment.isAdded()) {
-return;
-}
-// Close the link preview, if one is open.
-hideLinkPreview();
-
-pageFragment.closeFindInPage();
-if (position == TabPosition.CURRENT_TAB) {
-pageFragment.loadPage(title, entry, true);
-} else if (position == TabPosition.NEW_TAB_BACKGROUND) {
-pageFragment.openInNewBackgroundTabFromMenu(title, entry);
-} else if (position == TabPosition.EXISTING_TAB) {
-pageFragment.openFromExistingTab(title, entry);
-} else {
-pageFragment.openInNewForegroundTabFromMenu(title, entry);
-}
-app.getSessionFunnel().pageViewed(entry);
+tabsContainerView.post(() -> {
+if 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: WIP:Prefix icons in Minerva

[Jdlrobson (Code Review)]

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

Change subject: WIP:Prefix icons in Minerva
..

WIP:Prefix icons in Minerva

These are all defined in MobileFrontend and do not need to be here
Prefix icons that are loaded via JavaScript

@todo: Icons rendered on server side will need to be made backwards
compatible
Move skins.minerva.icons.images.variants into MobileFrontend?

Changes:
* anonymous and user icons actually live in MobileFrontend. They
are not needed/used here.
* In I9021c53c2c04bdd7ce395eed33d89986acbfea6d watch and watched
are moved to MobileFrontend so are removed here as they are not
used in this repo.

Depends-On: I9021c53c2c04bdd7ce395eed33d89986acbfea6d
Bug: T182162
Change-Id: I93264024f4915fc910c792b1905b89cdc6b8b546
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
D resources/skins.minerva.icons.images.scripts/watch.svg
D resources/skins.minerva.icons.images.scripts/watched.svg
M skin.json
5 files changed, 19 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/83/403083/1

diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 7726d05..83ff57b 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -110,7 +110,7 @@
$args = [
'clockIconClass' => MinervaUI::iconClass( 
'clock-gray', 'before' ),
'arrowIconClass' => MinervaUI::iconClass(
-   'arrow-gray', 'element', 
'mw-ui-icon-small mf-mw-ui-icon-rotate-anti-clockwise indicator' ),
+   'minerva-arrow-gray', 'element', 
'mw-ui-icon-small mf-mw-ui-icon-rotate-anti-clockwise indicator' ),
] + $data['historyLink'];
$templateParser = new TemplateParser( __DIR__ );
return $templateParser->processTemplate( 'history', 
$args );
@@ -279,7 +279,7 @@
// which is problematic in Opera Mini (see T140490)
'searchButton' => Html::rawElement( 'button', [
'id' => 'searchIcon',
-   'class' => MinervaUI::iconClass( 
'magnifying-glass', 'element' ),
+   'class' => MinervaUI::iconClass( 
'minerva-magnifying-glass', 'element' ),
], wfMessage( 'searchbutton' ) ),
'secondaryButtonData' => $data['secondaryButtonData'],
'mainmenuhtml' => $this->getMainMenuHtml( $data ),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b0fc312..d730327 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -460,7 +460,7 @@
->addComponent(
$this->msg( 
'mobile-frontend-main-menu-contributions' )->escaped(),
SpecialPage::getTitleFor( 'Contributions', 
$user->getName() )->getLocalUrl(),
-   MinervaUI::iconClass( 'mf-contributions', 
'before' ),
+   MinervaUI::iconClass( 'minerva-contributions', 
'before' ),
[ 'data-event-name' => 'contributions' ]
);
}
@@ -498,7 +498,7 @@
'mobile-frontend-watchlist-purpose',
$watchlistQuery
),
-   MinervaUI::iconClass( 'mf-watchlist', 'before' 
),
+   MinervaUI::iconClass( 'minerva-watchlist', 
'before' ),
[ 'data-event-name' => 'watchlist' ]
);
}
@@ -520,7 +520,7 @@
$this->msg( 
'mobile-frontend-main-menu-settings' )->escaped(),
SpecialPage::getTitleFor( 
'MobileOptions' )->
getLocalUrl( [ 'returnto' => 
$returnToTitle ] ),
-   MinervaUI::iconClass( 'mf-settings', 
'before' ),
+   MinervaUI::iconClass( 
'minerva-settings', 'before' ),
[ 'data-event-name' => 'settings' ]
);
 
@@ -535,7 +535,7 @@
SpecialPage::getTitleFor( 
'Preferences' ),
'prefsnologintext2'
),
-   MinervaUI::iconClass( 'mf-settings', 
'before' ),
+   MinervaUI::iconClass( 
'minerva-settings', 'before' ),
   

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-16819 improve on CRM_Utils_Request::retrieve

[Ejegg (Code Review)]

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

Change subject: CRM-16819 improve on CRM_Utils_Request::retrieve
..


CRM-16819 improve on CRM_Utils_Request::retrieve

I'm proposing this as an improved (but not perfect) way to retrieve data from 
http requests.

The biggest issue IMHO with the CRM_Utils_Request::retrieve method is that the 
third
parameter is & - and if any of the subsequent parameters need to be passed a 
NULL
array must be generated. The practice of passing a specific static NULL array 
is known to
have caused errors due to contamination. This commit offers an alternate 
function without that
parameter (my suggestion is to create a new function again where we really do 
want  to
work but in general it seems flakey to me). I have also re-ordered the 
parameters as I perceive
 as being more commonly required than  (renamed from 'abort').

I have also made it so the new function will throw an exception rather than use 
the deprecated
fatal - as a new function I feel we can enforce this change and I have made 
some changes
to the error message thrown in the validate function so it returns a list of 
permissable
values for the  string as the existing error is hard for developers to work 
with, as it
can be hard to realise why 'int' is wrong (casing) or what should have been 
passed.

Finally I made the visibility on CRM_Utils_Retrieve::getValues protected. This 
function
is not called from within core & is downright unsafe as it does no validation 
so we should
not permit anyone to accidentally use it (I have no reason to think they have

Change-Id: I5531ed061cf3b7f486aa57d073b425d0874c4df0
---
M CRM/Utils/Request.php
M CRM/Utils/Type.php
2 files changed, 77 insertions(+), 14 deletions(-)

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



diff --git a/CRM/Utils/Request.php b/CRM/Utils/Request.php
index 2748e07..ad6bf09 100644
--- a/CRM/Utils/Request.php
+++ b/CRM/Utils/Request.php
@@ -79,17 +79,15 @@
*   Default value of the variable if not present.
* @param string $method
*   Where to look for the variable - 'GET', 'POST' or 'REQUEST'.
+   * @param bool $isThrowException
+   *   Should a an exception be thrown rather than a fatal.
*
* @return mixed
*   The value of the variable
+   *
+   * @throws \CRM_Core_Exception
*/
-  public static function retrieve($name, $type, &$store = NULL, $abort = 
FALSE, $default = NULL, $method = 'REQUEST') {
-
-// hack to detect stuff not yet converted to new style
-if (!is_string($type)) {
-  CRM_Core_Error::backtrace();
-  CRM_Core_Error::fatal(ts("Please convert retrieve call to use new 
function signature"));
-}
+  public static function retrieve($name, $type, &$store = NULL, $abort = 
FALSE, $default = NULL, $method = 'REQUEST', $isThrowException = FALSE) {
 
 $value = NULL;
 switch ($method) {
@@ -117,6 +115,9 @@
 }
 
 if (!isset($value) && $abort) {
+  if ($isThrowException) {
+throw new CRM_Core_Exception(ts("Could not find valid value for %1", 
array(1 => $name)));
+  }
   CRM_Core_Error::fatal(ts("Could not find valid value for %1", array(1 => 
$name)));
 }
 
@@ -145,7 +146,7 @@
* @return mixed
*The value of the variable
*/
-  public static function getValue($name, $method) {
+  protected static function getValue($name, $method) {
 if (isset($method[$name])) {
   return $method[$name];
 }
@@ -165,6 +166,10 @@
   }
 
   /**
+   * @deprecated
+   *
+   * We should use a function that checks url values.
+   *
* This is a replacement for $_REQUEST which includes $_GET/$_POST
* but excludes $_COOKIE / $_ENV / $_SERVER.
*
@@ -186,4 +191,32 @@
 return $result;
   }
 
+  /**
+   * Retrieve a variable from the http request.
+   *
+   * @param string $name
+   *   Name of the variable to be retrieved.
+   * @param string $type
+   *   Type of the variable (see CRM_Utils_Type for details).
+   *   Most common options are:
+   *   - 'Integer'
+   *   - 'Positive'
+   *   - 'CommaSeparatedIntegers'
+   *   - 'Boolean'
+   *   - 'String'
+   *
+   * @param mixed $defaultValue
+   *   Default value of the variable if not present.
+   * @param bool $isRequired
+   *   Is the variable required for this function to proceed without an 
exception.
+   * @param string $method
+   *   Where to look for the value - GET|POST|REQUEST
+   *
+   * @return mixed
+   */
+  public static function retrieveValue($name, $type, $defaultValue = NULL, 
$isRequired = FALSE, $method = 'REQUEST') {
+$null = NULL;
+return CRM_Utils_Request::retrieve((string) $name, (string) $type, $null, 
(bool) $isRequired, $defaultValue, $method, TRUE);
+  }
+
 }
diff --git a/CRM/Utils/Type.php b/CRM/Utils/Type.php
index fbe1c93..48e575e 100644
--- a/CRM/Utils/Type.php
+++ b/CRM/Utils/Type.php
@@ -369,13 +369,44 @@
*   The 

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Use newer construct function

[jenkins-bot (Code Review)]

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

Change subject: Use newer construct function
..


Use newer construct function

Bug: T184200

Change-Id: I87e8ed39951ca28d66094d40ef45bc6f0513b083
---
M PaymentProviders/Adyen/WSDL/Payment.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/PaymentProviders/Adyen/WSDL/Payment.php 
b/PaymentProviders/Adyen/WSDL/Payment.php
index 8238f88..85dad94 100644
--- a/PaymentProviders/Adyen/WSDL/Payment.php
+++ b/PaymentProviders/Adyen/WSDL/Payment.php
@@ -502,7 +502,7 @@
protected $retries;
protected $uri = 'http://payment.services.adyen.com';
 
-   public function Payment( $wsdl = 
"https://pal-live.adyen.com/pal/Payment.wsdl;, $options = array() ) {
+   public function __construct( $wsdl = 
"https://pal-live.adyen.com/pal/Payment.wsdl;, $options = array() ) {
$this->retries = 
Context::get()->getProviderConfiguration()->val( 'curl/retries' );
foreach ( self::$classmap as $key => $value ) {
if ( !isset( $options['classmap'][$key] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87e8ed39951ca28d66094d40ef45bc6f0513b083
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use UserSaveSettings hook for opt in/out of beta feature

[Sbisson (Code Review)]

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

Change subject: Use UserSaveSettings hook for opt in/out of beta feature
..

Use UserSaveSettings hook for opt in/out of beta feature

Flow conversion of user talk used to be done
in UserSaveOptions. This hook is not called
when the user resets all options but UserSaveSettings
is. So using that instead.

Bug: 182358
Change-Id: I9787335523fcb4bd9fa11f1554842d4489bf305e
---
M Hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Import/OptInController.php
5 files changed, 6 insertions(+), 9 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 4c13761..e6bc38f 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1741,21 +1741,16 @@
 
/**
 * @param User $user
-* @param array &$options
 * @return bool
 */
-   public static function onUserSaveOptions( $user, &$options ) {
+   public static function onUserSaveSettings( $user ) {
if ( !self::isBetaFeatureAvailable() ) {
-   return true;
-   }
-
-   if ( !array_key_exists( BETA_FEATURE_FLOW_USER_TALK_PAGE, 
$options ) ) {
return true;
}
 
$userClone = User::newFromId( $user->getId() );
$before = BetaFeatures::isFeatureEnabled( $userClone, 
BETA_FEATURE_FLOW_USER_TALK_PAGE );
-   $after = $options[BETA_FEATURE_FLOW_USER_TALK_PAGE];
+   $after = $user->getBoolOption( BETA_FEATURE_FLOW_USER_TALK_PAGE 
);
$action = null;
 
if ( !$before && $after ) {
diff --git a/extension.json b/extension.json
index 2c99f0e..ce0ab2d 100644
--- a/extension.json
+++ b/extension.json
@@ -737,7 +737,7 @@
"BeforeCreateEchoEvent": 
"Flow\\NotificationController::onBeforeCreateEchoEvent",
"EchoGetBundleRules": 
"Flow\\NotificationController::onEchoGetBundleRules",
"GetBetaFeaturePreferences": 
"FlowHooks::onGetBetaFeaturePreferences",
-   "UserSaveOptions": "FlowHooks::onUserSaveOptions",
+   "UserSaveSettings": "FlowHooks::onUserSaveSettings",
"NukeGetNewPages": "FlowHooks::onNukeGetNewPages",
"NukeDeletePage": "FlowHooks::onNukeDeletePage"
},
diff --git a/i18n/en.json b/i18n/en.json
index 3cbdb70..7726172 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -552,6 +552,7 @@
"flow-notification-enabled-on-talkpage-email-batch-body": "Structured 
Discussions, the new wiki discussion system, has been enabled on 
{{GENDER:$1|your}} user talk page on {{SITENAME}}. You can get more 
information, provide feedback or disable the new system any time from the Beta 
features section in {{GENDER:$1|your}} preferences.",
"flow-beta-feature-add-archive-template-edit-summary": "Adding archive 
template",
"flow-beta-feature-remove-archive-template-edit-summary": "Removing 
archive template",
+   "flow-beta-feature-add-current-template-edit-summary": "Adding current 
template",
"flow-dialog-cancelconfirm-title": "Are {{GENDER:|you}} sure?",
"flow-dialog-cancelconfirm-message": "Are {{GENDER:|you}} sure you want 
to cancel without saving first?",
"flow-dialog-cancelconfirm-keep": "Continue editing",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3becb1d..e9359db 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -566,6 +566,7 @@
"flow-notification-enabled-on-talkpage-email-batch-body": "Email body 
for notification when Structured Discussions was enabled on your talk page.\n 
Parameters:\n* $1 - the username. Can be used for GENDER.\n* $2 - Title where 
Structured Discussions was enabled.",
"flow-beta-feature-add-archive-template-edit-summary": "Edit summary 
message for the revision adding the archive template to an archived talk page.",
"flow-beta-feature-remove-archive-template-edit-summary": "Edit summary 
message for the revision removing the archive template to an archived talk 
page.",
+   "flow-beta-feature-add-current-template-edit-summary": "Edit summary 
message for the revision adding the template that indicates the page is current 
(not archived).",
"flow-dialog-cancelconfirm-title": "Title of the dialog that appears 
when the user cancels an edit and verifies whether the user wants to discard 
their edits or continue editing.\n{{Identical|Are you sure?}}",
"flow-dialog-cancelconfirm-message": "Title of the dialog that appears 
when the user cancels an edit, asking the user if they are sure they wants to 
discard their edits or continue editing.",
"flow-dialog-cancelconfirm-keep": "Title for the keep option in the 
dialog that appears when the user cancels an edit.",
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Improvements to existing feature management system

[jenkins-bot (Code Review)]

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

Change subject: Improvements to existing feature management system
..


Improvements to existing feature management system

Changes:
 - added $group for features grouping and easier translations
 - added FeatureManager::getFeature()
 - added validation for feature id uniqueness

Bug: T182362
Change-Id: Ib2a2695adb3543ded186528308e296870f4c6b2e
---
M includes/ServiceWiring.php
M includes/features/Feature.php
M includes/features/FeaturesManager.php
M includes/features/IFeature.php
4 files changed, 40 insertions(+), 6 deletions(-)

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



diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index ee9abfb..700f804 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -18,9 +18,9 @@
// maybe we can get all available features by looping through 
MobileFrontend.Feature.*
// and register it here, it would be nice to have something like
// $services->getAllByPrefix('MobileFrontend.Feature')
-   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions',
+   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions', 'mobile-frontend',
$config->get( 'MFEnableWikidataDescriptions' ) ) );
-   $manager->registerFeature( new Feature( 'MFLazyLoadReferences',
+   $manager->registerFeature( new Feature( 'MFLazyLoadReferences', 
'mobile-frontend',
$config->get( 'MFLazyLoadReferences' ) ) );
 
return $manager;
diff --git a/includes/features/Feature.php b/includes/features/Feature.php
index 9627d41..b29cd13 100644
--- a/includes/features/Feature.php
+++ b/includes/features/Feature.php
@@ -13,6 +13,11 @@
 */
private $name;
/**
+* Feature group (mobile-frontend, minerva, ...)
+* @var string
+*/
+   private $group;
+   /**
 * @var array
 */
private $options;
@@ -20,10 +25,12 @@
/**
 * Feature constructor.
 * @param string $name feature name (used as an ID)
+* @param string $group feature group (used as a translation prefix)
 * @param array $options Feature options
 */
-   public function __construct( $name, $options ) {
+   public function __construct( $name, $group = 'mobile-frontend', 
$options = [] ) {
$this->name = $name;
+   $this->group = $group;
$this->options = $options;
}
 
@@ -45,15 +52,21 @@
/**
 * @inheritDoc
 */
+   public function getGroup() {
+   return $this->group;
+   }
+   /**
+* @inheritDoc
+*/
public function getNameKey() {
-   return 'mobile-frontend-mobile-option-' . $this->name;
+   return $this->group . '-mobile-option-' . $this->name;
}
 
/**
 * @inheritDoc
 */
public function getDescriptionKey() {
-   return 'mobile-frontend-mobile-option-' . $this->name . 
'-description';
+   return $this->group . '-mobile-option-' . $this->name . 
'-description';
}
 
 }
diff --git a/includes/features/FeaturesManager.php 
b/includes/features/FeaturesManager.php
index 85ee423..2edecff 100644
--- a/includes/features/FeaturesManager.php
+++ b/includes/features/FeaturesManager.php
@@ -15,7 +15,10 @@
 * @param IFeature $feature Feature to register
 */
public function registerFeature( IFeature $feature ) {
-   $this->features[] = $feature;
+   if ( array_key_exists( $feature->getId(), $this->features ) ) {
+   throw new \RuntimeException( 'Feature ' . 
$feature->getId() . ' is already defined.' );
+   }
+   $this->features[ $feature->getId() ] = $feature;
}
 
/**
@@ -28,4 +31,16 @@
} );
}
 
+   /**
+* Get feature
+* @param string $id Feature id
+* @return IFeature
+*/
+   public function getFeature( $id ) {
+   if ( !array_key_exists( $id, $this->features ) ) {
+   throw new \RuntimeException( 'Feature ' . $id . ' is 
not defined.' );
+   }
+   return $this->features[ $id ];
+   }
+
 }
diff --git a/includes/features/IFeature.php b/includes/features/IFeature.php
index 325a219..6122541 100644
--- a/includes/features/IFeature.php
+++ b/includes/features/IFeature.php
@@ -12,6 +12,12 @@
public function getId();
 
/**
+* Get the feature group
+* @return string
+*/
+   public function getGroup();
+
+   /**
 * Check feature availability in 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: Merge remote-tracking branch 'origin/master' into HEAD

[jenkins-bot (Code Review)]

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

Change subject: Merge remote-tracking branch 'origin/master' into HEAD
..


Merge remote-tracking branch 'origin/master' into HEAD

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1a520d983be096e29cfe725f619be0423f9d110
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
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...MinervaNeue[specialpages]: Merge remote-tracking branch 'origin/master' into HEAD

[Jdlrobson (Code Review)]

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

Change subject: Merge remote-tracking branch 'origin/master' into HEAD
..

Merge remote-tracking branch 'origin/master' into HEAD

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/81/403081/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1a520d983be096e29cfe725f619be0423f9d110
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up Ia2110f71: doc: Correct deprecation version, v0.25...

[jenkins-bot (Code Review)]

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

Change subject: Follow-up Ia2110f71: doc: Correct deprecation version, v0.25.0 
is master
..


Follow-up Ia2110f71: doc: Correct deprecation version, v0.25.0 is master

Change-Id: I2dfa03802740886847a000931fccf11127bc37ad
---
M src/mixins/GroupElement.js
M src/widgets/MultiselectWidget.js
M src/widgets/SelectWidget.js
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/src/mixins/GroupElement.js b/src/mixins/GroupElement.js
index a807c38..43ddf17 100644
--- a/src/mixins/GroupElement.js
+++ b/src/mixins/GroupElement.js
@@ -87,7 +87,7 @@
 /**
  * Get an item by its data.
  *
- * @deprecated 0.25.1 Use {@link #findItemFromData} instead.
+ * @deprecated Since v0.25.0; use {@link #findItemFromData} instead.
  * @param {Object} data Item data to search for
  * @return {OO.ui.Element|null} Item with equivalent data, `null` if none 
exists
  */
@@ -122,7 +122,7 @@
 /**
  * Find items by their data.
  *
- * @deprecated 0.25.1 Use {@link #findItemsFromData} instead.
+ * @deprecated Since v0.25.0; use {@link #findItemsFromData} instead.
  * @param {Object} data Item data to search for
  * @return {OO.ui.Element[]} Items with equivalent data
  */
diff --git a/src/widgets/MultiselectWidget.js b/src/widgets/MultiselectWidget.js
index 77cb532..f985b7a 100644
--- a/src/widgets/MultiselectWidget.js
+++ b/src/widgets/MultiselectWidget.js
@@ -74,7 +74,7 @@
 /**
  * Get options that are selected.
  *
- * @deprecated 0.25.1 Use {@link #findSelectedItems} instead.
+ * @deprecated Since v0.25.0; use {@link #findSelectedItems} instead.
  * @return {OO.ui.MultioptionWidget[]} Selected options
  */
 OO.ui.MultiselectWidget.prototype.getSelectedItems = function () {
@@ -96,7 +96,7 @@
 /**
  * Get the data of options that are selected.
  *
- * @deprecated 0.25.1 Use {@link #findSelectedItemsData} instead.
+ * @deprecated Since v0.25.0; use {@link #findSelectedItemsData} instead.
  * @return {Object[]|string[]} Values of selected options
  */
 OO.ui.MultiselectWidget.prototype.getSelectedItemsData = function () {
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 3ce91d3..1f9621d 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -541,7 +541,7 @@
 /**
  * Get selected item.
  *
- * @deprecated 0.25.1 Use {@link #findSelectedItem} instead.
+ * @deprecated Since v0.25.0; use {@link #findSelectedItem} instead.
  * @return {OO.ui.OptionWidget|null} Selected item, `null` if no item is 
selected
  */
 OO.ui.SelectWidget.prototype.getSelectedItem = function () {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Emit deprecation warnings when old modules are used

[jenkins-bot (Code Review)]

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

Change subject: Emit deprecation warnings when old modules are used
..


Emit deprecation warnings when old modules are used

Bug: T184194
Depends-On: If22fccbb43c5b05db2a666d61ae8864ee9815e7d
Change-Id: If5649ab48ebbf47e9981ec010bb1e5ce668c5487
---
M extension.json
1 file changed, 20 insertions(+), 10 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7937823..97d6102 100644
--- a/extension.json
+++ b/extension.json
@@ -287,34 +287,44 @@
"styles": "ext.wikiEditor.toolbar.styles.less"
},
"ext.wikiEditor.toolbar": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"ext.wikiEditor.dialogs": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"ext.wikiEditor.core": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor.core": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor.dialogs": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor.dialogs.config": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor.toolbar": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor.toolbar.config": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
},
"jquery.wikiEditor.toolbar.i18n": {
-   "dependencies": [ "ext.wikiEditor" ]
+   "dependencies": "ext.wikiEditor",
+   "deprecated": "Please use 'ext.wikiEditor' instead."
}
},
"ResourceFileModulePaths": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5649ab48ebbf47e9981ec010bb1e5ce668c5487
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 8a7fb8577: For deprecated RL modules, allow strings

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 8a7fb8577: For deprecated RL modules, allow strings
..


Follow-up 8a7fb8577: For deprecated RL modules, allow strings

So that more than just PHP code and MediaWiki core can use it, but
also JSON-based static extension registrations. :-)

Change-Id: If22fccbb43c5b05db2a666d61ae8864ee9815e7d
---
M docs/extension.schema.v1.json
M docs/extension.schema.v2.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index ddf82e8..0763e7d 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -210,8 +210,8 @@

"description": "Group which this module should be loaded together with"
},
"deprecated": {
-   "type": 
["object", "boolean"],
-   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean or an object with key message can be used to customise 
deprecation message."
+   "type": 
["object", "string", "boolean"],
+   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean, or a string or an object with key message can be used to 
customise deprecation message."
},
"position": {
"type": 
"string",
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index 0bdf97d..51f9417 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -211,8 +211,8 @@

"description": "Group with which this module should be loaded"
},
"deprecated": {
-   "type": 
["object", "boolean"],
-   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean or an object with key message can be used to customise 
deprecation message."
+   "type": 
["object", "string", "boolean"],
+   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean, or a string or an object with key message can be used to 
customise deprecation message."
},
"position": {
"type": 
"string",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If22fccbb43c5b05db2a666d61ae8864ee9815e7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Re-save any contacts without a display name.

[Eileen (Code Review)]

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

Change subject: Re-save any contacts without a display name.
..

Re-save any contacts without a display name.

Doing a blank re-save will cause the display name to be recalculated by Civi
 * rules.
 *
 * Not useful here but possibly for Major Gifts letter addressing it also
 * will allow us to update addressing fields (e.g Dear Fred) for sending 
letters.
 * We don't do that for all contacts but could for MG.
 *
 * Bug: T179118

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/80/403080/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 4340077..3b30ed8 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -3289,3 +3289,25 @@
   require_once 'update_payment_instruments.php';
   wmf_install_add_missing_payment_instruments();
 }
+
+/**
+ * Re-save any contacts without a display name.
+ *
+ * Doing a blank re-save will cause the display name to be recalculated by Civi
+ * rules.
+ *
+ * Not useful here but possibly for Major Gifts letter addressing it also
+ * will allow us to update addressing fields (e.g Dear Fred) for sending 
letters.
+ * We don't do that for all contacts but could for MG.
+ *
+ * Bug: T179118
+ */
+function wmf_civicrm_update_7600() {
+  civicrm_initialize();
+  $result = CRM_Core_DAO::executeQuery(
+"SELECT id FROM civicrm_contact WHERE (display_name is null  OR 
display_name = '') AND is_deleted= 0"
+  );
+  while ($result->fetch()) {
+civicrm_api3('Contact', 'create', array('id' => $result->id));
+  }
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 8a7fb8577: For deprecated RL modules, allow strings

[Jforrester (Code Review)]

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

Change subject: Follow-up 8a7fb8577: For deprecated RL modules, allow strings
..

Follow-up 8a7fb8577: For deprecated RL modules, allow strings

So that more than just PHP code and MediaWiki core can use it, but
also JSON-based static extension registrations. :-)

Change-Id: If22fccbb43c5b05db2a666d61ae8864ee9815e7d
---
M docs/extension.schema.v1.json
M docs/extension.schema.v2.json
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/403079/1

diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index ddf82e8..0763e7d 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -210,8 +210,8 @@

"description": "Group which this module should be loaded together with"
},
"deprecated": {
-   "type": 
["object", "boolean"],
-   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean or an object with key message can be used to customise 
deprecation message."
+   "type": 
["object", "string", "boolean"],
+   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean, or a string or an object with key message can be used to 
customise deprecation message."
},
"position": {
"type": 
"string",
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index 0bdf97d..51f9417 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -211,8 +211,8 @@

"description": "Group with which this module should be loaded"
},
"deprecated": {
-   "type": 
["object", "boolean"],
-   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean or an object with key message can be used to customise 
deprecation message."
+   "type": 
["object", "string", "boolean"],
+   
"description": "Whether the module is deprecated and usage is discouraged. 
Either a boolean, or a string or an object with key message can be used to 
customise deprecation message."
},
"position": {
"type": 
"string",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: MobileFrontendFeaturesRegistration hook should be called ear...

[Jdlrobson (Code Review)]

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

Change subject: MobileFrontendFeaturesRegistration hook should be called 
earlier in stack
..

MobileFrontendFeaturesRegistration hook should be called earlier in stack

Bug: T182362
Change-Id: I03839d840d02ed84a850baef1d8625ecdbe6970d
---
M includes/MobileFrontend.hooks.php
1 file changed, 10 insertions(+), 7 deletions(-)


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

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 6fbb210..a2767c3 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -80,6 +80,15 @@
return true;
}
 
+   // TODO, do we want to have a specific hook just for Mobile 
Features initialization
+   // or do we want to reuse the RequestContextCreateSkinMobile 
and use MediawikiService
+   // to retrieve the FeaturesManager
+   // Important: This must be run before 
RequestContextCreateSkinMobile which may make modifications
+   // to the skin based on enabled features.
+   $featureManager = \MediaWiki\MediaWikiServices::getInstance()
+   ->getService( 'MobileFrontend.FeaturesManager' );
+   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$featureManager ] );
+
// enable wgUseMediaWikiUIEverywhere
self::enableMediaWikiUI();
 
@@ -119,15 +128,9 @@
return false;
}
}
+
$skin = self::getDefaultMobileSkin( $context, $mobileContext );
Hooks::run( 'RequestContextCreateSkinMobile', [ $mobileContext, 
$skin ] );
-
-   // TODO, do we want to have a specific hook just for Mobile 
Features initialization
-   // or do we want to reuse the RequestContextCreateSkinMobile 
and use MediawikiService
-   // to retrieve the FeaturesManager
-   $featureManager = \MediaWiki\MediaWikiServices::getInstance()
-   ->getService( 'MobileFrontend.FeaturesManager' );
-   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$featureManager ] );
 
return false;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Regression fix for TMH + Score integration

[jenkins-bot (Code Review)]

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

Change subject: Regression fix for TMH + Score integration
..


Regression fix for TMH + Score integration

If there wasn't another TMH invocation on the page, the audio player
generated by a ... would not invoke the TMH
frontend, resulting in inconsistent appearance and failure to run
the Ogg output on Safari/IE/Edge.

This was due to changes in the frontend code for TMH a while back;
added a workaround to invoke the TMH-side code that sets it up, but
not sure this is nice. :D

Still want a better interface between these two for the future.

Bug: T148716
Change-Id: I0b86d37ac268a45dd3417fc7cbb49f3f7d3adbee
---
M includes/Score.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/includes/Score.php b/includes/Score.php
index b7a2583..d9b2ac8 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -511,6 +511,14 @@
'width' => self::DEFAULT_PLAYER_WIDTH
] );
$link .= $player->toHtml();
+
+   // This is a hack for T148716 to load the TMH 
frontend
+   // which we're sort of side-using here. In the 
future,
+   // we should use a clean standard interface for 
this.
+   $tmh = new TimedMediaHandler();
+   if ( method_exists( $tmh, 'parserTransformHook' 
) ) {
+   $tmh->parserTransformHook( $parser, 
null );
+   }
}
if ( $options['override_audio'] !== false ) {
$link .= $parser->recursiveTagParse( 
"[[File:{$options['audio_name']}]]" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b86d37ac268a45dd3417fc7cbb49f3f7d3adbee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove ffmpeg2theora dependency from TimedMediaHandler

[jenkins-bot (Code Review)]

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

Change subject: Remove ffmpeg2theora dependency from TimedMediaHandler
..


Remove ffmpeg2theora dependency from TimedMediaHandler

No longer used in standard install, Ogg Theora output is being
deprecated. If need it for testing, install ffmpeg2theora manually
inside the VM from package or source.

Bug: T181591
Change-Id: I0bcd4d7b8fbf055da678add65da7682b145f65af
---
M puppet/modules/role/manifests/timedmediahandler.pp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/puppet/modules/role/manifests/timedmediahandler.pp 
b/puppet/modules/role/manifests/timedmediahandler.pp
index 143b5f3..5657bd1 100644
--- a/puppet/modules/role/manifests/timedmediahandler.pp
+++ b/puppet/modules/role/manifests/timedmediahandler.pp
@@ -4,7 +4,6 @@
 class role::timedmediahandler {
 include ::role::multimedia
 
-require_package('ffmpeg2theora')
 require_package('ffmpeg')
 
 mediawiki::extension { 'MwEmbedSupport': }
@@ -17,7 +16,7 @@
 needs_update => true,
 composer => true,
 require  => [
-Package['ffmpeg', 'ffmpeg2theora'],
+Package['ffmpeg'],
 Mediawiki::Extension['MwEmbedSupport']
 ],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bcd4d7b8fbf055da678add65da7682b145f65af
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Enable cpu workers on the beta cluster

[jenkins-bot (Code Review)]

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

Change subject: Enable cpu workers on the beta cluster
..


Enable cpu workers on the beta cluster

Change-Id: Ifefe6560c7c4d44d786cfff3ba49e823625addd5
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 33a5a26..ba583db 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,2 +1,4 @@
 localsettings: conf/wmf/betalabs.localsettings.js
 load_wmf: false
+num_workers: 1
+use_worker: true
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 9e61161..e93ba32 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -1,7 +1,7 @@
 # Number of worker processes to spawn.
 # Set to 0 to run everything in a single process without clustering.
 # Use 'ncpu' to run as many workers as there are CPU units
-num_workers: ncpu
+num_workers: <%= num_workers %>
 
 # Log error messages and gracefully restart a worker if v8 reports that it
 # uses more heap (note: not RSS) than this many mb.
@@ -51,6 +51,8 @@
   linter:
 sendAPI: <%= linter_send_api %>
 
+  useWorker: <%= use_worker %>
+
   mwApiServer: <%= mwapi_server if mwapi_server else '' %>
   defaultAPIProxyURI: <%= mwapi_proxy if mwapi_proxy else '' %>
 
diff --git a/scap/vars.yaml b/scap/vars.yaml
index a152df6..6fbf827 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -16,4 +16,5 @@
 linter_send_api: true
 mwapi_server:
 mwapi_proxy:
-
+num_workers: ncpu
+use_worker: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifefe6560c7c4d44d786cfff3ba49e823625addd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Give some time for async loggers to deliver fatal messages

[jenkins-bot (Code Review)]

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

Change subject: Give some time for async loggers to deliver fatal messages
..


Give some time for async loggers to deliver fatal messages

Fatals in logstash are only reporting "fatal/request" where the process
isn't exited, however these logs are showing up in the file based
logging.

Change-Id: Ib9b271007213a79c2444a40debe2945d6e1435ac
---
M lib/logger/Logger.js
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/lib/logger/Logger.js b/lib/logger/Logger.js
index 8b8b6d6..0171663 100644
--- a/lib/logger/Logger.js
+++ b/lib/logger/Logger.js
@@ -286,7 +286,8 @@
// events in the queue and logs them.
async.parallel(applicableBackends, function() {
if (/^fatal$/.test(logData.logType)) {
-   process.exit(1);
+   // Give some time for async loggers to deliver the 
message
+   setTimeout(function() { process.exit(1); }, 100);
}
cb();
});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9b271007213a79c2444a40debe2945d6e1435ac
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
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...RemexHtml[master]: Turn PropGuard into a trait

[jenkins-bot (Code Review)]

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

Change subject: Turn PropGuard into a trait
..


Turn PropGuard into a trait

This makes it easier to use, as you don't need to copy the __set function
into every class to take advantage of it.

Change-Id: I8ab0f99d0149f3a04ada6564c3e871775590d722
---
M RemexHtml/PropGuard.php
M RemexHtml/Serializer/Serializer.php
M RemexHtml/Serializer/SerializerNode.php
M RemexHtml/Tokenizer/Attribute.php
M RemexHtml/Tokenizer/Tokenizer.php
M RemexHtml/TreeBuilder/Element.php
M RemexHtml/TreeBuilder/InsertionMode.php
M RemexHtml/TreeBuilder/Marker.php
M RemexHtml/TreeBuilder/TreeBuilder.php
9 files changed, 20 insertions(+), 36 deletions(-)

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



diff --git a/RemexHtml/PropGuard.php b/RemexHtml/PropGuard.php
index 00c3c4d..111c09a 100644
--- a/RemexHtml/PropGuard.php
+++ b/RemexHtml/PropGuard.php
@@ -7,15 +7,15 @@
  * undeclared properties on objects. The point of it is to detect programmer
  * errors.
  */
-class PropGuard {
+trait PropGuard {
public static $armed = true;
 
-   public static function set( $obj, $name, $value ) {
+   public function __set( $name, $value ) {
if ( self::$armed ) {
-   throw new \Exception( "Property \"$name\" on object of 
class " . get_class( $obj ) .
+   throw new \Exception( "Property \"$name\" on object of 
class " . get_class( $this ) .
" is undeclared" );
} else {
-   $obj->$name = $value;
+   $this->$name = $value;
}
}
 }
diff --git a/RemexHtml/Serializer/Serializer.php 
b/RemexHtml/Serializer/Serializer.php
index 786c969..b46a18e 100644
--- a/RemexHtml/Serializer/Serializer.php
+++ b/RemexHtml/Serializer/Serializer.php
@@ -14,6 +14,8 @@
  * a DOM and then serializing it, even if you use DOMDocument::saveHTML().
  */
 class Serializer implements AbstractSerializer {
+   use PropGuard;
+
/**
 * A node corresponding to the Document
 * @var SerializerNode
@@ -67,10 +69,6 @@
public function __construct( Formatter $formatter, $errorCallback = 
null ) {
$this->formatter = $formatter;
$this->errorCallback = $errorCallback;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 
/**
diff --git a/RemexHtml/Serializer/SerializerNode.php 
b/RemexHtml/Serializer/SerializerNode.php
index 2944732..6739b27 100644
--- a/RemexHtml/Serializer/SerializerNode.php
+++ b/RemexHtml/Serializer/SerializerNode.php
@@ -4,6 +4,8 @@
 use RemexHtml\PropGuard;
 
 class SerializerNode {
+   use PropGuard;
+
public $id;
public $parentId;
public $namespace;
@@ -24,9 +26,5 @@
$this->name = $name;
$this->attrs = $attrs;
$this->void = $void;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 }
diff --git a/RemexHtml/Tokenizer/Attribute.php 
b/RemexHtml/Tokenizer/Attribute.php
index 293b075..9346783 100644
--- a/RemexHtml/Tokenizer/Attribute.php
+++ b/RemexHtml/Tokenizer/Attribute.php
@@ -7,6 +7,8 @@
  * A namespaced attribute, as returned by Attributes::getObjects()
  */
 class Attribute {
+   use PropGuard;
+
public $qualifiedName;
public $namespaceURI;
public $prefix;
@@ -19,9 +21,5 @@
$this->prefix = $prefix;
$this->localName = $localName;
$this->value = $value;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 }
diff --git a/RemexHtml/Tokenizer/Tokenizer.php 
b/RemexHtml/Tokenizer/Tokenizer.php
index 3567dab..b998f8b 100644
--- a/RemexHtml/Tokenizer/Tokenizer.php
+++ b/RemexHtml/Tokenizer/Tokenizer.php
@@ -11,6 +11,8 @@
  * https://www.w3.org/TR/2016/REC-html51-20161101/
  */
 class Tokenizer {
+   use PropGuard;
+
// States
const STATE_START = 1;
const STATE_DATA = 2;
@@ -111,10 +113,6 @@
$this->ignoreCharRefs = !empty( $options['ignoreCharRefs'] );
$this->ignoreNulls = !empty( $options['ignoreNulls'] );
$this->skipPreprocess = !empty( $options['skipPreprocess'] );
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 
public function setEnableCdataCallback( $cb ) {
diff --git a/RemexHtml/TreeBuilder/Element.php 
b/RemexHtml/TreeBuilder/Element.php
index 18e2166..59029eb 100644
--- a/RemexHtml/TreeBuilder/Element.php
+++ b/RemexHtml/TreeBuilder/Element.php
@@ -14,6 +14,8 @@
  * downstream 

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Add tests for PropGuard

[jenkins-bot (Code Review)]

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

Change subject: Add tests for PropGuard
..


Add tests for PropGuard

Change-Id: Id7f711cc31ba4b4a455beb4e307b11995967ee0e
---
A tests/phpunit/PropGuardTest.php
1 file changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/PropGuardTest.php b/tests/phpunit/PropGuardTest.php
new file mode 100644
index 000..a15e99d
--- /dev/null
+++ b/tests/phpunit/PropGuardTest.php
@@ -0,0 +1,32 @@
+real = true;
+   // Will throw
+   $this->setExpectedException( Exception::class );
+   $mock->fake = true;
+   }
+
+   public function testDisarmed() {
+   MockPropGuard::$armed = false;
+   $mock = new MockPropGuard();
+   $mock->fake = true;
+   $this->assertTrue( $mock->fake );
+   }
+
+}
+
+class MockPropGuard {
+   use PropGuard;
+
+   public $real;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7f711cc31ba4b4a455beb4e307b11995967ee0e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Document PHP version requirement in composer.json

[jenkins-bot (Code Review)]

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

Change subject: Document PHP version requirement in composer.json
..


Document PHP version requirement in composer.json

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

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



diff --git a/composer.json b/composer.json
index 3812cea..c8ae29a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
}
],
"require": {
+   "php": ">=5.5.9",
"ext-mbstring": "*",
"wikimedia/utfnormal": "1.1.0"
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fad61a3ef33fd4a0a66371f7967b9c395b13b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Save -> Publish on remaining Wikinewses which haven't updated

[Jforrester (Code Review)]

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

Change subject: Save -> Publish on remaining Wikinewses which haven't updated
..

Save -> Publish on remaining Wikinewses which haven't updated

Originally meant to have been done in August 2016 following 22ba4cced3;
if one of these Wikinewses wants to be like the English/Spanish/etc.
ones, we can switch them back later once they've updated their local
copyright warnings.

Change-Id: I8a022c264d1e8c8ed7de775510ee458b58f9877b
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3750523..e439573 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15442,7 +15442,10 @@
 'wgEditSubmitButtonLabelPublish' => [
'default' => true,  // T131132 from 2017-03-15
'private' => false, // Private wikis are not public
-   'wikinews' => false,// Done via local {{int:Copyrightwarning}}s 
instead.
+   'enwikinews' => false,  // Done via local {{int:Copyrightwarning}}s 
instead.
+   'eswikinews' => false,  // Done via local {{int:Copyrightwarning}}s 
instead.
+   'frwikinews' => false,  // Done via local {{int:Copyrightwarning}}s 
instead.
+   'ptwikinews' => false,  // Done via local {{int:Copyrightwarning}}s 
instead.
 ],
 
 'wmgCheckUserForceSummary' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: List all the features in beta (UI)

[jenkins-bot (Code Review)]

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

Change subject: List all the features in beta (UI)
..


List all the features in beta (UI)

This takes care of the UI portion of listing all features
in beta.

Bug: T182362
Change-Id: If0855122e388e2f6742b19bffaf078e90b18809e
---
M README.md
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialMobileOptions.php
M resources/mobile.special.mobileoptions.styles/mobileoptions.less
6 files changed, 108 insertions(+), 22 deletions(-)

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



diff --git a/README.md b/README.md
index 6c3625c..49ff6fd 100644
--- a/README.md
+++ b/README.md
@@ -494,6 +494,13 @@
 * Type: `Boolean`
 * Default: `false`
 
+ MFBetaFeedbackLink
+
+Link to feedback page for beta features. If false no feedback link will be 
shown.
+
+* Type: `String|false`
+* Default: `false`
+
  $wgMFDefaultSkinClass
 
 The default skin for MobileFrontend.
diff --git a/extension.json b/extension.json
index f4935db..49f112d 100644
--- a/extension.json
+++ b/extension.json
@@ -1301,6 +1301,7 @@
"MFStopRedirectCookieHost": null,
"MobileFrontendLogo": false,
"MFEnableBeta": false,
+   "MFBetaFeedbackLink": false,
"MFDefaultSkinClass": "SkinMinerva",
"MFNamespacesWithoutCollapsibleSections": [
6,
diff --git a/i18n/en.json b/i18n/en.json
index d946136..9217300 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -178,7 +178,7 @@
"mobile-frontend-nearby-requirements-guidance": "Try a different 
browser or enable JavaScript if you've disabled it.",
"mobile-frontend-nearby-title": "Nearby",
"mobile-frontend-news-items": "In the news",
-   "mobile-frontend-opt-in-explain": "Join {{SITENAME}} Beta to get access 
to the latest experimental features!",
+   "mobile-frontend-opt-in-explain": "{{SITENAME}} βeta is a way for you 
to try these experimental features and provide us with valuable feedback",
"mobile-frontend-overlay-close": "Close",
"mobile-frontend-overlay-continue": "Continue",
"mobile-frontend-page-edit-summary": "Edit 
summary $1",
@@ -199,7 +199,7 @@
"mobile-frontend-search-content-no-results": 
"'''{{int:mobile-frontend-search-content}}''' to see if this phrase appears 
anywhere.",
"mobile-frontend-search-no-results": "No page with this title.",
"mobile-frontend-settings-tagline": "Reading preferences",
-   "mobile-frontend-settings-beta": "Beta",
+   "mobile-frontend-settings-beta": "{{SITENAME}} βeta",
"mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
"mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
"mobile-frontend-settings-save": "Settings were saved successfully.",
@@ -297,5 +297,10 @@
"mobile-frontend-panel-betaoptin-msg": "Do you want to try some new 
features? By joining the beta, you will get access to experimental features, at 
the risk of encountering bugs and issues.",
"mobile-frontend-search-feedback-link-text": "Give us your feedback.",
"mobile-frontend-search-feedback-prompt": "Couldn't find what you were 
looking for?",
-   "mobile-frontend-notifications-filter-title": "Filter notifications"
-}
\ No newline at end of file
+   "mobile-frontend-notifications-filter-title": "Filter notifications",
+   "mobile-frontend-mobile-option-MFLazyLoadReferences": "Lazy load 
references",
+   "mobile-frontend-mobile-option-MFEnableWikidataDescriptions": "Title 
descriptions",
+   
"mobile-frontend-mobile-option-MFEnableWikidataDescriptions-description": 
"Learn about the subject of the article with a short description below the 
title",
+   "mobile-frontend-mobile-option-MFLazyLoadReferences-description": "Load 
article references only when needed",
+   "mobile-frontend-send-feedback": "Send feedback"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ab92dfc..91f2348 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -298,5 +298,10 @@
"mobile-frontend-panel-betaoptin-msg": "Message in panel asking if user 
wants to opt in to beta.",
"mobile-frontend-search-feedback-link-text": "Text of anchor linking to 
a form for the user to give feedback on search results.",
"mobile-frontend-search-feedback-prompt": "Text shown in front of an 
anchor linking to a form for the user to give feedback on search results.",
-   "mobile-frontend-notifications-filter-title": "Title shown in the 
notifications filter page on click of the Filter button"
+   "mobile-frontend-notifications-filter-title": "Title shown in the 
notifications filter page on click of the Filter button",
+   

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: puppet: pin to version 3.*

[BryanDavis (Code Review)]

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

Change subject: puppet: pin to version 3.*
..

puppet: pin to version 3.*

Prevent `apt-get update && apt-get upgrade` from picking Puppet4 as the
version to install by pinning to Puppet 3.x with apt.

Bug: T184038
Change-Id: I309b193596735d409978132e6784f4ad703151d3
---
M puppet/modules/puppet/manifests/agent.pp
M support/puppet-bootstrap.sh
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/403076/1

diff --git a/puppet/modules/puppet/manifests/agent.pp 
b/puppet/modules/puppet/manifests/agent.pp
index 82f6bab..a9c1cd1 100644
--- a/puppet/modules/puppet/manifests/agent.pp
+++ b/puppet/modules/puppet/manifests/agent.pp
@@ -18,4 +18,11 @@
 ensure => $ensure,
 enable => $enable,
 }
+
+# T184038: pin puppet to 3.x to prevent accidentally getting Puppet4
+apt::pin { 'puppet':
+package  => 'puppet',
+pin  => 'version 3.*',
+priority => 1001,
+}
 }
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
index cf64fff..26138b0 100755
--- a/support/puppet-bootstrap.sh
+++ b/support/puppet-bootstrap.sh
@@ -17,4 +17,4 @@
 -y \
 -o Dpkg::Options::="--force-confdef" \
 -o Dpkg::Options::="--force-confold" \
-install puppet >/dev/null 2>&1
+install puppet=3.\* >/dev/null 2>&1

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Improve alignment of multiline labels with 'hel...

[jenkins-bot (Code Review)]

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

Change subject: FieldLayout: Improve alignment of multiline labels with 'help' 
button
..


FieldLayout: Improve alignment of multiline labels with 'help' button

The 'help' button is floated, so moving it before the label in the DOM
allows it to align with the top of the label, rather than the bottom.
This only makes a difference when the label has multiple lines of text.

Bug: T181430
Change-Id: Ic6044760e4a4a8ae41e491855f81061f46b74a0c
---
M demos/pages/widgets.js
M php/layouts/FieldLayout.php
M src/layouts/FieldLayout.js
M src/themes/wikimediaui/layouts.less
4 files changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 713f536..8fa7587 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -2562,6 +2562,7 @@
new OO.ui.TextInputWidget(),
{
label: 'FieldLayout aligned top 
with very long label. ' + loremIpsum,
+   help: loremIpsum,
align: 'top'
}
),
@@ -2569,6 +2570,7 @@
new OO.ui.CheckboxInputWidget( { 
selected: true } ),
{
label: 'FieldLayout aligned 
inline with very long label. ' + loremIpsum,
+   help: loremIpsum,
align: 'inline'
}
),
@@ -2576,6 +2578,7 @@
new OO.ui.TextInputWidget(),
{
label: 'FieldLayout aligned 
left with very long label. ' + loremIpsum,
+   help: loremIpsum,
align: 'left'
}
),
@@ -2583,6 +2586,7 @@
new OO.ui.TextInputWidget(),
{
label: 'FieldLayout aligned 
right with very long label. ' + loremIpsum,
+   help: loremIpsum,
align: 'right'
}
),
diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index e070605..a1aad28 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -201,10 +201,10 @@
// Reorder elements
$this->body->clearContent();
if ( $value === 'top' ) {
-   $this->header->appendContent( $this->label, 
$this->help );
+   $this->header->appendContent( $this->help, 
$this->label );
$this->body->appendContent( $this->header, 
$this->field );
} elseif ( $value === 'inline' ) {
-   $this->header->appendContent( $this->label, 
$this->help );
+   $this->header->appendContent( $this->help, 
$this->label );
$this->body->appendContent( $this->field, 
$this->header );
} else {
$this->header->appendContent( $this->label );
diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index 72b5161..502416f 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -216,10 +216,10 @@
}
// Reorder elements
if ( value === 'top' ) {
-   this.$header.append( this.$label, this.$help );
+   this.$header.append( this.$help, this.$label );
this.$body.append( this.$header, this.$field );
} else if ( value === 'inline' ) {
-   this.$header.append( this.$label, this.$help );
+   this.$header.append( this.$help, this.$label );
this.$body.append( this.$field, this.$header );
} else {
this.$header.append( this.$label );
diff --git a/src/themes/wikimediaui/layouts.less 
b/src/themes/wikimediaui/layouts.less
index 8a4f8a2..2155be1 100644
--- a/src/themes/wikimediaui/layouts.less
+++ b/src/themes/wikimediaui/layouts.less
@@ 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Enable cpu workers on the beta cluster

[Arlolra (Code Review)]

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

Change subject: Enable cpu workers on the beta cluster
..

Enable cpu workers on the beta cluster

Change-Id: Ifefe6560c7c4d44d786cfff3ba49e823625addd5
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/75/403075/1

diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 33a5a26..ba583db 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,2 +1,4 @@
 localsettings: conf/wmf/betalabs.localsettings.js
 load_wmf: false
+num_workers: 1
+use_worker: true
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 9e61161..e93ba32 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -1,7 +1,7 @@
 # Number of worker processes to spawn.
 # Set to 0 to run everything in a single process without clustering.
 # Use 'ncpu' to run as many workers as there are CPU units
-num_workers: ncpu
+num_workers: <%= num_workers %>
 
 # Log error messages and gracefully restart a worker if v8 reports that it
 # uses more heap (note: not RSS) than this many mb.
@@ -51,6 +51,8 @@
   linter:
 sendAPI: <%= linter_send_api %>
 
+  useWorker: <%= use_worker %>
+
   mwApiServer: <%= mwapi_server if mwapi_server else '' %>
   defaultAPIProxyURI: <%= mwapi_proxy if mwapi_proxy else '' %>
 
diff --git a/scap/vars.yaml b/scap/vars.yaml
index a152df6..6fbf827 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -16,4 +16,5 @@
 linter_send_api: true
 mwapi_server:
 mwapi_proxy:
-
+num_workers: ncpu
+use_worker: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifefe6560c7c4d44d786cfff3ba49e823625addd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Fix crasher in Cite - don't assume well-formedness

[jenkins-bot (Code Review)]

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

Change subject: Linter: Fix crasher in Cite - don't assume well-formedness
..


Linter: Fix crasher in Cite - don't assume well-formedness

Change-Id: Ie5da61934b91f115b0eea995e05de6c231d77bdb
---
M lib/ext/Cite/index.js
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index d7f8f02..8f2f3d1 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -183,8 +183,11 @@
 
 Ref.prototype.lintHandler = function(ref, env, tplInfo, domLinter) {
var linkBackId = ref.firstChild.getAttribute('href').replace(/[^#]*#/, 
'');
-   var refContent = ref.ownerDocument.getElementById(linkBackId).lastChild;
-   domLinter(refContent, env, tplInfo.isTemplated ? tplInfo : null);
+   var refNode = ref.ownerDocument.getElementById(linkBackId);
+   if (refNode) {
+   // Ex: Buggy input wikitext without ref content
+   domLinter(refNode.lastChild, env, tplInfo.isTemplated ? tplInfo 
: null);
+   }
return ref.nextNode;
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5da61934b91f115b0eea995e05de6c231d77bdb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up Ia2110f71: doc: Correct deprecation version, v0.25...

[Jforrester (Code Review)]

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

Change subject: Follow-up Ia2110f71: doc: Correct deprecation version, v0.25.0 
is master
..

Follow-up Ia2110f71: doc: Correct deprecation version, v0.25.0 is master

Change-Id: I2dfa03802740886847a000931fccf11127bc37ad
---
M src/mixins/GroupElement.js
M src/widgets/MultiselectWidget.js
M src/widgets/SelectWidget.js
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/74/403074/1

diff --git a/src/mixins/GroupElement.js b/src/mixins/GroupElement.js
index a807c38..43ddf17 100644
--- a/src/mixins/GroupElement.js
+++ b/src/mixins/GroupElement.js
@@ -87,7 +87,7 @@
 /**
  * Get an item by its data.
  *
- * @deprecated 0.25.1 Use {@link #findItemFromData} instead.
+ * @deprecated Since v0.25.0; use {@link #findItemFromData} instead.
  * @param {Object} data Item data to search for
  * @return {OO.ui.Element|null} Item with equivalent data, `null` if none 
exists
  */
@@ -122,7 +122,7 @@
 /**
  * Find items by their data.
  *
- * @deprecated 0.25.1 Use {@link #findItemsFromData} instead.
+ * @deprecated Since v0.25.0; use {@link #findItemsFromData} instead.
  * @param {Object} data Item data to search for
  * @return {OO.ui.Element[]} Items with equivalent data
  */
diff --git a/src/widgets/MultiselectWidget.js b/src/widgets/MultiselectWidget.js
index 77cb532..f985b7a 100644
--- a/src/widgets/MultiselectWidget.js
+++ b/src/widgets/MultiselectWidget.js
@@ -74,7 +74,7 @@
 /**
  * Get options that are selected.
  *
- * @deprecated 0.25.1 Use {@link #findSelectedItems} instead.
+ * @deprecated Since v0.25.0; use {@link #findSelectedItems} instead.
  * @return {OO.ui.MultioptionWidget[]} Selected options
  */
 OO.ui.MultiselectWidget.prototype.getSelectedItems = function () {
@@ -96,7 +96,7 @@
 /**
  * Get the data of options that are selected.
  *
- * @deprecated 0.25.1 Use {@link #findSelectedItemsData} instead.
+ * @deprecated Since v0.25.0; use {@link #findSelectedItemsData} instead.
  * @return {Object[]|string[]} Values of selected options
  */
 OO.ui.MultiselectWidget.prototype.getSelectedItemsData = function () {
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 3ce91d3..1f9621d 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -541,7 +541,7 @@
 /**
  * Get selected item.
  *
- * @deprecated 0.25.1 Use {@link #findSelectedItem} instead.
+ * @deprecated Since v0.25.0; use {@link #findSelectedItem} instead.
  * @return {OO.ui.OptionWidget|null} Selected item, `null` if no item is 
selected
  */
 OO.ui.SelectWidget.prototype.getSelectedItem = function () {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Treat phpdbg as run from the command line when checking PHP_...

[jenkins-bot (Code Review)]

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

Change subject: Treat phpdbg as run from the command line when checking PHP_SAPI
..


Treat phpdbg as run from the command line when checking PHP_SAPI

phpdbg is a gdb-style debugger for PHP that is run from the command
line. However, it has a different PHP_SAPI value, so it was impossible
to run maintenance scripts with it (until now).

To avoid having to check both PHP_SAPI values in a bunch of places,
introduce wfIsCLI() to easily check whether running from the
command-line or not.

We're (CI team) interested in generating code coverage with phpdbg
instead of xdebug, hence this patch.

Bug: T184043
Change-Id: Id1f994ca146d7858cd8bb6ab6cdbb7718ff524fb
---
M includes/ForkController.php
M includes/GlobalFunctions.php
M includes/debug/logger/monolog/WikiProcessor.php
M includes/exception/MWExceptionHandler.php
M includes/libs/lockmanager/LockManager.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/profiler/Profiler.php
M includes/profiler/output/ProfilerOutputText.php
M includes/utils/UIDGenerator.php
M maintenance/Maintenance.php
M maintenance/generateLocalAutoload.php
M maintenance/mwdoc-filter.php
13 files changed, 30 insertions(+), 14 deletions(-)

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



diff --git a/includes/ForkController.php b/includes/ForkController.php
index 2dde17b..cc16964 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -54,7 +54,7 @@
const RESTART_ON_ERROR = 1;
 
public function __construct( $numProcs, $flags = 0 ) {
-   if ( PHP_SAPI != 'cli' ) {
+   if ( !wfIsCLI() ) {
throw new MWException( "ForkController cannot be used 
from the web." );
}
$this->procsToStart = $numProcs;
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 523a0f9..7b77090 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2089,6 +2089,16 @@
 }
 
 /**
+ * Check if we are running from the commandline
+ *
+ * @since 1.31
+ * @return bool
+ */
+function wfIsCLI() {
+   return PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg';
+}
+
+/**
  * Tries to get the system directory for temporary files. First
  * $wgTmpDirectory is checked, and then the TMPDIR, TMP, and TEMP
  * environment variables are then checked in sequence, then
@@ -3031,7 +3041,7 @@
$ifWritesSince = null, $wiki = false, $cluster = false, $timeout = null
 ) {
if ( $timeout === null ) {
-   $timeout = ( PHP_SAPI === 'cli' ) ? 86400 : 10;
+   $timeout = wfIsCLI() ? 86400 : 10;
}
 
if ( $cluster === '*' ) {
diff --git a/includes/debug/logger/monolog/WikiProcessor.php 
b/includes/debug/logger/monolog/WikiProcessor.php
index e39a2c3..db5b9bf 100644
--- a/includes/debug/logger/monolog/WikiProcessor.php
+++ b/includes/debug/logger/monolog/WikiProcessor.php
@@ -39,7 +39,7 @@
$record['extra']['wiki'] = wfWikiID();
$record['extra']['mwversion'] = $wgVersion;
$record['extra']['reqId'] = \WebRequest::getRequestId();
-   if ( PHP_SAPI === 'cli' && isset( $_SERVER['argv'] ) ) {
+   if ( wfIsCLI() && isset( $_SERVER['argv'] ) ) {
$record['extra']['cli_argv'] = implode( ' ', 
$_SERVER['argv'] );
}
return $record;
diff --git a/includes/exception/MWExceptionHandler.php 
b/includes/exception/MWExceptionHandler.php
index f3d61f0..d863a2b 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -121,7 +121,7 @@
self::handleException( $e );
 
// Make sure we don't claim success on exit for CLI scripts 
(T177414)
-   if ( PHP_SAPI === 'cli' ) {
+   if ( wfIsCLI() ) {
register_shutdown_function(
function () {
exit( 255 );
diff --git a/includes/libs/lockmanager/LockManager.php 
b/includes/libs/lockmanager/LockManager.php
index a6257bf..6b3cfb4 100644
--- a/includes/libs/lockmanager/LockManager.php
+++ b/includes/libs/lockmanager/LockManager.php
@@ -83,7 +83,7 @@
$this->domain = isset( $config['domain'] ) ? $config['domain'] 
: 'global';
if ( isset( $config['lockTTL'] ) ) {
$this->lockTTL = max( 5, $config['lockTTL'] );
-   } elseif ( PHP_SAPI === 'cli' ) {
+   } elseif ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' ) {
$this->lockTTL = 3600;
} else {
$met = ini_get( 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Improvements to existing feature management system

[Pmiazga (Code Review)]

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

Change subject: Improvements to existing feature management system
..

Improvements to existing feature management system

Changes:
 - added $group for features grouping and easier translations
 - added FeatureManager::getFeature()
 - added validation for feature id uniqueness
Bug: T182362
Change-Id: Ib2a2695adb3543ded186528308e296870f4c6b2e
---
M includes/ServiceWiring.php
M includes/features/Feature.php
M includes/features/FeaturesManager.php
M includes/features/IFeature.php
4 files changed, 40 insertions(+), 6 deletions(-)


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

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index ee9abfb..700f804 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -18,9 +18,9 @@
// maybe we can get all available features by looping through 
MobileFrontend.Feature.*
// and register it here, it would be nice to have something like
// $services->getAllByPrefix('MobileFrontend.Feature')
-   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions',
+   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions', 'mobile-frontend',
$config->get( 'MFEnableWikidataDescriptions' ) ) );
-   $manager->registerFeature( new Feature( 'MFLazyLoadReferences',
+   $manager->registerFeature( new Feature( 'MFLazyLoadReferences', 
'mobile-frontend',
$config->get( 'MFLazyLoadReferences' ) ) );
 
return $manager;
diff --git a/includes/features/Feature.php b/includes/features/Feature.php
index 9627d41..ed5f6fa 100644
--- a/includes/features/Feature.php
+++ b/includes/features/Feature.php
@@ -13,6 +13,11 @@
 */
private $name;
/**
+* Feature group (mobile-frontend, minerva, ...)
+* @var string
+*/
+   private $group;
+   /**
 * @var array
 */
private $options;
@@ -20,10 +25,12 @@
/**
 * Feature constructor.
 * @param string $name feature name (used as an ID)
+* @param string $group feature group (used as a translation prefix)
 * @param array $options Feature options
 */
-   public function __construct( $name, $options ) {
+   public function __construct( $name, $group = 'mobile-frontend', 
$options = array() ) {
$this->name = $name;
+   $this->group = $group;
$this->options = $options;
}
 
@@ -45,15 +52,21 @@
/**
 * @inheritDoc
 */
+   public function getGroup() {
+   return $this->group;
+   }
+   /**
+* @inheritDoc
+*/
public function getNameKey() {
-   return 'mobile-frontend-mobile-option-' . $this->name;
+   return $this->group . '-mobile-option-' . $this->name;
}
 
/**
 * @inheritDoc
 */
public function getDescriptionKey() {
-   return 'mobile-frontend-mobile-option-' . $this->name . 
'-description';
+   return $this->group . '-mobile-option-' . $this->name . 
'-description';
}
 
 }
diff --git a/includes/features/FeaturesManager.php 
b/includes/features/FeaturesManager.php
index 85ee423..ef7ef2c 100644
--- a/includes/features/FeaturesManager.php
+++ b/includes/features/FeaturesManager.php
@@ -15,7 +15,10 @@
 * @param IFeature $feature Feature to register
 */
public function registerFeature( IFeature $feature ) {
-   $this->features[] = $feature;
+   if ( array_key_exists( $feature->getId(), $this->features ) ) {
+   throw new \RuntimeException( 'Feature ' . 
$feature->getId() . ' is already defined.' );
+   }
+   $this->features[ $feature->getId() ] = $feature;
}
 
/**
@@ -28,4 +31,16 @@
} );
}
 
+   /**
+* Get feature
+* @param string $id Feature id
+* @return IFeature
+*/
+   public function getFeature( $id ) {
+   if ( !array_key_exists( $id, $this->features ) ) {
+   throw new \RuntimeException( 'Feature ' . $id . ' is 
not defined.');
+   }
+   return $this->features[ $id ];
+   }
+
 }
diff --git a/includes/features/IFeature.php b/includes/features/IFeature.php
index 325a219..6122541 100644
--- a/includes/features/IFeature.php
+++ b/includes/features/IFeature.php
@@ -12,6 +12,12 @@
public function getId();
 
/**
+* Get the feature group
+* @return string
+*/
+   public function getGroup();
+
+   /**
 * Check feature 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: toolforge: ferm hook to restart components post updates

[Rush (Code Review)]

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

Change subject: WIP: toolforge: ferm hook to restart components post updates
..

WIP: toolforge: ferm hook to restart components post updates

* Ferm is not playing nice with other iptables tenants
* Tested an /etc/ferm/conf.d/00_hooks to see it run external
  scripts in what seems like a totally post updates state.  This
  hopefully let's kube-proxy, flannel, and docker deal with
  Ferm stomping all around.

This is a midterm fix where other options are being explored
in the context of the task.  Right now any update to Ferm, even
a definition MAC, results in an outage for k8s in Toolforge.

Bug: T182722
Change-Id: I5c700a2c8bce6050e8cb761450d3716a6b3f33c9
---
M modules/role/manifests/toollabs/k8s/master.pp
M modules/role/manifests/toollabs/proxy.pp
A modules/toollabs/files/ferm_restart_handler.sh
A modules/toollabs/manifests/ferm_restart_handler.pp
M modules/toollabs/manifests/proxy.pp
5 files changed, 40 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/403072/1

diff --git a/modules/role/manifests/toollabs/k8s/master.pp 
b/modules/role/manifests/toollabs/k8s/master.pp
index 81647b4..1c0d78c 100644
--- a/modules/role/manifests/toollabs/k8s/master.pp
+++ b/modules/role/manifests/toollabs/k8s/master.pp
@@ -2,8 +2,9 @@
 class role::toollabs::k8s::master(
 $use_puppet_certs = false,
 ) {
-include ::base::firewall
 include ::toollabs::infrastructure
+include ::base::firewall
+include ::toollabs::ferm_restart_handler
 
 $master_host = hiera('k8s::master_host', $::fqdn)
 $etcd_url = prefix(suffix(hiera('k8s::etcd_hosts'), ':2379'), 'https://')
diff --git a/modules/role/manifests/toollabs/proxy.pp 
b/modules/role/manifests/toollabs/proxy.pp
index be70d49..c82cfef 100644
--- a/modules/role/manifests/toollabs/proxy.pp
+++ b/modules/role/manifests/toollabs/proxy.pp
@@ -2,6 +2,8 @@
 class role::toollabs::proxy {
 include ::toollabs::proxy
 include ::role::toollabs::k8s::webproxy
+include ::base::firewall
+include ::toollabs::ferm_restart_handler
 
 ferm::service { 'proxymanager':
 proto  => 'tcp',
diff --git a/modules/toollabs/files/ferm_restart_handler.sh 
b/modules/toollabs/files/ferm_restart_handler.sh
new file mode 100644
index 000..9bffa6b
--- /dev/null
+++ b/modules/toollabs/files/ferm_restart_handler.sh
@@ -0,0 +1,16 @@
+#/bin/bash
+
+/usr/bin/logger -t ${0} "restart firewall components post ferm management"
+
+# Ferm expects to handle all firewall state
+# and that does not mesh well with dynamic chain management.
+# We tell the k8s stack here to restart
+#
+# This should be no more invasive than a rescheduling
+# of a POD to another worker.
+#
+# If we are living an nftables world when you read
+# this, then this should be totally rethought.
+sudo service docker restart
+sudo service flannel restart
+sudo service kube-proxy restart
diff --git a/modules/toollabs/manifests/ferm_restart_handler.pp 
b/modules/toollabs/manifests/ferm_restart_handler.pp
new file mode 100644
index 000..2fc3034
--- /dev/null
+++ b/modules/toollabs/manifests/ferm_restart_handler.pp
@@ -0,0 +1,20 @@
+# tldr; hook post ferm updates to let other interested
+#   parties resync their iptables state.
+# See: T182722
+class toollabs::ferm_restart_handler{
+
+file {'/usr/local/sbin/ferm_restart_handler':
+source => 'puppet:///modules/toollabs/ferm_restart_handler.sh',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+}
+
+# http://ferm.foo-projects.org/download/2.1/ferm.html#hooks
+# https://phabricator.wikimedia.org/T182722
+ferm::conf{'ferm_firewall_processing':
+prio  => 00,
+content   => '@hook post  "/usr/local/sbin/ferm_restart_handler"',
+subscribe => File['/usr/local/sbin/ferm_restart_handler'], 
+}
+}
diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 63953dd..9befba2 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -9,7 +9,6 @@
 
 include ::toollabs::infrastructure
 include ::redis::client::python
-include ::base::firewall
 
 if $ssl_install_certificate {
 sslcert::certificate { $ssl_certificate_name:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Improvements to existing feature management system

[Pmiazga (Code Review)]

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

Change subject: Improvements to existing feature management system
..

Improvements to existing feature management system

Bug: T182362
Change-Id: Ib2a2695adb3543ded186528308e296870f4c6b2e
---
M includes/ServiceWiring.php
M includes/features/Feature.php
M includes/features/FeaturesManager.php
M includes/features/IFeature.php
4 files changed, 40 insertions(+), 6 deletions(-)


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

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index ee9abfb..700f804 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -18,9 +18,9 @@
// maybe we can get all available features by looping through 
MobileFrontend.Feature.*
// and register it here, it would be nice to have something like
// $services->getAllByPrefix('MobileFrontend.Feature')
-   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions',
+   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions', 'mobile-frontend',
$config->get( 'MFEnableWikidataDescriptions' ) ) );
-   $manager->registerFeature( new Feature( 'MFLazyLoadReferences',
+   $manager->registerFeature( new Feature( 'MFLazyLoadReferences', 
'mobile-frontend',
$config->get( 'MFLazyLoadReferences' ) ) );
 
return $manager;
diff --git a/includes/features/Feature.php b/includes/features/Feature.php
index 9627d41..b386b7b 100644
--- a/includes/features/Feature.php
+++ b/includes/features/Feature.php
@@ -13,6 +13,11 @@
 */
private $name;
/**
+* Feature group (mobile-frontend, minerva, ...)
+* @var string
+*/
+   private $group;
+   /**
 * @var array
 */
private $options;
@@ -20,10 +25,12 @@
/**
 * Feature constructor.
 * @param string $name feature name (used as an ID)
+* @param string $group feature group (used as a translation prefix)
 * @param array $options Feature options
 */
-   public function __construct( $name, $options ) {
+   public function __construct( $name, $group = 'mobile-frontend', 
$options = array() ) {
$this->name = $name;
+   $this->group = $group;
$this->options = $options;
}
 
@@ -45,15 +52,21 @@
/**
 * @inheritDoc
 */
+   public function getGroup() {
+   return $this->group;
+   }
+   /**
+* @inheritDoc
+*/
public function getNameKey() {
-   return 'mobile-frontend-mobile-option-' . $this->name;
+   return $this->group . '-mobile-option-' . $this->name;
}
 
/**
 * @inheritDoc
 */
public function getDescriptionKey() {
-   return 'mobile-frontend-mobile-option-' . $this->name . 
'-description';
+   return $this->group . 'mobile-option-' . $this->name . 
'-description';
}
 
 }
diff --git a/includes/features/FeaturesManager.php 
b/includes/features/FeaturesManager.php
index 85ee423..ef7ef2c 100644
--- a/includes/features/FeaturesManager.php
+++ b/includes/features/FeaturesManager.php
@@ -15,7 +15,10 @@
 * @param IFeature $feature Feature to register
 */
public function registerFeature( IFeature $feature ) {
-   $this->features[] = $feature;
+   if ( array_key_exists( $feature->getId(), $this->features ) ) {
+   throw new \RuntimeException( 'Feature ' . 
$feature->getId() . ' is already defined.' );
+   }
+   $this->features[ $feature->getId() ] = $feature;
}
 
/**
@@ -28,4 +31,16 @@
} );
}
 
+   /**
+* Get feature
+* @param string $id Feature id
+* @return IFeature
+*/
+   public function getFeature( $id ) {
+   if ( !array_key_exists( $id, $this->features ) ) {
+   throw new \RuntimeException( 'Feature ' . $id . ' is 
not defined.');
+   }
+   return $this->features[ $id ];
+   }
+
 }
diff --git a/includes/features/IFeature.php b/includes/features/IFeature.php
index 325a219..6122541 100644
--- a/includes/features/IFeature.php
+++ b/includes/features/IFeature.php
@@ -12,6 +12,12 @@
public function getId();
 
/**
+* Get the feature group
+* @return string
+*/
+   public function getGroup();
+
+   /**
 * Check feature availability in given mode ( Stable, beta, alpha etc )
 * @param string $mode Mode
 * @return bool

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Give some time for async loggers to deliver fatal messages

[Arlolra (Code Review)]

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

Change subject: Give some time for async loggers to deliver fatal messages
..

Give some time for async loggers to deliver fatal messages

Fatals in logstash are only reporting "fatal/request" where the process
isn't exited, however these logs are showing up in the file based
logging.

Change-Id: Ib9b271007213a79c2444a40debe2945d6e1435ac
---
M lib/logger/Logger.js
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/lib/logger/Logger.js b/lib/logger/Logger.js
index 8b8b6d6..0171663 100644
--- a/lib/logger/Logger.js
+++ b/lib/logger/Logger.js
@@ -286,7 +286,8 @@
// events in the queue and logs them.
async.parallel(applicableBackends, function() {
if (/^fatal$/.test(logData.logType)) {
-   process.exit(1);
+   // Give some time for async loggers to deliver the 
message
+   setTimeout(function() { process.exit(1); }, 100);
}
cb();
});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b271007213a79c2444a40debe2945d6e1435ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Fix limit display for limit=1

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Fix limit display for limit=1
..


RCFilters: Fix limit display for limit=1

Fix typo so it's '1 change' instead of 'change'.

Bug: T182241
Change-Id: I5026207ddbd421cd521252ac7842b54a9e687953
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 5e206ef..931e7e1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1366,7 +1366,7 @@
"rcfilters-activefilters": "Active filters",
"rcfilters-advancedfilters": "Advanced filters",
"rcfilters-limit-title": "Results to show",
-   "rcfilters-limit-and-date-label": "{{PLURAL:$1|change|$1 changes}}, $2",
+   "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|change|changes}}, $2",
"rcfilters-date-popup-title": "Time period to search",
"rcfilters-days-title": "Recent days",
"rcfilters-hours-title": "Recent hours",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5026207ddbd421cd521252ac7842b54a9e687953
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Mobile Frontend feature management system

[jenkins-bot (Code Review)]

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

Change subject: Mobile Frontend feature management system
..


Mobile Frontend feature management system

Bug: T182362
Change-Id: If7ebace5ace1b2f191a53e6a1e8bc373307af08f
---
M extension.json
M includes/MobileFrontend.hooks.php
M includes/ServiceWiring.php
A includes/features/Feature.php
A includes/features/FeaturesManager.php
A includes/features/IFeature.php
6 files changed, 152 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index d0f5318..f4935db 100644
--- a/extension.json
+++ b/extension.json
@@ -46,7 +46,8 @@
"MobileFrontendAlias": "MobileFrontend.alias.php"
},
"AutoloadNamespaces": {
-   "MobileFrontend\\Transforms\\": "includes/transforms/"
+   "MobileFrontend\\Transforms\\": "includes/transforms/",
+   "MobileFrontend\\Features\\" : "includes/features/"
},
"AutoloadClasses": {
"ExtMobileFrontend": "includes/MobileFrontend.body.php",
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index cd7f519..6fbb210 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -122,6 +122,13 @@
$skin = self::getDefaultMobileSkin( $context, $mobileContext );
Hooks::run( 'RequestContextCreateSkinMobile', [ $mobileContext, 
$skin ] );
 
+   // TODO, do we want to have a specific hook just for Mobile 
Features initialization
+   // or do we want to reuse the RequestContextCreateSkinMobile 
and use MediawikiService
+   // to retrieve the FeaturesManager
+   $featureManager = \MediaWiki\MediaWikiServices::getInstance()
+   ->getService( 'MobileFrontend.FeaturesManager' );
+   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$featureManager ] );
+
return false;
}
 
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index efc21e1..ee9abfb 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -1,10 +1,28 @@
  function ( MediaWikiServices $services ) {
return $services->getService( 'ConfigFactory' )
->makeConfig( 'mobilefrontend' );
-   }
+   },
+
+   'MobileFrontend.FeaturesManager' => function ( MediaWikiServices 
$services ) {
+   $config = $services->getService( 'MobileFrontend.Config' );
+
+   $manager = new FeaturesManager();
+   // register default features
+   // maybe we can get all available features by looping through 
MobileFrontend.Feature.*
+   // and register it here, it would be nice to have something like
+   // $services->getAllByPrefix('MobileFrontend.Feature')
+   $manager->registerFeature( new Feature( 
'MFEnableWikidataDescriptions',
+   $config->get( 'MFEnableWikidataDescriptions' ) ) );
+   $manager->registerFeature( new Feature( 'MFLazyLoadReferences',
+   $config->get( 'MFLazyLoadReferences' ) ) );
+
+   return $manager;
+   },
 ];
diff --git a/includes/features/Feature.php b/includes/features/Feature.php
new file mode 100644
index 000..9627d41
--- /dev/null
+++ b/includes/features/Feature.php
@@ -0,0 +1,59 @@
+name = $name;
+   $this->options = $options;
+   }
+
+   /**
+* @inheritDoc
+*/
+   public function isAvailable( $mode ) {
+   return array_key_exists( $mode, $this->options ) ?
+   $this->options[ $mode ] : self::DEFAULT_ENABLED_MODE;
+   }
+
+   /**
+* @inheritDoc
+*/
+   public function getId() {
+   return $this->name;
+   }
+
+   /**
+* @inheritDoc
+*/
+   public function getNameKey() {
+   return 'mobile-frontend-mobile-option-' . $this->name;
+   }
+
+   /**
+* @inheritDoc
+*/
+   public function getDescriptionKey() {
+   return 'mobile-frontend-mobile-option-' . $this->name . 
'-description';
+   }
+
+}
diff --git a/includes/features/FeaturesManager.php 
b/includes/features/FeaturesManager.php
new file mode 100644
index 000..85ee423
--- /dev/null
+++ b/includes/features/FeaturesManager.php
@@ -0,0 +1,31 @@
+
+*/
+   private $features = [];
+
+   /**
+* Register a new MobileFronted feature
+* @param IFeature $feature Feature to register
+*/
+   public function registerFeature( IFeature $feature ) {
+   $this->features[] = $feature;
+   }
+
+   /**
+* @param string $mode Mode
+* @return array
+  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use PHP 7 IntlChar::chr or Unicode literals instead of bit-f...

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403069 )

Change subject: Use PHP 7 IntlChar::chr or Unicode literals instead of 
bit-fiddling
..

Use PHP 7 IntlChar::chr or Unicode literals instead of bit-fiddling

This is a follow-up to Idc3dee3a7fb5ebfaef395754d8859b18f1f8769a
containing some less trivial changes.

Change-Id: Ia7af2c1d000307d43278cde4a246df413d4ef263
---
M includes/Preferences.php
M includes/collation/CustomUppercaseCollation.php
M includes/installer/Installer.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
4 files changed, 10 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/403069/1

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 0e7d9cc..702d1c2 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1285,8 +1285,8 @@
$pixels = $context->msg( 'unit-pixel' )->text();
 
foreach ( $context->getConfig()->get( 'ImageLimits' ) as $index 
=> $limits ) {
-   // Note: A left-to-right marker (\u200e) is inserted, 
see T144386
-   $display = "{$limits[0]}" . json_decode( '"\u200e"' ) . 
"×{$limits[1]}" . $pixels;
+   // Note: A left-to-right marker (U+200E) is inserted, 
see T144386
+   $display = "{$limits[0]}\u{200E}×{$limits[1]}$pixels";
$ret[$display] = $index;
}
 
diff --git a/includes/collation/CustomUppercaseCollation.php 
b/includes/collation/CustomUppercaseCollation.php
index 301972d..aa1661c 100644
--- a/includes/collation/CustomUppercaseCollation.php
+++ b/includes/collation/CustomUppercaseCollation.php
@@ -45,24 +45,18 @@
private $puaSubset;
 
/**
-* @note This assumes $alphabet does not contain U+F3000-U+F303F
+* @note This assumes $alphabet does not contain U+F3000-U+D
 *
 * @param array $alphabet Sorted array of uppercase characters.
 * @param Language $lang What language for number sorting.
 */
public function __construct( array $alphabet, Language $lang ) {
-   // It'd be trivial to extend this past 64, you'd just
-   // need a bit of bit-fiddling. Doesn't seem necessary right
-   // now.
-   if ( count( $alphabet ) < 1 || count( $alphabet ) >= 64 ) {
-   throw new UnexpectedValueException( "Alphabet must be < 
64 items" );
-   }
$this->alphabet = $alphabet;
 
$this->puaSubset = [];
$len = count( $alphabet );
for ( $i = 0; $i < $len; $i++ ) {
-   $this->puaSubset[] = "\xF3\xB3\x80" . chr( $i + 128 );
+   $this->puaSubset[] = IntlChar::chr( 0xF3000 + $i );
}
parent::__construct( $lang );
}
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7f318c5..2d18ced 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1109,29 +1109,6 @@
}
 
/**
-* Convert a hex string representing a Unicode code point to that code 
point.
-* @param string $c
-* @return string|false
-*/
-   protected function unicodeChar( $c ) {
-   $c = hexdec( $c );
-   if ( $c <= 0x7F ) {
-   return chr( $c );
-   } elseif ( $c <= 0x7FF ) {
-   return chr( 0xC0 | $c >> 6 ) . chr( 0x80 | $c & 0x3F );
-   } elseif ( $c <= 0x ) {
-   return chr( 0xE0 | $c >> 12 ) . chr( 0x80 | $c >> 6 & 
0x3F ) .
-   chr( 0x80 | $c & 0x3F );
-   } elseif ( $c <= 0x10 ) {
-   return chr( 0xF0 | $c >> 18 ) . chr( 0x80 | $c >> 12 & 
0x3F ) .
-   chr( 0x80 | $c >> 6 & 0x3F ) .
-   chr( 0x80 | $c & 0x3F );
-   } else {
-   return false;
-   }
-   }
-
-   /**
 * Check the libicu version
 */
protected function envCheckLibicu() {
@@ -1142,8 +1119,8 @@
 * Note that we use the hex representation to create the code
 * points in order to avoid any Unicode-destroying during 
transit.
 */
-   $not_normal_c = $this->unicodeChar( "FA6C" );
-   $normal_c = $this->unicodeChar( "242EE" );
+   $not_normal_c = "\u{FA6C}";
+   $normal_c = "\u{242EE}";
 
$useNormalizer = 'php';
$needsUpdate = false;
diff --git 
a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php 

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Cover some of Hooks

[Awight (Code Review)]

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

Change subject: Cover some of Hooks
..

Cover some of Hooks

Bug: T184140
Change-Id: I49fc3c3601a91758ca7d44c5f4415bfce7c71903
---
M tests/phpunit/includes/HooksTest.php
1 file changed, 44 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/HooksTest.php 
b/tests/phpunit/includes/HooksTest.php
index b770b9b..c81515d 100644
--- a/tests/phpunit/includes/HooksTest.php
+++ b/tests/phpunit/includes/HooksTest.php
@@ -3,9 +3,12 @@
 namespace ORES\Tests;
 
 use IContextSource;
+use JobQueueGroup;
 use ORES\Hooks;
 use ORES\Hooks\PreferencesHookHandler;
 use ORES\Storage\HashModelLookup;
+use ORES\Storage\ScoreStorage;
+use RecentChange;
 use RequestContext;
 use SpecialPage;
 use User;
@@ -44,6 +47,47 @@
}
 
/**
+* @covers ORES\Hooks::onRecentChange_save
+*/
+   public function testOnRecentChange_save() {
+   JobQueueGroup::singleton()->get( 'ORESFetchScoreJob' 
)->delete();
+
+   $rc = RecentChange::newFromRow( (object)[
+   'rc_patrolled' => 0,
+   'rc_timestamp' => '20150921134808',
+   'rc_deleted' => 0,
+   'rc_comment' => '',
+   'rc_comment_text' => '',
+   'rc_comment_data' => null,
+   'rc_type' => RC_EDIT,
+   'rc_this_oldid' => mt_rand(1000, ),
+   ] );
+   Hooks::onRecentChange_save( $rc );
+
+   $this->assertFalse( JobQueueGroup::singleton()->get( 
'ORESFetchScoreJob' )->isEmpty() );
+   }
+
+   /**
+* @covers ORES\Hooks::onRecentChangesPurgeRows
+*/
+   public function testOnRecentChangesPurgeRows() {
+   $revIds = [ 1, 5, 8, 13 ];
+   $rows = array_map( function( $id ) {
+   return (object)[ 'rc_this_oldid' => $id ];
+   }, $revIds );
+
+   $mock = $this->getMockBuilder( ScoreStorage::class )
+   ->getMock();
+   $mock->expects( $this->once() )
+   ->method( 'purgeRows' )
+   ->with( $this->equalTo( $revIds ) );
+
+   $this->setService( 'ORESScoreStorage', $mock );
+
+   Hooks::onRecentChangesPurgeRows( $rows );
+   }
+
+   /**
 * @covers ORES\Hooks\PreferencesHookHandler::onGetPreferences
 * @todo Move to a dedicated file
 */

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] Refactor cache::kafka::eventlogging into profile and e...

[Ottomata (Code Review)]

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

Change subject: [WIP] Refactor cache::kafka::eventlogging into profile and 
enable TLS
..

[WIP] Refactor cache::kafka::eventlogging into profile and enable TLS

Bug: T183297
Change-Id: I4096fe7efda237bac162dfb5dc8af1262c445503
---
A modules/profile/manifests/cache/kafka/eventlogging.pp
M modules/profile/manifests/cache/text.pp
D modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/text.pp
4 files changed, 86 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/403067/1

diff --git a/modules/profile/manifests/cache/kafka/eventlogging.pp 
b/modules/profile/manifests/cache/kafka/eventlogging.pp
new file mode 100644
index 000..2f4aa2f
--- /dev/null
+++ b/modules/profile/manifests/cache/kafka/eventlogging.pp
@@ -0,0 +1,79 @@
+# === Class profile::cache::kafka::eventlogging
+#
+# Sets up a varnishkafka logging endpoint for collecting
+# analytics events coming from external clients.
+#
+# TODO: This class is still in test mode
+#
+# More info: https://wikitech.wikimedia.org/wiki/Analytics/EventLogging
+#
+# === Parameters
+#
+# [*kafka_cluster_name*]
+#   Name of the Kafka cluster in the kafka_clusters hash to be passed to the
+#   kafka_config() function.  Default: jumbo.
+#
+# [*cache_cluster*]
+#   The name of the cache cluster.
+#
+# [*statsd*]
+#   The host to send statsd data to.
+#
+class profile::cache::kafka::eventlogging(
+$kafka_cluster_name = 
hiera('profile::cache::kafka::eventlogging::kafka_cluster_name', 'jumbo')
+$cache_cluster  = hiera('cache::cluster'),
+$statsd = hiera('statsd'),
+) {
+# Include this class to get key and certificate for varnishkafka
+# to produce to Kafka over SSL/TLS.
+require ::profile::cache::kafka::certificate
+
+# Set varnish.arg.q or varnish.arg.m according to Varnish version
+$varnish_opts = { 'q' => 'ReqURL ~ "^/(beacon/)?event(\.gif)?\?"' }
+
+$config = kafka_config($kafka_cluster_name)
+# Array of kafka brokers in jumbo-eqiad with SSL port 9093
+$kafka_brokers = $config['brokers']['ssl_array']
+
+$topic= "webrequest_${cache_cluster}_test"
+$varnish_name = 'frontend'
+$varnish_svc_name = 'varnish-frontend'
+
+varnishkafka::instance { 'eventlogging':
+brokers => $kafka_brokers,
+# Note that this format uses literal tab characters.
+# The '-' in this string used to be %{X-Client-IP@ip}o.
+# EventLogging clientIp logging has been removed as part of T128407.
+format  => '%q %l  %n  %{%FT%T}t   
-   "%{User-agent}i"',
+format_type => 'string',
+topic   => 'eventlogging-client-side',
+varnish_name=> $varnish_name,
+varnish_svc_name=> $varnish_svc_name,
+varnish_opts=> $varnish_opts,
+topic_request_required_acks => '1',
+}
+
+include ::standard
+
+# Generate icinga alert if varnishkafka is not running.
+nrpe::monitor_service { 'varnishkafka-eventlogging':
+description   => 'eventlogging Varnishkafka log producer',
+nrpe_command  => "/usr/lib/nagios/plugins/check_procs -c 1 -a 
'/usr/bin/varnishkafka -S /etc/varnishkafka/eventlogging.conf'",
+contact_group => 'admins,analytics',
+require   => Varnishkafka::Instance['eventlogging'],
+}
+
+$cache_type = hiera('cache::cluster')
+$graphite_metric_prefix = 
"varnishkafka.${::hostname}.eventlogging.${cache_cluster}"
+
+# Sets up Logster to read from the Varnishkafka instance stats JSON file
+# and report metrics to statsd.
+varnishkafka::monitor::statsd { 'eventlogging':
+graphite_metric_prefix => $graphite_metric_prefix,
+statsd_host_port   => $statsd,
+}
+
+# Make sure varnishes are configured and started for the first time
+# before the instances as well, or they fail to start initially...
+Service <| tag == 'varnish_instance' |> -> 
Varnishkafka::Instance['eventlogging']
+}
diff --git a/modules/profile/manifests/cache/text.pp 
b/modules/profile/manifests/cache/text.pp
index d4225b8..743d017 100644
--- a/modules/profile/manifests/cache/text.pp
+++ b/modules/profile/manifests/cache/text.pp
@@ -87,14 +87,6 @@
 backend_warming  => $backend_warming,
 }
 
-# varnishkafka eventlogging listens for eventlogging
-# requests and logs them to the eventlogging-client-side
-# topic.  EventLogging servers consume and process this
-# topic into many JSON based kafka topics for further
-# consumption.
-# TODO: Move this to profile, include from role::cache::text.
-class { '::role::cache::kafka::eventlogging': }
-
 # 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove redundant HTML element in favor of CSS

[Albert221 (Code Review)]

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

Change subject: Remove redundant HTML element in favor of CSS
..

Remove redundant HTML element in favor of CSS

Bug: T183672
Change-Id: I1f8a8413a5f4da441e3f4b4ef0b1e03d174987ca
---
M includes/EditPage.php
M resources/src/mediawiki.action/mediawiki.action.edit.styles.less
2 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/403066/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3c109f6..a8be3aa 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3670,11 +3670,6 @@
$out->addHTML( implode( $this->getEditButtons( $tabindex ), 
"\n" ) . "\n" );
 
$cancel = $this->getCancelLink();
-   if ( $cancel !== '' ) {
-   $cancel .= Html::element( 'span',
-   [ 'class' => 'mw-editButtons-pipe-separator' ],
-   $this->context->msg( 'pipe-separator' )->text() 
);
-   }
 
$message = $this->context->msg( 'edithelppage' 
)->inContentLanguage()->text();
$edithelpurl = Skin::makeInternalOrExternalUrl( $message );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less 
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
index e4443f6..aeaed7b 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -46,9 +46,13 @@
}
 
.editHelp {
-   margin-left: 0.5em;
vertical-align: middle;
 
+   &:before {
+   content: '|';
+   margin-right: 0.5em;
+   }
+
a {
font-weight: bold;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: Minerva should use FeatureManagers class

[Jdlrobson (Code Review)]

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

Change subject: Minerva should use FeatureManagers class
..

Minerva should use FeatureManagers class

Bug: T182362
Change-Id: I6ba5bf49b9060c31ad2224a437072b3426a45619
---
M includes/Minerva.hooks.php
M skin.json
2 files changed, 33 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/65/403065/1

diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index c65d939..f68bc02 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -28,6 +28,30 @@
}
 
/**
+* Register mobile web beta features
+* @see https://www.mediawiki.org/wiki/
+   *   Extension:MobileFrontend/MobileFrontendFeaturesRegistration
+*
+* @param MobileFrontend\Features\FeaturesManager $featureManager
+* @return bool
+*/
+   public static function onMobileFrontendFeaturesRegistration( 
$featureManager ) {
+   $config = MediaWikiServices::getInstance()->getConfigFactory()
+   ->makeConfig( 'minerva' );
+
+   $featureManager->registerFeature(
+   new MobileFrontend\Features\Feature( 
'MinervaShowCategoriesButton',
+   $config->get( 'MinervaShowCategoriesButton' )
+   )
+   );
+   $featureManager->registerFeature(
+   new MobileFrontend\Features\Feature( 
'MinervaEnableBackToTop',
+   $config->get( 'MinervaEnableBackToTop' )
+   )
+   );
+   }
+
+   /**
 * Skin registration callback.
 */
public static function onRegistration() {
@@ -132,13 +156,17 @@
) {
// setSkinOptions is not available
if ( $skin instanceof SkinMinerva ) {
+   $featureManager = 
\MediaWiki\MediaWikiServices::getInstance();
+
$skin->setSkinOptions( [
SkinMinerva::OPTIONS_MOBILE_BETA
=> $mobileContext->isBetaGroupMember(),
+
+   // @todo
SkinMinerva::OPTION_CATEGORIES
-   => $mobileContext->getConfigVariable( 
'MinervaShowCategoriesButton' ),
+   => $featureManager->isFeatureEnabled( 
'MinervaShowCategoriesButton'),
SkinMinerva::OPTION_BACK_TO_TOP
-   => $mobileContext->getConfigVariable( 
'MinervaEnableBackToTop' ),
+   => $featureManager->isFeatureEnabled( 
'MinervaEnableBackToTop' ),
SkinMinerva::OPTION_TOGGLING => true,
SkinMinerva::OPTION_MOBILE_OPTIONS => true,
] );
diff --git a/skin.json b/skin.json
index d00c5bf..dba27d1 100644
--- a/skin.json
+++ b/skin.json
@@ -15,6 +15,9 @@
"minerva": "GlobalVarConfig::newInstance"
},
"Hooks": {
+   "MobileFrontendFeaturesRegistration": [
+   "MinervaHooks::onMobileFrontendFeaturesRegistration"
+   ],
"RequestContextCreateSkinMobile": [
"MinervaHooks::onRequestContextCreateSkinMobile"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ba5bf49b9060c31ad2224a437072b3426a45619
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tweaks to profile::cache::kafka::webrequest::jumbo test

[Ottomata (Code Review)]

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

Change subject: Tweaks to profile::cache::kafka::webrequest::jumbo test
..

Tweaks to profile::cache::kafka::webrequest::jumbo test

- rename $statsd_host to $statsd
- remove force_protocol_version, this was set to 0.9.0.1  Since Kafka 0.10,
  librdkafka should be able to properly negotiate the protocol version with 
Kafka.
  This will change the way varnishkafka has been producing to jumbo for our 
tests.

Change-Id: I86e8573aeafca185821b5932a259a6290d4fe9d2
---
M modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
1 file changed, 4 insertions(+), 12 deletions(-)


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

diff --git a/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp 
b/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
index ae5cbc8..cba9854 100644
--- a/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
+++ b/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
@@ -10,15 +10,15 @@
 # [*cache_cluster*]
 #   the name of the cache cluster
 #
-# [*statsd_host*]
-#   the host to send statsd data to.
+# [*statsd*]
+#   The host:port to send statsd data to.
 #
 # [*ssl_key_password*]
 #   the password to decrypt the TLS client certificate.
 #
 class profile::cache::kafka::webrequest::jumbo(
 $cache_cluster = hiera('cache::cluster'),
-$statsd_host   = hiera('statsd'),
+$statsd= hiera('statsd'),
 ) {
 # Include this class to get key and certificate for varnishkafka
 # to produce to Kafka over SSL/TLS.
@@ -30,11 +30,8 @@
 $kafka_brokers = $config['brokers']['ssl_array']
 
 $topic = "webrequest_${cache_cluster}_test"
-# These used to be parameters, but I don't really see why given we never 
change
-# them
 $varnish_name   = 'frontend'
 $varnish_svc_name   = 'varnish-frontend'
-$kafka_protocol_version = '0.9.0.1'
 
 # For any info about the following settings, please check
 # profile::cache::kafka::webrequest.
@@ -58,10 +55,7 @@
 $peak_rps_estimate = 9000
 
 varnishkafka::instance { 'webrequest-jumbo-duplicate':
-# FIXME - top-scope var without namespace, will break in puppet 2.8
-# lint:ignore:variable_scope
 brokers  => $kafka_brokers,
-# lint:endignore
 topic=> $topic,
 format_type  => 'json',
 compression_codec=> 'snappy',
@@ -91,7 +85,6 @@
 # this often.  This is set at 15 so that
 # stats will be fresh when polled from gmetad.
 log_statistics_interval  => 15,
-force_protocol_version   => $kafka_protocol_version,
 #TLS/SSL config
 ssl_enabled  => true,
 ssl_ca_location  => 
$::profile::cache::kafka::certificate::ssl_ca_location,
@@ -107,11 +100,10 @@
 # and report metrics to statsd.
 varnishkafka::monitor::statsd { 'webrequest-jumbo-duplicate':
 graphite_metric_prefix => $graphite_metric_prefix,
-statsd_host_port   => $statsd_host,
+statsd_host_port   => $statsd,
 }
 
 # Make sure varnishes are configured and started for the first time
 # before the instances as well, or they fail to start initially...
 Service <| tag == 'varnish_instance' |> -> 
Varnishkafka::Instance['webrequest-jumbo-duplicate']
-
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Fix crasher in Cite - don't assume well-formedness

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403063 )

Change subject: Linter: Fix crasher in Cite - don't assume well-formedness
..

Linter: Fix crasher in Cite - don't assume well-formedness

Change-Id: Ie5da61934b91f115b0eea995e05de6c231d77bdb
---
M lib/ext/Cite/index.js
1 file changed, 5 insertions(+), 2 deletions(-)


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

diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index d7f8f02..6e177d3 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -183,8 +183,11 @@
 
 Ref.prototype.lintHandler = function(ref, env, tplInfo, domLinter) {
var linkBackId = ref.firstChild.getAttribute('href').replace(/[^#]*#/, 
'');
-   var refContent = ref.ownerDocument.getElementById(linkBackId).lastChild;
-   domLinter(refContent, env, tplInfo.isTemplated ? tplInfo : null);
+   var refNode = ref.ownerDocument.getElementById(linkBackId)
+   if (refNode) {
+   // Ex: Buggy input wikitext without ref content
+   domLinter(refNode.lastChild, env, tplInfo.isTemplated ? tplInfo 
: null);
+   }
return ref.nextNode;
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5da61934b91f115b0eea995e05de6c231d77bdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Use SVGO option of 'grunt-image' for distribution

[jenkins-bot (Code Review)]

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

Change subject: build: Use SVGO option of 'grunt-image' for distribution
..


build: Use SVGO option of 'grunt-image' for distribution

The `minify` task group now uses SVGO for further minification of
the distributed SVGs, based on MediaWiki's SVG Coding Conventions.

This also provides the task `grunt image:srcSvgs` for manual running
to find potential fixes to SVGs whilst maintaining their unminified
status.

Change-Id: I88e83c0a183b38679978b8c75f5ffd6dee9b09ec
---
M Gruntfile.js
M src/themes/apex/images/icons/attachment-ltr.svg
M src/themes/apex/images/icons/attachment-rtl.svg
M src/themes/apex/images/icons/draggable.svg
M src/themes/apex/images/icons/ellipsis.svg
M src/themes/apex/images/icons/italic-s.svg
M src/themes/apex/images/icons/language-ltr.svg
M src/themes/apex/images/icons/lightbulb.svg
M src/themes/apex/images/icons/markup.svg
M src/themes/wikimediaui/images/icons/attachment-ltr.svg
M src/themes/wikimediaui/images/icons/attachment-rtl.svg
M src/themes/wikimediaui/images/icons/draggable.svg
M src/themes/wikimediaui/images/icons/ellipsis.svg
M src/themes/wikimediaui/images/icons/italic-s.svg
M src/themes/wikimediaui/images/icons/language-ltr.svg
M src/themes/wikimediaui/images/icons/lightbulb.svg
M src/themes/wikimediaui/images/icons/markup.svg
17 files changed, 57 insertions(+), 30 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 2d98d29..0eeb524 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -341,7 +341,38 @@
}
},
image: {
-   dist: {
+   srcSvgs: {
+   options: {
+   svgo: [
+   '--pretty',
+   '--enable=removeRasterImages',
+   '--enable=sortAttrs',
+   '--disable=cleanupIDs',
+   '--disable=removeDesc',
+   '--disable=removeTitle',
+   '--disable=removeViewBox',
+   '--disable=removeXMLProcInst'
+   ]
+   },
+   expand: true,
+   src: 'src/**/*.svg'
+   },
+   distSvgs: {
+   options: {
+   svgo: [
+   '--enable=cleanupIDs',
+   '--enable=removeRasterImages',
+   '--enable=sortAttrs',
+   '--disable=removeDesc',
+   '--disable=removeTitle',
+   '--disable=removeViewBox',
+   '--disable=removeXMLProcInst'
+   ]
+   },
+   expand: true,
+   src: 'dist/**/*.svg'
+   },
+   distPngs: {
options: {
zopflipng: true,
pngout: true,
@@ -636,7 +667,7 @@
] );
 
// Minification tasks for the npm publish step
-   grunt.registerTask( 'minify', [ 'uglify', 'image', 'cssmin' ] );
+   grunt.registerTask( 'minify', [ 'uglify', 'image:distSvgs', 
'image:distPngs', 'cssmin' ] );
grunt.registerTask( 'publish-build', [ 'build', 'minify' ] );
 
grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint', 
'banana' ] );
diff --git a/src/themes/apex/images/icons/attachment-ltr.svg 
b/src/themes/apex/images/icons/attachment-ltr.svg
index 8cad782..284677c 100644
--- a/src/themes/apex/images/icons/attachment-ltr.svg
+++ b/src/themes/apex/images/icons/attachment-ltr.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-   
+
 
diff --git a/src/themes/apex/images/icons/attachment-rtl.svg 
b/src/themes/apex/images/icons/attachment-rtl.svg
index 4699008..30b10dc 100644
--- a/src/themes/apex/images/icons/attachment-rtl.svg
+++ b/src/themes/apex/images/icons/attachment-rtl.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-   
+
 
diff --git a/src/themes/apex/images/icons/draggable.svg 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove Special:MobileOptions/Languages

[Jdlrobson (Code Review)]

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

Change subject: Remove Special:MobileOptions/Languages
..

Remove Special:MobileOptions/Languages

This was added back in 2012
In the old version of the language overlay when a language
did not exist we linked to this page. We don't do that anymore
since the new language overlay we launched in August 2016.

It's not linked to anywhere in the UI.

Should probably remove as it caused me a big surprise to not only
see it existed but to see I wrote the code haha

Change-Id: I9c7cca88c4f3df42f2ced93b72011f18d911acce
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialMobileOptions.php
3 files changed, 3 insertions(+), 83 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index d946136..bd0c5bb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -201,7 +201,6 @@
"mobile-frontend-settings-tagline": "Reading preferences",
"mobile-frontend-settings-beta": "Beta",
"mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
-   "mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
"mobile-frontend-settings-save": "Settings were saved successfully.",
"mobile-frontend-talk-fullpage": "Read as wiki page",
"mobile-frontend-talk-add-overlay-content-placeholder": "What is on 
your mind?",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ab92dfc..7229faf 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -202,7 +202,6 @@
"mobile-frontend-settings-tagline": "Tagline for Special:MobileOptions 
- will show under heading",
"mobile-frontend-settings-beta": "Text for beta on settings 
page.\n{{Identical|Beta}}",
"mobile-frontend-settings-site-description": "Shown on 
[[Special:MobileOptions]]. Parameters:\n* $1 - the number of other language 
versions for this wiki",
-   "mobile-frontend-settings-site-header": "Heading for the 
Special:MobileOptions/Language page - only visible to non JavaScript users",
"mobile-frontend-settings-save": "Notification which shows to user when 
settings are saved.",
"mobile-frontend-talk-fullpage": "Used as label for link to the talk 
page (Talk:ArticleName) in Talk Overlay.",
"mobile-frontend-talk-add-overlay-content-placeholder": "Placeholder 
text to prompt user to add content to talk page content",
diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/specials/SpecialMobileOptions.php
index ebb9364..2019570 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -8,11 +8,6 @@
private $returnToTitle;
/** @var boolean $hasDesktopVersion Whether this special page has a 
desktop version or not */
protected $hasDesktopVersion = true;
-   /** @var array $options Used in the execute() function as a map of 
subpages to
-functions that are executed when the request method is defined. */
-   private $options = [
-   'Language' => [ 'get' => 'chooseLanguage' ],
-   ];
 
/**
 * Construct function
@@ -44,24 +39,11 @@
$this->setHeaders();
$context->setForceMobileView( true );
$context->setContentTransformations( false );
-   // check, if the subpage has a registered function, that needs 
to be executed
-   if ( isset( $this->options[$par] ) ) {
-   $option = $this->options[$par];
 
-   // select the correct function for the given request 
method (post, get)
-   if ( $this->getRequest()->wasPosted() && isset( 
$option['post'] ) ) {
-   $func = $option['post'];
-   } else {
-   $func = $option['get'];
-   }
-   // run the function
-   $this->$func();
+   if ( $this->getRequest()->wasPosted() ) {
+   $this->submitSettingsForm();
} else {
-   if ( $this->getRequest()->wasPosted() ) {
-   $this->submitSettingsForm();
-   } else {
-   $this->addSettingsForm();
-   }
+   $this->addSettingsForm();
}
}
 
@@ -143,59 +125,6 @@
}
 
/**
-* Get a list of languages available for this project
-* @return string parsed Html
-*/
-   private function getSiteSelector() {
-   $selector = '';
-   $count = 0;
-   $language = $this->getLanguage();
-   

[MediaWiki-commits] [Gerrit] labs/private[master]: Mv varnishkafka profile certificate::ssl_key_password

[Ottomata (Code Review)]

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

Change subject: Mv varnishkafka profile certificate::ssl_key_password
..


Mv varnishkafka profile certificate::ssl_key_password

Change-Id: Ie86b713a3e4dbbf9851ffd9555b60b11a502fa22
---
A hieradata/common/profile/cache/kafka/certificate.yaml
D hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/common/profile/cache/kafka/certificate.yaml 
b/hieradata/common/profile/cache/kafka/certificate.yaml
new file mode 100644
index 000..6309e57
--- /dev/null
+++ b/hieradata/common/profile/cache/kafka/certificate.yaml
@@ -0,0 +1 @@
+profile::cache::kafka::certificate::ssl_key_password: 'this_is_not_a_secret'
diff --git a/hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml 
b/hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml
deleted file mode 100644
index fb545c3..000
--- a/hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml
+++ /dev/null
@@ -1 +0,0 @@
-profile::cache::kafka::webrequest::jumbo::ssl_key_password: 
'this_is_not_a_secret'

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

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

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

[MediaWiki-commits] [Gerrit] labs/private[master]: Mv varnishkafka profile certificate::ssl_key_password

[Ottomata (Code Review)]

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

Change subject: Mv varnishkafka profile certificate::ssl_key_password
..

Mv varnishkafka profile certificate::ssl_key_password

Change-Id: Ie86b713a3e4dbbf9851ffd9555b60b11a502fa22
---
A hieradata/common/profile/cache/kafka/certificate.yaml
D hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/61/403061/1

diff --git a/hieradata/common/profile/cache/kafka/certificate.yaml 
b/hieradata/common/profile/cache/kafka/certificate.yaml
new file mode 100644
index 000..6309e57
--- /dev/null
+++ b/hieradata/common/profile/cache/kafka/certificate.yaml
@@ -0,0 +1 @@
+profile::cache::kafka::certificate::ssl_key_password: 'this_is_not_a_secret'
diff --git a/hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml 
b/hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml
deleted file mode 100644
index fb545c3..000
--- a/hieradata/common/profile/cache/kafka/webrequest/jumbo.yaml
+++ /dev/null
@@ -1 +0,0 @@
-profile::cache::kafka::webrequest::jumbo::ssl_key_password: 
'this_is_not_a_secret'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie86b713a3e4dbbf9851ffd9555b60b11a502fa22
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::jobrunner: move firewall includes to role

[Dzahn (Code Review)]

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

Change subject: mediawiki::jobrunner: move firewall includes to role
..


mediawiki::jobrunner: move firewall includes to role

Change-Id: I39392adbe87f5de5492bd445c9e14035b4c02110
---
M manifests/site.pp
M modules/role/manifests/mediawiki/jobrunner.pp
2 files changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 831f574..4e6abe4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1544,13 +1544,11 @@
 # ROW A eqiad jobrunners
 node /^mw1(299|30[0-6])\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 # ROW C eqiad jobrunners
 node /^mw133[4-7]\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 
@@ -1568,7 +1566,6 @@
 # ROW A eqiad jobrunners
 node /^mw13(0[89]|1[01])\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 # ROW A videoscaler
@@ -1621,7 +1618,6 @@
 #mw2153-62 are jobrunners
 node /^mw21(5[3-9]|6[0-2])\.codfw\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 #mw2163-mw2199 are appservers
@@ -1659,7 +1655,6 @@
 # mw2247-2250 are jobrunners
 node /^mw22(4[3789]|50)\.codfw\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 #mw2251-2253 are api-appservers
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp 
b/modules/role/manifests/mediawiki/jobrunner.pp
index 81abbcc..5e0a434 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -2,6 +2,8 @@
 class role::mediawiki::jobrunner {
 system::role { 'mediawiki::jobrunner': }
 
+include ::profile::base::firewall
+
 # Parent role (we don't use inheritance by choice)
 include ::role::mediawiki::common
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to d20915c

[jenkins-bot (Code Review)]

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

Change subject: Update mobileapps to d20915c
..


Update mobileapps to d20915c

List of changes:
94845db Show MW API requests when debug is true
2fc6c01 Restore diff tests
835257d Update read-html tests to use new 'section' selector
978a550 Revert "Skip some tests because of upstream issues"
5eb3f42 Hygiene: Update diff results to fix tests
25df32d Update tests to allow for testing arbitrary RESTBase installations
afb6ab3 Hygiene: Move test request from enwiki beta to testwiki
9b9de8b Summary: return type=mainpage for project main pages
c220bf6 Revert "Stop getting dc:lastmodified"
d06b090 Summary: Make timestamp refer to the requested revision
65fd0a9 Further cleanup of lib/most-read
d20915c Show MW API requests when env var DEBUG_MW_REQUESTS is set
xxx Update node module dependencies

Change-Id: I87aeaa3e93732faa852467bf5247a5cc2df3a007
---
M node_modules/kad/package.json
M node_modules/pinkie/package.json
M node_modules/swagger-ui/package.json
M src
4 files changed, 10 insertions(+), 11 deletions(-)

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



diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 20a5480..8281d61 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "0be082c35b1022209607b4521984b00bb5361541",
+  "_shasum": "4d538ea742189c07f4b62c9319ebe5cf97afb16d",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/pinkie/package.json b/node_modules/pinkie/package.json
index 0e88c78..7aaf31b 100644
--- a/node_modules/pinkie/package.json
+++ b/node_modules/pinkie/package.json
@@ -17,12 +17,12 @@
   "_id": "pinkie@2.0.4",
   "_inCache": true,
   "_location": "/pinkie",
-  "_nodeVersion": "4.2.4",
+  "_nodeVersion": "0.0.0-fake",
   "_npmUser": {
-"name": "floatdrop",
-"email": "floatd...@gmail.com"
+"name": "npm",
+"email": "supp...@npmjs.com"
   },
-  "_npmVersion": "2.14.12",
+  "_npmVersion": "0.0.0-fake",
   "_phantomChildren": {},
   "_requested": {
 "raw": "pinkie@^2.0.0",
@@ -70,8 +70,7 @@
   "files": [
 "index.js"
   ],
-  "gitHead": "8d4a92447a5c62bff9f89756caeb4c9c8770579b",
-  "homepage": "https://github.com/floatdrop/pinkie;,
+  "homepage": "https://github.com/floatdrop/pinkie#readme;,
   "keywords": [
 "promise",
 "promises",
@@ -81,8 +80,8 @@
   "license": "MIT",
   "maintainers": [
 {
-  "name": "floatdrop",
-  "email": "floatd...@gmail.com"
+  "name": "puradox",
+  "email": "sambalana...@gmail.com"
 }
   ],
   "name": "pinkie",
diff --git a/node_modules/swagger-ui/package.json 
b/node_modules/swagger-ui/package.json
index 6d63165..32853bc 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541;,
-  "_shasum": "1807391ceb86fb1b72c76ff0b81a5f2ca012bc5a",
+  "_shasum": "5849854953a6fc495915c229f6ae0264dd7aa825",
   "_shrinkwrap": null,
   "_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_where": "/opt/service",
diff --git a/src b/src
index a4ba9fd..d20915c 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit a4ba9fd9059f64a6d8aac4a2cb8bb251ce757c8e
+Subproject commit d20915c1975c0d5792fdb030631a2d11b5d4f40e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87aeaa3e93732faa852467bf5247a5cc2df3a007
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mholloway 
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]: Nightly server: let MW releasers manage Jenkins

[RobH (Code Review)]

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

Change subject: Nightly server: let MW releasers manage Jenkins
..


Nightly server: let MW releasers manage Jenkins

Bug: T183972
Change-Id: Ibb01d135b131e976f6f18437fe38f92f10a2afd1
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 5abd19a..f028283 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -97,6 +97,8 @@
 gid: 711
 description: people who upload mediawiki releases
 members: [catrope, demon, hashar, legoktm, reedy, thcipriani]
+privileges: ['ALL = (jenkins) NOPASSWD: ALL',
+ 'ALL = NOPASSWD: /usr/bin/service jenkins *']
   releasers-mobile:
 gid: 712
 description: people who upload mobile app releases

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb01d135b131e976f6f18437fe38f92f10a2afd1
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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