[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: add function to calculate htpasswd entries

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334125 )

Change subject: wmflib: add function to calculate htpasswd entries
..


wmflib: add function to calculate htpasswd entries

This uses the modified md5 digest algorithm that libapr1 uses, which is
considered secure, instead of crypt() as the default ruby method does.

Change-Id: I926388e402630d2950936985418e0d68150ac733
---
A modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
1 file changed, 110 insertions(+), 0 deletions(-)

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



diff --git a/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb 
b/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
new file mode 100644
index 000..e6d9335
--- /dev/null
+++ b/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
@@ -0,0 +1,110 @@
+# == Function htpasswd( string $password, string $salt)
+#
+# Generate a password entry for a htpasswd file using the modified md5 digest
+# method from apr.
+#
+
+require 'digest/md5'
+require 'stringio'
+
+# This class is a conversion to puppet of htauth's methods
+# See https://github.com/copiousfreetime/htauth/blob/master/LICENSE for 
copying rights
+# Original code Copyright (c) 2008 Jeremy Hinegardner
+# Modifications Copyright (c) 2017 Giuseppe Lavagetto, Wikimedia Foundation, 
Inc.
+class Apr1Md5
+
+  DIGEST_LENGTH = 16
+
+  def initialize(salt)
+@salt = salt
+  end
+
+  def prefix
+"$apr1$"
+  end
+
+  # from 
https://github.com/copiousfreetime/htauth/blob/master/lib/htauth/algorithm.rb
+  # this is not the Base64 encoding, this is the to64() method from apr
+  SALT_CHARS = (%w( . / ) + ("0".."9").to_a + ('A'..'Z').to_a + 
('a'..'z').to_a).freeze
+  def to_64(number, rounds)
+r = StringIO.new
+rounds.times do
+  r.print(SALT_CHARS[number % 64])
+  number >>= 6
+end
+r.string
+  end
+
+
+  # this algorithm pulled straight from apr_md5_encode() and converted to ruby 
syntax
+  def encode(password)
+primary = ::Digest::MD5.new
+primary << password
+primary << prefix
+primary << @salt
+
+md5_t = ::Digest::MD5.digest("#{password}#{@salt}#{password}")
+
+l = password.length
+while l > 0
+  slice_size = (l > DIGEST_LENGTH) ? DIGEST_LENGTH : l
+  primary << md5_t[0, slice_size]
+  l -= DIGEST_LENGTH
+end
+
+# weirdness
+l = password.length
+while l != 0
+  case (l & 1)
+  when 1
+primary << 0.chr
+  when 0
+primary << password[0, 1]
+  end
+  l >>= 1
+end
+
+pd = primary.digest
+
+encoded_password = "#{prefix}#{@salt}$"
+
+# apr_md5_encode has this comment about a 60Mhz Pentium above this loop.
+1000.times do |x|
+  ctx = ::Digest::MD5.new
+  ctx << (((x & 1) == 1) ? password : pd[0, DIGEST_LENGTH])
+  (ctx << @salt) unless (x % 3) == 0
+  (ctx << password) unless (x % 7) == 0
+  ctx << (((x & 1) == 0) ? password : pd[0, DIGEST_LENGTH])
+  pd = ctx.digest
+end
+
+
+pd = pd.bytes.to_a
+
+l = (pd[0] << 16) | (pd[6] << 8) | pd[12]
+encoded_password << to_64(l, 4)
+
+l = (pd[1] << 16) | (pd[7] << 8) | pd[13]
+encoded_password << to_64(l, 4)
+
+l = (pd[2] << 16) | (pd[8] << 8) | pd[14]
+encoded_password << to_64(l, 4)
+
+l = (pd[3] << 16) | (pd[9] << 8) | pd[15]
+encoded_password << to_64(l, 4)
+
+l = (pd[4] << 16) | (pd[10] << 8) | pd[ 5]
+encoded_password << to_64(l, 4)
+encoded_password << to_64(pd[11], 2)
+
+encoded_password
+  end
+end
+
+
+module Puppet::Parser::Functions
+  newfunction(:htpasswd, :type => :rvalue, :arity => 2) do |args|
+generator = Apr1Md5.new args[1]
+generator.encode args[0]
+  end
+end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I926388e402630d2950936985418e0d68150ac733
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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]: site.pp: Change active master for enwiki

[Marostegui (Code Review)]

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

Change subject: site.pp: Change active master for enwiki
..


site.pp: Change active master for enwiki

This changes the active enwiki master from db1057 to db1052

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 153d652..c0e23ae 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -411,18 +411,18 @@
 
 # s1 (enwiki) core production dbs on eqiad
 # eqiad master
-node 'db1057.eqiad.wmnet' {
+node 'db1052.eqiad.wmnet' {
 class { '::role::mariadb::core':
 shard => 's1',
 master=> true,
 binlog_format => 'STATEMENT',
 }
 }
-# soon-to-be master
-node 'db1052.eqiad.wmnet' {
+# old master
+node 'db1057.eqiad.wmnet' {
 class { '::role::mariadb::core':
 shard => 's1',
-master=> false,
+master=> true,
 binlog_format => 'STATEMENT',
 }
 }

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Change s1 master
..


db-eqiad.php: Change s1 master

db1052 is the new master

Bug: T156008
Change-Id: Ibbf4d812299a8d592c84a968d7f80c1f44d8cb6d
---
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 0f15281..7f00205 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -93,8 +93,8 @@
 
 'sectionLoads' => [
's1' => [
-   'db1057' => 0,   # C2 2.8TB  96GB, master
-#  'db1052' => 50,  # B3 2.8TB  96GB, old master
+   'db1052' => 0,   # B3 2.8TB  96GB, master
+#  'db1057' => 0,   # C2 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

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

[jenkins-bot (Code Review)]

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

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


db-eqiad.php: Depool db1052

db1052 is going to be the master in a few minutes. So depool it first

Bug: T156008
Change-Id: I7d8792e51f68837c84f924193a6f2fde8099a6d5
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 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/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 00ffc18..0f15281 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1057' => 0,   # C2 2.8TB  96GB, master
-   'db1052' => 50,  # B3 2.8TB  96GB, old master
+#  'db1052' => 50,  # B3 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: reduce db1052 load before switchover

[Jcrespo (Code Review)]

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

Change subject: mariadb: reduce db1052 load before switchover
..

mariadb: reduce db1052 load before switchover

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 00ffc18..1d75c03 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1057' => 0,   # C2 2.8TB  96GB, master
-   'db1052' => 50,  # B3 2.8TB  96GB, old master
+   'db1052' => 0,   # B3 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

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

[Marostegui (Code Review)]

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

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

db-eqiad.php: Depool db1052

db1052 is going to be the master in a few minutes. So depool it first

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 00ffc18..0f15281 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1057' => 0,   # C2 2.8TB  96GB, master
-   'db1052' => 50,  # B3 2.8TB  96GB, old master
+#  'db1052' => 50,  # B3 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d8792e51f68837c84f924193a6f2fde8099a6d5
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: Change s1 master

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Change s1 master
..

db-eqiad.php: Change s1 master

db1052 is the new master

Bug: T156008
Change-Id: Ibbf4d812299a8d592c84a968d7f80c1f44d8cb6d
---
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/42/334242/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 00ffc18..4f914cc 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -93,8 +93,8 @@
 
 'sectionLoads' => [
's1' => [
-   'db1057' => 0,   # C2 2.8TB  96GB, master
-   'db1052' => 50,  # B3 2.8TB  96GB, old master
+   'db1052' => 0,  # B3 2.8TB  96GB, master
+#  'db1057' => 0,   # C2 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Make the consumer registration form fields easier to understand

[jenkins-bot (Code Review)]

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

Change subject: Make the consumer registration form fields easier to understand
..


Make the consumer registration form fields easier to understand

Add some help text + fill out and lock email field since it only
accepts the current email anyway. Disable Special:OAuthConsumerRegistration
for users without a confirmed email address as they cannot register
consumers anyway.
Also drop some help text that was obsoleted by I8c2a2713.

Bug: T121330
Change-Id: I0999281b71d74f88303ac199b7aa4b18ac3818b6
---
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 25 insertions(+), 4 deletions(-)

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



diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php 
b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
index 982e1ce..e97398a 100644
--- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
@@ -20,6 +20,7 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
+use User;
 
 /**
  * Page that has registration request form and consumer update form
@@ -33,8 +34,18 @@
return true;
}
 
+   public function userCanExecute( User $user ) {
+   return $user->isEmailConfirmed();
+   }
+
+   function displayRestrictionError() {
+   throw new \PermissionsError( null, 
['mwoauthconsumerregistration-need-emailconfirmed'] );
+   }
+
public function execute( $par ) {
global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+
+   $this->checkPermissions();
 
$request = $this->getRequest();
$user = $this->getUser();
@@ -127,7 +138,10 @@
'email' => [
'type' => 'text',
'label-message' => 
'mwoauth-consumer-email',
-   'required' => true
+   'required' => true,
+   'readonly' => true,
+   'default' => $user->getEmail(),
+   'help-message' => 
'mwoauth-consumer-email-help',
],
'wiki' => [
'type' => $allWikis ? 
'combobox' : 'select',
@@ -187,6 +201,7 @@
'rsaKey' => [
'type' => 'textarea',
'label-message' => 
'mwoauth-consumer-rsakey',
+   'help-message' => 
'mwoauth-consumer-rsakey-help',
'required' => false,
'default' => '',
'rows' => 5
diff --git a/i18n/en.json b/i18n/en.json
index 7adcf5e..d8ead7e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,6 +20,7 @@
"mwoauth-consumer-user": "Publisher:",
"mwoauth-consumer-stage": "Current status:",
"mwoauth-consumer-email": "Contact email address:",
+   "mwoauth-consumer-email-help": "Only visible to those who are approving 
new consumers",
"mwoauth-consumer-owner-only-label": "Owner-only:",
"mwoauth-consumer-owner-only": "This consumer is for use only by $1.",
"mwoauth-consumer-owner-only-help": "Selecting this option will cause 
the consumer to be automatically approved and accepted for use by $1. It will 
not be usable by any other user, and the usual authorization flow will not 
function. Actions taken using this consumer will not be tagged.",
@@ -33,7 +34,8 @@
"mwoauth-consumer-wiki-thiswiki": "Current project ($1)",
"mwoauth-consumer-restrictions": "Usage restrictions:",
"mwoauth-consumer-restrictions-json": "Usage restrictions (JSON):",
-   "mwoauth-consumer-rsakey": "Public RSA key:",
+   "mwoauth-consumer-rsakey": "Public RSA key (optional):",
+   "mwoauth-consumer-rsakey-help": "Enter a public key to use the RSA-SHA1 
signature method. Leave empty to use HMAC-SHA1 with a random secret. If you are 
not sure which, leave it empty.",
"mwoauth-consumer-secretkey": "Consumer secret token:",
"mwoauth-consumer-accesstoken": "Access token:",
"mwoauth-consumer-reason": "Reason:",
@@ -64,7 +66,7 @@
"mwoauthconsumerregistration-propose": "Propose new consumer",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: rsync cron (WIP)

[Dzahn (Code Review)]

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

Change subject: aptrepo: rsync cron (WIP)
..

aptrepo: rsync cron (WIP)

Change-Id: I0f3570890d5c949db98763b3f1ad5bcb0f35d23c
---
M hieradata/common.yaml
M modules/aptrepo/manifests/rsync.pp
2 files changed, 19 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/334241/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 91638ec..2f6711a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -453,3 +453,4 @@
 
 deployment_server: tin.eqiad.wmnet
 install_server: carbon.wikimedia.org
+install_server_failover: install2001.wikimedia.org
diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index d8b333c..0f6c4d5 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -3,27 +3,41 @@
 class aptrepo::rsync {
 
 $primary_server = hiera('install_server', 'install1001.wikimedia.org')
+$secondary_server = hiera('install_server_failover', 
'install2001.wikimedia.org')
 
 # only activate rsync/firewall hole on the server that is NOT active
 if $::fqdn != $primary_server {
 
-$ensure = 'present'
+$ensure_ferm = 'present'
+$ensure_cron = 'absent'
+$ensure_sync = 'present'
+
 include rsync::server
 
 rsync::server::module { 'aptrepo':
-ensure  => $aptrepo::rsync::ensure,
+ensure  => $ensure_sync,
 path=> $aptrepo::basedir,
 read_only   => 'no',
 hosts_allow => $primary_server,
 }
 } else {
-$ensure = 'absent'
+$ensure_ferm = 'absent'
+$ensure_cron = 'present'
+   $ensure_sync = 'absent'
 }
 
 ferm::service { 'aptrepo-rsync':
-ensure => $aptrepo::rsync::ensure,
+ensure => $ensure_ferm,
 proto  => 'tcp',
 port   => '873',
 srange => "@resolve(${primary_server})",
 }
+
+cron { 'rsync-aptrepo 
+ensure => $ensure_cron,
+user   => 'root',
+command => "rsync -avp ${aptrepo::basedir} 
rsync://${secondary_server}/aptrepo',
+hour => '*/6',
+minute => '42',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Interwiki map update

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334240 )

Change subject: Interwiki map update
..

Interwiki map update

Bug: T156334
Change-Id: Icfbb3264eddab7e4861fc40d44213bf2c137e205
---
M wmf-config/interwiki.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index f18b6a3..384bfde 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,5 +1,5 @@
  '0 
http://www.acronymfinder.com/af-query.asp?String=exact=$1',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
@@ -301,6 +301,8 @@
'__global:usej' => '0 http://www.tejo.org/usej/$1',
'__global:usemod' => '0 http://www.usemod.com/cgi-bin/wiki.pl?$1',
'__global:usability' => '1 https://usability.wikimedia.org/wiki/$1',
+   '__global:utrs' => '0 https://utrs.wmflabs.org/appeal.php?id=$1',
+   '__global:utrs' => '0 https://utrs.wmflabs.org/appeal.php?id=$1',
'__global:vikidia' => '0 //fr.vikidia.org/wiki/$1',
'__global:vlos' => '0 http://www.thuvienkhoahoc.com/tusach/$1',
'__global:vkol' => '0 http://kol.coldfront.net/thekolwiki/index.php/$1',
@@ -11447,7 +11449,7 @@
'__global:meta' => '1 https://meta.wikimedia.org/wiki/$1',
'__global:sep11' => '1 https://sep11.wikipedia.org/wiki/$1',
'__global:d' => '1 https://www.wikidata.org/wiki/$1',
-   '__list:__global' => 'acronym advisory advogato aew appropedia 
aquariumwiki arborwiki arxiv atmwiki baden battlestarwiki bcnbio beacha 
betawiki betawikiversity bibcode bluwiki blw botwiki boxrec brickwiki bugzilla 
bulba c c2 c2find cache cellwiki centralwikia chej choralwiki citizendium 
ckwiss comixpedia commons communityscheme communitywiki comune creativecommons 
creativecommonswiki cxej d dbdump dcc dcdatabase dcma delicious devmo dict 
dictionary disinfopedia distributedproofreaders distributedproofreadersca dmoz 
dmozs doi donate doom_wiki download dpd drae dreamhost drumcorpswiki dwjwiki 
ecoreality ecxei elibre emacswiki encyc energiewiki englyphwiki enkol 
eokulturcentro esolang etherpad ethnologue ethnologuefamily evowiki exotica 
eĉei fanimutationwiki fedora finalfantasy finnix flickrphoto flickruser 
floralwiki foldoc forthfreak foundation foxwiki freebio freebsdman 
freeculturewiki freedomdefined freefeel freekiwiki freenode freesoft ganfyd 
gardenology gausswiki gentoo genwiki gerrit git globalvoices glossarwiki 
glossarywiki google googledefine googlegroups guildwarswiki guildwiki gutenberg 
gutenbergwiki h2wiki hackerspaces hammondwiki hdl heroeswiki horizon hrfwiki 
hrwiki hupwiki iarchive imdbcharacter imdbcompany imdbname imdbtitle incubator 
infosecpedia infosphere irc ircrc iso639-3 issn iuridictum jaglyphwiki javanet 
javapedia jefo jerseydatabase jira jspwiki jstor kamelo karlsruhe kinowiki 
kmwiki komicawiki kontuwiki koslarwiki labsconsole libreplanet linguistlist 
linuxwiki linuxwikide liswiki literateprograms livepedia localwiki lojban 
lostpedia lqwiki luxo m mail mailarchive mariowiki marveldatabase meatball 
mediawikiwiki mediazilla memoryalpha meta metawiki metawikimedia metawikipedia 
metawikisearch mineralienatlas moinmoin monstropedia mosapedia mozcom 
mozillawiki mozillazinekb musicbrainz mw mwod mwot nara nkcells nosmoke nost 
nostalgia oeis oldwikisource olpc onelook openlibrary openstreetmap openwetware 
openwiki opera7wiki organicdesign orthodoxwiki osmwiki otrs otrswiki ourmedia 
outreach outreachwiki owasp panawiki patwiki personaltelco petscan phab 
phabricator phpwiki phwiki planetmath pmeg pmid pokewiki pokéwiki policy 
proofwiki psycle pyrev pythoninfo pythonwiki pywiki quality quarry rcirc 
reuterswiki rev revo rfc rheinneckar robowiki rodovid rowiki rt rtfm s23wiki 
scholar schoolswp scores scoutwiki scramble seapig seattlewiki securewikidc 
semantic-mw senseislibrary sep11 sharemap silcode slashdot slwiki sourceforge 
spcom species squeak stats stewardry strategy strategywiki sulutil svn 
swinbrain swtrain tabwiki tclerswiki technorati tenwiki test2wiki testwiki 
testwikidata tfwiki thelemapedia theopedia thinkwiki ticket tmbw tmnet tmwiki 
toollabs tools translatewiki tswiki tviv tvtropes twiki tyvawiki uncyclopedia 
unihan unreal urbandict usability usej usemod viaf vikidia vkol vlos voipinfo 
votewiki werelate wg wikia wikiapiary wikiasite wikibooks wikichristian 
wikicities wikicity wikiconference wikidata wikif1 wikifur wikihow wikiindex 
wikilemon wikilivres wikilivresru wikimac-de wikimedia wikinews wikinfo 
wikinvest wikiotics wikipapers wikipedia wikipediawikipedia wikiquote 
wikiskripta wikisophia wikisource wikispecies wikispot wikitech wikiti wikitree 
wikiversity wikivoyage wikiwikiweb wiktionary wipipedia wlug wm2005 wm2006 
wm2007 wm2008 wm2009 wm2010 wm2011 wm2012 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use onAnchor for sanitizing link href's as well

[jenkins-bot (Code Review)]

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

Change subject: Use onAnchor for sanitizing link href's as well
..


Use onAnchor for sanitizing link href's as well

 * Mainly for redirects.  These are generated the same way in the link
   handler.

 * Fixes another of the regressions in the chain following fa6906a,
   643d539 and 8b552f0e.

 * Also, by skipping literal html in onAnchor, we avoid assertions from
   wikitext like, "haha"

Change-Id: Ia5b408e25dcdfb4ac30e784af2b724ffdf870610
---
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
2 files changed, 25 insertions(+), 8 deletions(-)

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



diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 65a0b0c..622e36c 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -602,7 +602,7 @@
var res = [];
var sanitizer = this;
tokens.forEach(function(token) {
-   if (token.name && token.name === 'a') {
+   if (token.name && (token.name === 'a' || token.name === 
'link')) {
token = sanitizer.onAnchor(token).token;
}
res.push(sanitizer.onAny(token).token);
@@ -626,6 +626,7 @@
 Sanitizer.prototype.register = function(manager) {
this.manager = manager;
manager.addTransform(this.onAnchor.bind(this), "Sanitizer:onAnchor", 
this.handledRank, 'tag', 'a');
+   manager.addTransform(this.onAnchor.bind(this), "Sanitizer:onAnchor", 
this.handledRank, 'tag', 'link');
manager.addTransform(this.onAny.bind(this), "Sanitizer:onAny", 
this.anyRank, 'any');
 };
 
@@ -661,7 +662,9 @@
 };
 
 Sanitizer.prototype.onAnchor = function(token) {
-   if (token.constructor === EndTagTk) {
+   // Literal html tokens weren't generated by us and should fall back to 
the
+   // plaintext conversion in onAny.
+   if (token.constructor === EndTagTk || Util.isHTMLTag(token)) {
return { token: token };
}
var hrefKV = Util.lookupKV(token.attribs, 'href');
@@ -690,7 +693,10 @@
  */
 Sanitizer.prototype.onAny = function(token) {
var env = this.manager.env;
-   env.log("trace/sanitizer", this.manager.pipelineId, function() { return 
JSON.stringify(token); });
+   env.log("trace/sanitizer", this.manager.pipelineId, function() {
+   return JSON.stringify(token);
+   });
+
// Pass through a transparent line meta-token
if (Util.isEmptyLineMetaToken(token)) {
env.log("trace/sanitizer", this.manager.pipelineId, 
"--unchanged--");
@@ -700,11 +706,12 @@
var i, l, k, v, kv;
var attribs = token.attribs;
var noEndTagSet = this.constants.noEndTagSet;
+   var tagWhiteList = WikitextConstants.Sanitizer.TagWhiteList;
 
-   if (Util.isHTMLTag(token) &&
-   
(!WikitextConstants.Sanitizer.TagWhiteList.has(token.name.toUpperCase()) ||
-   (token.constructor === EndTagTk && 
noEndTagSet.has(token.name)))
-   ) { // unknown tag -- convert to plain text
+   if (Util.isHTMLTag(token) && (
+   !tagWhiteList.has(token.name.toUpperCase()) ||
+   (token.constructor === EndTagTk && noEndTagSet.has(token.name))
+   )) { // unknown tag -- convert to plain text
if (!this.options.inTemplate && token.dataAttribs.tsr) {
// Just get the original token source, so that we can 
avoid
// whitespace differences.
@@ -767,7 +774,9 @@
}
}
 
-   env.log("trace/sanitizer", this.manager.pipelineId, function() { return 
" ---> " + JSON.stringify(token); });
+   env.log("trace/sanitizer", this.manager.pipelineId, function() {
+   return " ---> " + JSON.stringify(token);
+   });
return { token: token };
 };
 
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 8b9720d..4f40a28 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7866,6 +7866,14 @@
 !! end
 
 !! test
+Redirect containing double quotes and spaces
+!! wikitext
+#REDIRECT [[Cool "Gator"]]
+!! html/parsoid
+
+!! end
+
+!! test
 Link containing double-single-quotes '' in text (bug 4598 sanity check)
 !! wikitext
 Some [[Link|pretty ''italics'' and stuff]]!

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Typo fixes

[jenkins-bot (Code Review)]

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

Change subject: Typo fixes
..


Typo fixes

Change-Id: Iec5118451103286277a9a0ab96276b087feb1ff7
---
M includes/Search/TextIndexField.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Search/TextIndexField.php 
b/includes/Search/TextIndexField.php
index a939580..a6a0a5d 100644
--- a/includes/Search/TextIndexField.php
+++ b/includes/Search/TextIndexField.php
@@ -90,7 +90,7 @@
 
/**
 * @param SearchEngine $engine
-* @return array|void
+* @return array
 */
public function getMapping( SearchEngine $engine ) {
if (!($engine instanceof \CirrusSearch)) {
@@ -171,7 +171,7 @@
/**
 * Adapt the field options according to the highlighter used
 * @var mixed[] &$field the mapping options being built
-* @var sting[] $subFields list of subfields to configure
+* @var string[] $subFields list of subfields to configure
 * @var bool $rootField configure the root field (defaults to true)
 */
protected function configureHighlighting( array &$field, array 
$subFields, $rootField = true ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec5118451103286277a9a0ab96276b087feb1ff7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Tjones 
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]: refreshLinks.php: allow refreshing by categories, tracking o...

[jenkins-bot (Code Review)]

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

Change subject: refreshLinks.php: allow refreshing by categories, tracking or 
not
..


refreshLinks.php: allow refreshing by categories, tracking or not

Needed for selective updates of pages using a particular feature.
Intended to be run in production, so needs to scale.

Bug: T149723
Change-Id: If20fb1f91de8d4227def5b07d6d52b91161ed3fd
---
M RELEASE-NOTES-1.29
M autoload.php
A includes/TrackingCategories.php
M includes/parser/ParserOutput.php
M includes/specials/SpecialTrackingCategories.php
M maintenance/refreshLinks.php
6 files changed, 239 insertions(+), 104 deletions(-)

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



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index d0738e2..3bf50ac 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -206,6 +206,8 @@
 * Article::doEditContent() was marked as deprecated, to be removed in 1.30
   or later.
 * ContentHandler::runLegacyHooks() was removed.
+* refreshLinks.php now can be limited to a particular category with 
--category=...
+  or a tracking category with --tracking-category=...
 
 == Compatibility ==
 
diff --git a/autoload.php b/autoload.php
index 7ed08df..e7c97ad 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1459,6 +1459,7 @@
'TitlePrefixSearch' => __DIR__ . '/includes/PrefixSearch.php',
'TitleValue' => __DIR__ . '/includes/title/TitleValue.php',
'TrackBlobs' => __DIR__ . '/maintenance/storage/trackBlobs.php',
+   'TrackingCategories' => __DIR__ . '/includes/TrackingCategories.php',
'TraditionalImageGallery' => __DIR__ . 
'/includes/gallery/TraditionalImageGallery.php',
'TransactionProfiler' => __DIR__ . 
'/includes/libs/rdbms/TransactionProfiler.php',
'TransformParameterError' => __DIR__ . 
'/includes/media/MediaTransformOutput.php',
diff --git a/includes/TrackingCategories.php b/includes/TrackingCategories.php
new file mode 100644
index 000..825860a
--- /dev/null
+++ b/includes/TrackingCategories.php
@@ -0,0 +1,130 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Categories
+ */
+
+/**
+ * This class performs some operations related to tracking categories, such as 
creating
+ * a list of all such categories.
+ */
+class TrackingCategories {
+   /** @var Config */
+   private $config;
+
+   /**
+* Tracking categories that exist in core
+*
+* @var array
+*/
+   private static $coreTrackingCategories = [
+   'index-category',
+   'noindex-category',
+   'duplicate-args-category',
+   'expensive-parserfunction-category',
+   'post-expand-template-argument-category',
+   'post-expand-template-inclusion-category',
+   'hidden-category-category',
+   'broken-file-category',
+   'node-count-exceeded-category',
+   'expansion-depth-exceeded-category',
+   'restricted-displaytitle-ignored',
+   'deprecated-self-close-category',
+   ];
+
+   /**
+* @param Config $config
+*/
+   public function __construct( Config $config ) {
+   $this->config = $config;
+   }
+
+   /**
+* Read the global and extract title objects from the corresponding 
messages
+* @return array Array( 'msg' => Title, 'cats' => Title[] )
+*/
+   public function getTrackingCategories() {
+   $categories = array_merge(
+   self::$coreTrackingCategories,
+   ExtensionRegistry::getInstance()->getAttribute( 
'TrackingCategories' ),
+   $this->config->get( 'TrackingCategories' ) // deprecated
+   );
+
+   // Only show magic link tracking categories if they are enabled
+   $enableMagicLinks = $this->config->get( 'EnableMagicLinks' );
+   if ( $enableMagicLinks['ISBN'] ) {
+   $categories[] = 'magiclink-tracking-isbn';
+   }
+   if ( $enableMagicLinks['RFC'] ) {
+   $categories[] = 'magiclink-tracking-rfc';
+   }
+   if ( $enableMagicLinks['PMID'] ) {
+   $categories[] = 'magiclink-tracking-pmid';
+   }
+
+   $trackingCategories = [];
+   foreach ( $categories as $catMsg ) {
+   /*
+* Check if the tracking category varies by namespace
+* Otherwise only pages in the current namespace will 
be displayed
+* If it does vary, show pages considering all 
namespaces
+*/
+   $msgObj = wfMessage( $catMsg )->inContentLanguage();
+   $allCats = 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fixing grammar, capitalization and spelling in comments

[jenkins-bot (Code Review)]

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

Change subject: Fixing grammar, capitalization and spelling in comments
..


Fixing grammar, capitalization and spelling in comments

Change-Id: Iac80f6668be17c0e35908fc8fdacbae0201f2d7f
---
M includes/db/DatabaseMssql.php
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  Zppix: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 7c4bb3b..d567d8b 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -94,7 +94,7 @@
}
 
// Decide which auth scenerio to use
-   // if we are using Windows auth, don't add credentials to 
$connectionInfo
+   // if we are using Windows auth, then don't add credentials to 
$connectionInfo
if ( !$wgDBWindowsAuthentication ) {
$connectionInfo['UID'] = $user;
$connectionInfo['PWD'] = $password;
@@ -151,10 +151,10 @@
$this->offset = 0;
 
// several extensions seem to think that all databases support 
limits
-   // via LIMIT N after the WHERE clause well, MSSQL uses SELECT 
TOP N,
+   // via LIMIT N after the WHERE clause, but  MSSQL uses SELECT 
TOP N,
// so to catch any of those extensions we'll do a quick check 
for a
// LIMIT clause and pass $sql through $this->LimitToTopN() 
which parses
-   // the limit clause and passes the result to 
$this->limitResult();
+   // the LIMIT clause and passes the result to 
$this->limitResult();
if ( preg_match( '/\bLIMIT\s*/i', $sql ) ) {
// massage LIMIT -> TopN
$sql = $this->LimitToTopN( $sql );
@@ -187,7 +187,7 @@
$success = (bool)$stmt;
}
 
-   // make a copy so that anything we add below does not get 
reflected in future queries
+   // Make a copy to ensure what we add below does not get 
reflected in future queries
$ignoreErrors = $this->mIgnoreErrors;
 
if ( $this->mIgnoreDupKeyErrors ) {
@@ -520,7 +520,7 @@
public function indexInfo( $table, $index, $fname = __METHOD__ ) {
# This does not return the same info as MYSQL would, but that's 
OK
# because MediaWiki never uses the returned value except to 
check for
-   # the existance of indexes.
+   # the existence of indexes.
$sql = "sp_helpindex '" . $this->tableName( $table ) . "'";
$res = $this->query( $sql, $fname );
 
@@ -609,7 +609,7 @@
 
foreach ( $arrToInsert as $a ) {
// start out with empty identity column, this is so we 
can return
-   // it as a result of the insert logic
+   // it as a result of the INSERT logic
$sqlPre = '';
$sqlPost = '';
$identityClause = '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac80f6668be17c0e35908fc8fdacbae0201f2d7f
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Skizzerz 
Gerrit-Reviewer: Zppix 
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]: Inject remaining cache objects into MessageCache

[jenkins-bot (Code Review)]

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

Change subject: Inject remaining cache objects into MessageCache
..


Inject remaining cache objects into MessageCache

Change-Id: I431d6e9b443a00fdc1b65adb90ae9de496242f81
---
M includes/cache/MessageCache.php
1 file changed, 31 insertions(+), 26 deletions(-)

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



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 352a94c..3724f13 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -89,10 +89,12 @@
 */
protected $mInParser = false;
 
-   /** @var BagOStuff */
-   protected $mMemc;
/** @var WANObjectCache */
protected $wanCache;
+   /** @var BagOStuff */
+   protected $clusterCache;
+   /** @var BagOStuff */
+   protected $srvCache;
 
/**
 * Singleton instance
@@ -109,9 +111,13 @@
 */
public static function singleton() {
if ( self::$instance === null ) {
-   global $wgUseDatabaseMessages, $wgMsgCacheExpiry;
+   global $wgUseDatabaseMessages, $wgMsgCacheExpiry, 
$wgUseLocalMessageCache;
self::$instance = new self(
+   
MediaWikiServices::getInstance()->getMainWANObjectCache(),
wfGetMessageCacheStorage(),
+   $wgUseLocalMessageCache
+   ? 
MediaWikiServices::getInstance()->getLocalServerObjectCache()
+   : new EmptyBagOStuff(),
$wgUseDatabaseMessages,
$wgMsgCacheExpiry
);
@@ -149,24 +155,25 @@
}
 
/**
-* @param BagOStuff $memCached A cache instance. If none, fall back to 
CACHE_NONE.
-* @param bool $useDB
+* @param WANObjectCache $wanCache WAN cache instance
+* @param BagOStuff $clusterCache Cluster cache instance
+* @param BagOStuff $srvCache Server cache instance
+* @param bool $useDB Whether to look for message overrides (e.g. 
MediaWiki: pages)
 * @param int $expiry Lifetime for cache. @see $mExpiry.
 */
-   function __construct( BagOStuff $memCached, $useDB, $expiry ) {
-   global $wgUseLocalMessageCache;
+   public function __construct(
+   WANObjectCache $wanCache,
+   BagOStuff $clusterCache,
+   BagOStuff $srvCache,
+   $useDB,
+   $expiry
+   ) {
+   $this->wanCache = $wanCache;
+   $this->clusterCache = $clusterCache;
+   $this->srvCache = $srvCache;
 
-   $this->mMemc = $memCached;
$this->mDisable = !$useDB;
$this->mExpiry = $expiry;
-
-   if ( $wgUseLocalMessageCache ) {
-   $this->localCache = 
MediaWikiServices::getInstance()->getLocalServerObjectCache();
-   } else {
-   $this->localCache = new EmptyBagOStuff();
-   }
-
-   $this->wanCache = ObjectCache::getMainWANInstance();
}
 
/**
@@ -203,7 +210,7 @@
protected function getLocalCache( $code ) {
$cacheKey = wfMemcKey( __CLASS__, $code );
 
-   return $this->localCache->get( $cacheKey );
+   return $this->srvCache->get( $cacheKey );
}
 
/**
@@ -214,7 +221,7 @@
 */
protected function saveToLocalCache( $code, $cache ) {
$cacheKey = wfMemcKey( __CLASS__, $code );
-   $this->localCache->set( $cacheKey, $cache );
+   $this->srvCache->set( $cacheKey, $cache );
}
 
/**
@@ -300,7 +307,7 @@
# below, and use the local stale value 
if it was not acquired.
$where[] = 'global cache is presumed 
expired';
} else {
-   $cache = $this->mMemc->get( $cacheKey );
+   $cache = $this->clusterCache->get( 
$cacheKey );
if ( !$cache ) {
$where[] = 'global cache is 
empty';
} elseif ( $this->isCacheExpired( 
$cache ) ) {
@@ -381,12 +388,10 @@
 * @return bool|string True on success or one of ("cantacquire", 
"disabled")
 */
protected function loadFromDBWithLock( $code, array &$where, $mode = 
null ) {
-   global $wgUseLocalMessageCache;
-
# If cache updates on all 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: fix rsyncd 'hosts allow' syntax

[Dzahn (Code Review)]

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

Change subject: aptrepo: fix rsyncd 'hosts allow' syntax
..


aptrepo: fix rsyncd 'hosts allow' syntax

In the rsyncd 'hosts allow' we can use either hostnames
or IPs or wildcards. But this resulted in a literal 'resolve'
in the rsyncd config and that was not intended and fails.

Bug: T132757
Bug: T843380
Change-Id: Ibca80da18f41571e885107773011aae80f514641
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index b56ffd7..d8b333c 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -10,11 +10,11 @@
 $ensure = 'present'
 include rsync::server
 
-rsync::server::module { 'aptrepo-basedir':
+rsync::server::module { 'aptrepo':
 ensure  => $aptrepo::rsync::ensure,
 path=> $aptrepo::basedir,
 read_only   => 'no',
-hosts_allow => "@resolve(${primary_server})",
+hosts_allow => $primary_server,
 }
 } else {
 $ensure = 'absent'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Get rid of onAnchor in sanitizer

[Arlolra (Code Review)]

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

Change subject: Get rid of onAnchor in sanitizer
..

Get rid of onAnchor in sanitizer

 * It's redundant.

Change-Id: Ia50770b52856101bf42dbffbcc7851611dec22c3
---
M lib/wt2html/tt/Sanitizer.js
1 file changed, 11 insertions(+), 39 deletions(-)


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

diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 622e36c..1adf63c 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -599,15 +599,9 @@
  * TODO: Move to Util / generalize when working on T54941?
  */
 Sanitizer.prototype.sanitizeTokens = function(tokens) {
-   var res = [];
-   var sanitizer = this;
-   tokens.forEach(function(token) {
-   if (token.name && (token.name === 'a' || token.name === 
'link')) {
-   token = sanitizer.onAnchor(token).token;
-   }
-   res.push(sanitizer.onAny(token).token);
-   });
-   return res;
+   return tokens.map(function(token) {
+   return this.onAny(token).token;
+   }, this);
 };
 
 Sanitizer.prototype.getAttrWhiteList = function(tag) {
@@ -619,14 +613,11 @@
 };
 
 // constants
-Sanitizer.prototype.handledRank = 2.90;
 Sanitizer.prototype.anyRank = 2.91;
 
 // Register this transformer with the TokenTransformer
 Sanitizer.prototype.register = function(manager) {
this.manager = manager;
-   manager.addTransform(this.onAnchor.bind(this), "Sanitizer:onAnchor", 
this.handledRank, 'tag', 'a');
-   manager.addTransform(this.onAnchor.bind(this), "Sanitizer:onAnchor", 
this.handledRank, 'tag', 'link');
manager.addTransform(this.onAny.bind(this), "Sanitizer:onAny", 
this.anyRank, 'any');
 };
 
@@ -659,29 +650,6 @@
path = href;
}
return proto + host + path;
-};
-
-Sanitizer.prototype.onAnchor = function(token) {
-   // Literal html tokens weren't generated by us and should fall back to 
the
-   // plaintext conversion in onAny.
-   if (token.constructor === EndTagTk || Util.isHTMLTag(token)) {
-   return { token: token };
-   }
-   var hrefKV = Util.lookupKV(token.attribs, 'href');
-   if (hrefKV !== null) {
-   var origHref = token.getAttributeShadowInfo('href').value;
-   var curVal = hrefKV.v;
-   console.assert(typeof curVal === 'string');
-   var newHref = Sanitizer.cleanUrl(this.manager.env, curVal);
-   if (newHref === null) {
-   token.removeAttribute('href');
-   token.setShadowInfo('href', newHref, origHref);
-   } else if (newHref !== curVal) {
-   hrefKV.v = newHref;
-   token.setShadowInfo('href', newHref, origHref);
-   }
-   }
-   return { token: token };
 };
 
 /**
@@ -1072,7 +1040,6 @@
// RDFa and microdata properties allow URLs, URIs and/or CURIs.
// Check them for sanity
if (microData.has(k)) {
-
// Paranoia. Allow "simple" values but suppress 
javascript
if (evilUriRE.test(v)) {
// Retain the Parsoid typeofs for Parsoid attrs
@@ -1082,12 +1049,17 @@
}
}
 
-   // NOTE: even though elements using href/src are not allowed 
directly, supply
-   //   validation code that can be used by tag hook handlers, 
etc
+   // NOTE: Even though elements using href/src are not allowed 
directly,
+   // supply validation code that can be used by tag hook 
handlers, etc
if (k === 'href' || k === 'src') {
+   // `origV` will always be `v`, because `a.vsrc` isn't 
set, since
+   // this attribute didn't come from source.  However, in 
the
+   // LinkHandler, we may have already shadowed this value 
so use
+   // that instead.
+   var origHref = token.getAttributeShadowInfo(k).value;
var newHref = Sanitizer.cleanUrl(this.manager.env, v);
if (newHref !== v) {
-   newAttrs[k] = [newHref, origV, origK];
+   newAttrs[k] = [newHref, origHref, k];
continue;
}
}

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use onAnchor for sanitizing link href's as well

[Arlolra (Code Review)]

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

Change subject: Use onAnchor for sanitizing link href's as well
..

Use onAnchor for sanitizing link href's as well

 * Mainly for redirects.  These are generated the same way in the link
   handler.

 * Fixes another of the regressions in the chain following fa6906a,
   643d539 and 8b552f0e.

 * Also, by skipping literal html in onAnchor, we avoid assertions from
   wikitext like, "haha"

Change-Id: Ia5b408e25dcdfb4ac30e784af2b724ffdf870610
---
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
2 files changed, 25 insertions(+), 8 deletions(-)


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

diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 65a0b0c..622e36c 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -602,7 +602,7 @@
var res = [];
var sanitizer = this;
tokens.forEach(function(token) {
-   if (token.name && token.name === 'a') {
+   if (token.name && (token.name === 'a' || token.name === 
'link')) {
token = sanitizer.onAnchor(token).token;
}
res.push(sanitizer.onAny(token).token);
@@ -626,6 +626,7 @@
 Sanitizer.prototype.register = function(manager) {
this.manager = manager;
manager.addTransform(this.onAnchor.bind(this), "Sanitizer:onAnchor", 
this.handledRank, 'tag', 'a');
+   manager.addTransform(this.onAnchor.bind(this), "Sanitizer:onAnchor", 
this.handledRank, 'tag', 'link');
manager.addTransform(this.onAny.bind(this), "Sanitizer:onAny", 
this.anyRank, 'any');
 };
 
@@ -661,7 +662,9 @@
 };
 
 Sanitizer.prototype.onAnchor = function(token) {
-   if (token.constructor === EndTagTk) {
+   // Literal html tokens weren't generated by us and should fall back to 
the
+   // plaintext conversion in onAny.
+   if (token.constructor === EndTagTk || Util.isHTMLTag(token)) {
return { token: token };
}
var hrefKV = Util.lookupKV(token.attribs, 'href');
@@ -690,7 +693,10 @@
  */
 Sanitizer.prototype.onAny = function(token) {
var env = this.manager.env;
-   env.log("trace/sanitizer", this.manager.pipelineId, function() { return 
JSON.stringify(token); });
+   env.log("trace/sanitizer", this.manager.pipelineId, function() {
+   return JSON.stringify(token);
+   });
+
// Pass through a transparent line meta-token
if (Util.isEmptyLineMetaToken(token)) {
env.log("trace/sanitizer", this.manager.pipelineId, 
"--unchanged--");
@@ -700,11 +706,12 @@
var i, l, k, v, kv;
var attribs = token.attribs;
var noEndTagSet = this.constants.noEndTagSet;
+   var tagWhiteList = WikitextConstants.Sanitizer.TagWhiteList;
 
-   if (Util.isHTMLTag(token) &&
-   
(!WikitextConstants.Sanitizer.TagWhiteList.has(token.name.toUpperCase()) ||
-   (token.constructor === EndTagTk && 
noEndTagSet.has(token.name)))
-   ) { // unknown tag -- convert to plain text
+   if (Util.isHTMLTag(token) && (
+   !tagWhiteList.has(token.name.toUpperCase()) ||
+   (token.constructor === EndTagTk && noEndTagSet.has(token.name))
+   )) { // unknown tag -- convert to plain text
if (!this.options.inTemplate && token.dataAttribs.tsr) {
// Just get the original token source, so that we can 
avoid
// whitespace differences.
@@ -767,7 +774,9 @@
}
}
 
-   env.log("trace/sanitizer", this.manager.pipelineId, function() { return 
" ---> " + JSON.stringify(token); });
+   env.log("trace/sanitizer", this.manager.pipelineId, function() {
+   return " ---> " + JSON.stringify(token);
+   });
return { token: token };
 };
 
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 8b9720d..4f40a28 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7866,6 +7866,14 @@
 !! end
 
 !! test
+Redirect containing double quotes and spaces
+!! wikitext
+#REDIRECT [[Cool "Gator"]]
+!! html/parsoid
+
+!! end
+
+!! test
 Link containing double-single-quotes '' in text (bug 4598 sanity check)
 !! wikitext
 Some [[Link|pretty ''italics'' and stuff]]!

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: fix rsyncd 'hosts allow' syntax

[Dzahn (Code Review)]

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

Change subject: aptrepo: fix rsyncd 'hosts allow' syntax
..

aptrepo: fix rsyncd 'hosts allow' syntax

In the rsyncd 'hosts allow' we can use either hostnames
or IPs or wildcards. But this resulted in a literal 'resolve'
in the rsyncd config and that was not intended and fails.

Bug: T132757
Change-Id: Ibca80da18f41571e885107773011aae80f514641
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/334237/1

diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index b56ffd7..d8b333c 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -10,11 +10,11 @@
 $ensure = 'present'
 include rsync::server
 
-rsync::server::module { 'aptrepo-basedir':
+rsync::server::module { 'aptrepo':
 ensure  => $aptrepo::rsync::ensure,
 path=> $aptrepo::basedir,
 read_only   => 'no',
-hosts_allow => "@resolve(${primary_server})",
+hosts_allow => $primary_server,
 }
 } else {
 $ensure = 'absent'

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add index to nick_name field.

[Eileen (Code Review)]

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

Change subject: Add index to nick_name field.
..

Add index to nick_name field.

Bug: T115044
Change-Id: I86b1e82503f71636c74de984c1595b84ec723caa
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/36/334236/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 96d1c9a..80f6a23 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2482,3 +2482,19 @@
   wmf_civicrm_update_7310();
   wmf_civicrm_update_7320();
 }
+
+/**
+ * Add index to nick_name column as we have decided to use it for imports.
+ *
+ * We have decided the Benevity Import should accept org matches on nick_name
+ * or organization_name in order to provide the option to refer to them with
+ * 2 names. In order to use it it must be indexed. Note that I believe the 
index size
+ * is relative to the number of values in it (currently a few hundred).
+ *
+ * Bug: T115044
+ */
+function wmf_civicrm_update_7455() {
+  civicrm_initialize();
+  $tables = array('civicrm_contact' => array('nick_name'));
+  CRM_Core_BAO_SchemaHandler::createIndexes($tables);
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86b1e82503f71636c74de984c1595b84ec723caa
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] wikimedia...crm[master]: wip Matching gifts import.

[Eileen (Code Review)]

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

Change subject: wip Matching gifts import.
..

wip Matching gifts import.

This is based on the assumption that we are not there with the full matching 
but we can save MG  Engage
time by doing some blunt matching & then allowing them to download a list of 
transactions that failed the
blunt match & then either edit the csv or create the contacts in CiviCRM & try 
again.

Bug: T115044
Change-Id: I7cc558b8b42a17949aedf468b9d8a22d383ac470
---
A sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/ChecksFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
4 files changed, 159 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/35/334235/1

diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
new file mode 100644
index 000..88c00d0
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -0,0 +1,139 @@
+ 'id',
+  'contact_type' => $contactType,
+  'first_name' => 'Anonymous',
+  'last_name' => 'Anonymous',
+  'email' => 'fakeem...@wikimedia.org',
+));
+  }
+  else {
+$params = array(
+  'email' => ($msg['matched_email'] !== 'Not shared by donor') ? 
$msg['matched_email'] : '',
+  'first_name' => ($msg['matched_first_name'] !== 'Not shared by 
donor') ? $msg['matched_first_name'] : '',
+  'last_name' => ($msg['matched_last_name'] !== 'Not shared by donor') 
? $msg['matched_last_name'] : '',
+);
+$msg['contact_id'] = civicrm_api3('Contact', 'getvalue', 
array_merge(array(
+  'return' => 'id',
+  'contact_type' => $contactType,
+), $params));
+$params = array('contact_id' => $msg['contact_id']);
+foreach (array('city', 'street_address', 'email', 'postal_code', 
'state') as $locationField) {
+  if (isset($params['matching_' . $locationField])) {
+$params[$locationField] = $params['matching_' . $locationField];
+  }
+  wmf_civicrm_message_location_update($params, array('id' => 
$params['contact_id']));
+}
+  }
+  $contactType = 'Organization';
+  $params = array('organization_name' => $msg['organization_name']);
+  $msg['soft_credit_to_id'] = civicrm_api3('Contact', 'getvalue', 
array_merge(array(
+'return' => 'id',
+'contact_type' => $contactType,
+  ), $params));
+}
+catch (CiviCRM_API3_Exception $e) {
+  throw new IgnoredRowException(
+'IMPORT_CONTRIB',
+t("Did not find exactly one $contactType with the details: @details. 
You will need to ensure a single $contactType record exists for the contact 
first",
+  array(
+'@details' => implode(', ', $params),
+  )
+)
+  );
+}
+
+  }
+
+  protected function getDefaultValues() {
+return array(
+  'source' => 'Matched gift',
+  'payment_method' => 'EFT',
+  'contact_type' => 'Organization',
+  'country' => 'US',
+  'currency' => 'USD',
+);
+  }
+
+  protected function getFieldMapping() {
+$mapping = parent::getFieldMapping();
+$mapping['Donor First Name'] = 'matched_first_name';
+$mapping['Donor Last Name'] = 'matched_last_name';
+$mapping['Donor Email'] = 'matched_email';
+$mapping['Matching Amount'] = 'matching_amount';
+$mapping['Donor Street Address'] = 'matched_street_address';
+$mapping['Donor City'] = 'matched_city';
+$mapping['Donor Postal Code'] = 'matched_postal_code';
+$mapping['Donor State'] = 'matched_state';
+return $mapping;
+  }
+
+  /**
+   * Do the actual import.
+   *
+   * @param array $msg
+   * @return array
+   */
+  protected function doImport($msg) {
+if (!empty($msg['gross'])) {
+  $contribution = wmf_civicrm_contribution_message_import($msg);
+}
+$matchedMsg = $msg;
+if (!empty($msg['matching_amount'])) {
+  $matchedMsg['contact_id'] = $msg['soft_credit_id'];
+  $matchedMsg['soft_credit_to_id'] = $msg['contact_id'];
+  $matchedMsg['total_amount'] = $msg['matched_amount'];
+  wmf_civicrm_contribution_message_import($matchedMsg);
+}
+$this->mungeContribution($contribution);
+return $contribution;
+  }
+
+}
diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php 
b/sites/all/modules/offline2civicrm/ChecksFile.php
index ae619d0..3b470f3 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ChecksFile.php
@@ -126,8 +126,7 @@
 }
 
 // tha business.
-$contribution = wmf_civicrm_contribution_message_import( $msg 
);
-

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add mgmt and production dns for mc2019-mc2036 Bug:T155755

[Papaul (Code Review)]

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

Change subject: DNS: Add mgmt and production dns for mc2019-mc2036 Bug:T155755
..

DNS: Add mgmt and production dns for mc2019-mc2036
Bug:T155755

Change-Id: I91cca991a7ac4fe6a515340e6451544fd28301e1
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 121 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/34/334234/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 4d30f3c..9eefa1a 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -377,14 +377,13 @@
 203 1H IN PTR   xenon-b.eqiad.wmnet.
 204 1H IN PTR   db1074.eqiad.wmnet.
 205 1H IN PTR   db1075.eqiad.wmnet.
-206 1H IN PTR   db1054.eqiad.wmnet.
+
 207 1H IN PTR   mw1204.eqiad.wmnet.
 208 1H IN PTR   mw1205.eqiad.wmnet.
 209 1H IN PTR   mw1206.eqiad.wmnet.
 210 1H IN PTR   mw1207.eqiad.wmnet.
 211 1H IN PTR   osm-cp1001.eqiad.wmnet.
 212 1H IN PTR   osm-cp1002.eqiad.wmnet.
-213 1H IN PTR   aqs1007-a.eqiad.wmnet. ; cassandra instance
 214 1H IN PTR   wtp1019.eqiad.wmnet.
 215 1H IN PTR   wtp1020.eqiad.wmnet.
 216 1H IN PTR   wtp1021.eqiad.wmnet.
@@ -400,7 +399,6 @@
 234 1H IN PTR   elastic1033.eqiad.wmnet.
 235 1H IN PTR   elastic1034.eqiad.wmnet.
 236 1H IN PTR   elastic1035.eqiad.wmnet.
-237 1H IN PTR   aqs1007-b.eqiad.wmnet. ; cassandra instance
 
 $ORIGIN 1.64.{{ zonename }}.
 
@@ -520,11 +518,11 @@
 71  1H IN PTR   elastic1047.eqiad.wmnet.
 72  1H IN PTR   elastic1028.eqiad.wmnet.
 73  1H IN PTR   puppetmaster1001.eqiad.wmnet.
-74  1H IN PTR   aqs1008-a.eqiad.wmnet. ; cassandra instance
+
 75  1H IN PTR   kubernetes1002.eqiad.wmnet.
 76  1H IN PTR   db1051.eqiad.wmnet.
 77  1H IN PTR   db1052.eqiad.wmnet.
-78  1H IN PTR   aqs1008-b.eqiad.wmnet. ; cassandra instance
+
 101 1H IN PTR   db1083.eqiad.wmnet.
 102 1H IN PTR   db1084.eqiad.wmnet.
 103 1H IN PTR   db1085.eqiad.wmnet.
@@ -664,7 +662,7 @@
 20  1H IN PTR   neodymium.eqiad.wmnet.
 
 23  1H IN PTR   kubernetes1003.eqiad.wmnet.
-
+24  1H IN PTR   db1054.eqiad.wmnet.
 25  1H IN PTR   db1055.eqiad.wmnet.
 26  1H IN PTR   db1056.eqiad.wmnet.
 27  1H IN PTR   db1057.eqiad.wmnet.
@@ -878,10 +876,12 @@
 103 1H IN PTR   stat1003.eqiad.wmnet.
 
 114 1H IN PTR   kafka1014.eqiad.wmnet.
+115 1H IN PTR   analytics1015.eqiad.wmnet.
 116 1H IN PTR   analytics1003.eqiad.wmnet.
 117 1H IN PTR   notebook1001.eqiad.wmnet.
 118 1H IN PTR   analytics1001.eqiad.wmnet.
 122 1H IN PTR   kafka1022.eqiad.wmnet.
+126 1H IN PTR   analytics1026.eqiad.wmnet.
 127 1H IN PTR   analytics1027.eqiad.wmnet.
 128 1H IN PTR   analytics1028.eqiad.wmnet.
 129 1H IN PTR   analytics1029.eqiad.wmnet.
@@ -1077,8 +1077,6 @@
 119 1H  IN PTR  aqs1009.eqiad.wmnet.
 120 1H  IN PTR  restbase1009-a.eqiad.wmnet.
 121 1H  IN PTR  auth1001.eqiad.wmnet.
-122 1H  IN PTR  aqs1009-a.eqiad.wmnet. ; cassandra instance
-123 1H  IN PTR  aqs1009-b.eqiad.wmnet. ; cassandra instance
 128 1H  IN PTR  pc1006.eqiad.wmnet.
 129 1H  IN PTR  oresrdb1001.eqiad.wmnet.
 130 1H  IN PTR  restbase1009-b.eqiad.wmnet.
@@ -2606,6 +2604,10 @@
 80  1H IN PTR   mw2251.codfw.wmnet.
 81  1H IN PTR   mw2252.codfw.wmnet.
 82  1H IN PTR   mw2253.codfw.wmnet.
+83  1H IN PTR   mc2019.codfw.wmnet.
+84  1H IN PTR   mc2020.codfw.wmnet.
+85  1H IN PTR   mc2021.codfw.wmnet.
+86  1H IN PTR   mc2022.codfw.wmnet.
 
 119 1H IN PTR   rdb2001.codfw.wmnet.
 120 1H IN PTR   rdb2002.codfw.wmnet.
@@ -2711,7 +2713,9 @@
 57  1H IN PTR   mw2258.codfw.wmnet.
 58  1H IN PTR   mw2259.codfw.wmnet.
 59  1H IN PTR   mw2260.codfw.wmnet.
-
+60  1H IN PTR   mc2023.codfw.wmnet.
+61  1H IN PTR   mc2024.codfw.wmnet.
+62  1H IN PTR   mc2025.codfw.wmnet.
 63  1H IN PTR   mw2090.codfw.wmnet.
 64  1H IN PTR   mw2091.codfw.wmnet.
 65  1H IN PTR   mw2092.codfw.wmnet.
@@ -2843,6 +2847,7 @@
 191 1H IN PTR   elastic2028.codfw.wmnet.
 192 1H IN PTR   elastic2029.codfw.wmnet.
 193 1H IN PTR   elastic2030.codfw.wmnet.
+194 1H IN PTR   mc2026.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
@@ -3034,6 +3039,11 @@
 156 1H IN PTR   elastic2031.codfw.wmnet.
 157 1H IN PTR   elastic2032.codfw.wmnet.
 158 1H IN PTR   elastic2033.codfw.wmnet.
+159 1H IN PTR   mc2027.codfw.wmnet.
+160 1H IN PTR   mc2028.codfw.wmnet.
+161 1H IN PTR   mc2029.codfw.wmnet.
+162 1H IN PTR   mc2030.codfw.wmnet.
+163 1H IN PTR   mc2031.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
@@ -3127,6 +3137,11 @@
 73  1H IN PTR   elastic2034.codfw.wmnet.
 74  1H IN PTR   elastic2035.codfw.wmnet.
 75  1H IN PTR   elastic2036.codfw.wmnet.
+76  1H IN PTR   mc2032.codfw.wmnet.
+77  1H IN PTR   

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Some leftover cleanup from the switch to domino for treebuil...

[jenkins-bot (Code Review)]

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

Change subject: Some leftover cleanup from the switch to domino for treebuilding
..


Some leftover cleanup from the switch to domino for treebuilding

 * Should have been part of 37a109a69

Change-Id: I4cde895b89c09488608bb3719738df9f6b2540ca
---
M lib/wt2html/HTML5TreeBuilder.js
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/lib/wt2html/HTML5TreeBuilder.js b/lib/wt2html/HTML5TreeBuilder.js
index 6a58fa5..31e325e 100644
--- a/lib/wt2html/HTML5TreeBuilder.js
+++ b/lib/wt2html/HTML5TreeBuilder.js
@@ -52,14 +52,10 @@
this.pipelineId = id;
 };
 
-// HTML5 tokenizer stubs
-TreeBuilder.prototype.setState = function(state) {};
-
 TreeBuilder.prototype.resetState = function() {
// Reset vars
this.tagId = 1;  // Assigned to start/self-closing tags
this.inTransclusion = false;
-   this.precededByPre = false;
 
/* 
 * Crude tracking of whether we are in a table

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cde895b89c09488608bb3719738df9f6b2540ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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]: Add an html/parsoid section for a nowiki test

[jenkins-bot (Code Review)]

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

Change subject: Add an html/parsoid section for a nowiki test
..


Add an html/parsoid section for a nowiki test

Change-Id: I0ebbc6bca8fbfe3c6656da35e15d39e998e36370
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index bafb8e5..5e63865 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -591,7 +591,6 @@
 add("html2wt", "Non-word characters don't terminate tag names (bug 17663, 
40670, 52022)", "a\n\n doesn't 
terminate \n\n doesn't terminate \n\n doesn't terminate 
\n\n doesn't terminate \n\n\n");
 add("html2wt", "Non-word characters don't terminate tag names + tidy", 
"a\n\n doesn't terminate \n\n doesn't terminate 
\n\n doesn't terminate \n\n doesn't terminate 
\n\n\n");
 add("html2wt", "Bare pipe character from a template (bug 52363)", "|\n");
-add("html2wt", "Entities inside ", "<\n");
 add("html2wt", "T71950: 2. Put nowiki as close to cause as possible, after ' 
:'", "This text : L''[[Foo]]\n");
 add("html2wt", "Comments and Indent-Pre", " asdf\n\n asdf\n\n asdf\n\nxyz\n\n 
asdf\n xyz\n");
 add("html2wt", "Comment test 2a", "asdf\njkl\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 847066c..8b9720d 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -1488,9 +1488,11 @@
 Entities inside 
 !! wikitext
 
-!! html
+!! html/php
 
 
+!! html/parsoid
+
 !! end
 
 !! test

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ebbc6bca8fbfe3c6656da35e15d39e998e36370
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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] operations/puppet[production]: Revert "Keystone: Assign more threads to the admin API uwsgi...

[Andrew Bogott (Code Review)]

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

Change subject: Revert "Keystone: Assign more threads to the admin API uwsgi 
handler"
..


Revert "Keystone: Assign more threads to the admin API uwsgi handler"

This doesn't seem to help.  Something else is going on with uwsgi refusing 
connections.

This reverts commit 2c73ff74b6c307fa12f90c7b3fe919700904e4e2.

Change-Id: I612bfa0ad52426d74b07cf2933656b8f45c17830
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index f5bdbc1..5a23fa5 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -106,7 +106,7 @@
 wsgi-file => '/usr/bin/keystone-wsgi-admin',
 name  => 'keystone',
 processes => '20',
-threads   => '4',
+threads   => '2',
 logto => '/var/log/keystone/uwsgi/keystone-admin.log',
 logger=> 
'file:/var/log/keystone/uwsgi/keystone-admin-uwsgi.log',
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I612bfa0ad52426d74b07cf2933656b8f45c17830
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Typo fixes

[Smalyshev (Code Review)]

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

Change subject: Typo fixes
..

Typo fixes

Change-Id: Iec5118451103286277a9a0ab96276b087feb1ff7
---
M includes/Search/TextIndexField.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/Search/TextIndexField.php 
b/includes/Search/TextIndexField.php
index a939580..a6a0a5d 100644
--- a/includes/Search/TextIndexField.php
+++ b/includes/Search/TextIndexField.php
@@ -90,7 +90,7 @@
 
/**
 * @param SearchEngine $engine
-* @return array|void
+* @return array
 */
public function getMapping( SearchEngine $engine ) {
if (!($engine instanceof \CirrusSearch)) {
@@ -171,7 +171,7 @@
/**
 * Adapt the field options according to the highlighter used
 * @var mixed[] &$field the mapping options being built
-* @var sting[] $subFields list of subfields to configure
+* @var string[] $subFields list of subfields to configure
 * @var bool $rootField configure the root field (defaults to true)
 */
protected function configureHighlighting( array &$field, array 
$subFields, $rootField = true ) {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Designate sink: Don't use keystone to resolve project_id

[Andrew Bogott (Code Review)]

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

Change subject: Designate sink:  Don't use keystone to resolve project_id
..


Designate sink:  Don't use keystone to resolve project_id

Now that project_id==project_name, we can leave keystone
out of the whole process.  That should make all of this
considerably less fragile.

Bug: T156297
Change-Id: Ib45a7efd70b7619c3bf3371e0a9ea02c74e7b330
---
M modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
M modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
M modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py
M modules/openstack/files/mitaka/designate/nova_fixed_multi/novamulti.py
M modules/openstack/templates/liberty/designate/designate.conf.erb
5 files changed, 14 insertions(+), 114 deletions(-)

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



diff --git a/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py 
b/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
index bde2d65..b9773c7 100644
--- a/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
+++ b/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
@@ -23,12 +23,6 @@
 from designate.context import DesignateContext
 from designate.notification_handler.base import BaseAddressHandler
 from designate.objects import Record
-from keystoneclient.auth.identity import v3
-from keystoneclient import client
-from keystoneclient import exceptions as keystoneexceptions
-from keystoneclient.v3 import projects
-from keystoneclient import session
-
 
 LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
@@ -73,18 +67,9 @@
 
 context = DesignateContext.get_admin_context(all_tenants=True)
 
-# Extra magic!  The event record contains a tenant id but not a tenant 
name.  So
-#  if our formats include project_name then we need to ask keystone 
for the name.
-need_project_name = False
-for fmt in cfg.CONF[self.name].get('format'):
-if 'project_name' in fmt:
-need_project_name = True
-break
-if 'project_name' in cfg.CONF[self.name].get('reverse_format'):
-need_project_name = True
-if need_project_name:
-project_name = self._resolve_project_name(data['tenant_id'])
-data['project_name'] = project_name
+# We have a hack elsewhere in keystone to ensure that tenant id == 
tenant name.
+#  So... we can safely use the id in the fqdn.
+data['project_name'] = data['tenant_id']
 
 for addr in addresses:
 event_data = data.copy()
@@ -209,31 +194,3 @@
 central_api.delete_record(context,
   reverse_domain_id,
   record['recordset_id'], record['id'])
-
-def _resolve_project_name(self, tenant_id):
-try:
-username = cfg.CONF[self.name].keystone_auth_name
-passwd = cfg.CONF[self.name].keystone_auth_pass
-project = cfg.CONF[self.name].keystone_auth_project
-url = cfg.CONF[self.name].keystone_auth_url
-except KeyError:
-LOG.warn('Missing a config setting for keystone auth.')
-return
-
-try:
-auth = v3.Password(auth_url=url,
-   user_id=username,
-   password=passwd,
-   project_id=project)
-sess = session.Session(auth=auth)
-keystone = client.Client(session=sess, auth_url=url)
-except keystoneexceptions.AuthorizationFailure:
-LOG.warn('Keystone client auth failed.')
-return
-projectmanager = projects.ProjectManager(keystone)
-proj = projectmanager.get(tenant_id)
-if proj:
-LOG.debug('Resolved project id %s as %s' % (tenant_id, proj.name))
-return proj.name
-else:
-return 'unknown'
diff --git 
a/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py 
b/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
index 1c1b314..0f44b22 100644
--- a/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
+++ b/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
@@ -37,11 +37,6 @@
 cfg.MultiStrOpt('format', default=[]),
 cfg.StrOpt('reverse-domain-id', default=None),
 cfg.StrOpt('reverse-format', default=None),
-
-cfg.StrOpt('keystone_auth_name', default=None),
-cfg.StrOpt('keystone_auth_pass', default=None),
-cfg.StrOpt('keystone_auth_project', default=None),
-cfg.StrOpt('keystone_auth_url', default=None),
 ], group='handler:nova_fixed_multi')
 
 
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Don't set Flow preferences in hooks

[jenkins-bot (Code Review)]

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

Change subject: Don't set Flow preferences in hooks
..


Don't set Flow preferences in hooks

Flow preference default values are set in extension.json
and potentially redefined by config files. Setting them
in FlowHooks::initFlowExtension overwrites everything else.

Bug: T155665
Change-Id: I79771b9624fa19c794666d6bb504af1930aa1d00
---
M Hooks.php
1 file changed, 1 insertion(+), 15 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index db3cf3a..468f756 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -154,21 +154,7 @@
 * from $wgExtensionFunctions
 */
public static function initFlowExtension() {
-   global $wgDefaultUserOptions, $wgFlowContentFormat;
-
-   // Echo notification subscription preference
-   $wgDefaultUserOptions['echo-subscriptions-web-flow-discussion'] 
= true;
-   
$wgDefaultUserOptions['echo-subscriptions-email-flow-discussion'] = false;
-
-   // Default sort order of a topiclist view. See 
TopicListBlock::getFindOptions()
-   // for more information.
-   $wgDefaultUserOptions['flow-topiclist-sortby'] = 'updated';
-
-   // Default editor to use in Flow
-   $wgDefaultUserOptions['flow-editor'] = 'wikitext';
-
-   // Default state of the side rail
-   $wgDefaultUserOptions['flow-side-rail-state'] = 'expanded';
+   global $wgFlowContentFormat;
 
// needed to determine if a page is occupied by flow
self::getOccupationController();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79771b9624fa19c794666d6bb504af1930aa1d00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Mattflaschen 
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 "Keystone: Assign more threads to the admin API uwsgi...

[Andrew Bogott (Code Review)]

Hello Alex Monk, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Keystone: Assign more threads to the admin API uwsgi 
handler"
..

Revert "Keystone: Assign more threads to the admin API uwsgi handler"

This doesn't seem to help.  Something else is going on with uwsgi refusing 
connections.

This reverts commit 2c73ff74b6c307fa12f90c7b3fe919700904e4e2.

Change-Id: I612bfa0ad52426d74b07cf2933656b8f45c17830
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/334232/1

diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index f5bdbc1..5a23fa5 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -106,7 +106,7 @@
 wsgi-file => '/usr/bin/keystone-wsgi-admin',
 name  => 'keystone',
 processes => '20',
-threads   => '4',
+threads   => '2',
 logto => '/var/log/keystone/uwsgi/keystone-admin.log',
 logger=> 
'file:/var/log/keystone/uwsgi/keystone-admin-uwsgi.log',
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I612bfa0ad52426d74b07cf2933656b8f45c17830
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
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...Popups[mpga]: Hygiene: Add to mw.popups in only one place

[Jdlrobson (Code Review)]

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

Change subject: Hygiene: Add to mw.popups in only one place
..

Hygiene: Add to mw.popups in only one place

Prepare to shift to a JS bundler by placing definitions at bottom
of page (these are currently assignments to mw.popups). In future
these are easily switched to module.exports line

Change-Id: Iaa5d78fee1cdb6fc572d2f1781f1d4fb59475e84
---
M resources/ext.popups/counts.js
M resources/ext.popups/renderer.js
2 files changed, 14 insertions(+), 8 deletions(-)


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

diff --git a/resources/ext.popups/counts.js b/resources/ext.popups/counts.js
index 0c19281..1d77b66 100644
--- a/resources/ext.popups/counts.js
+++ b/resources/ext.popups/counts.js
@@ -1,7 +1,5 @@
 ( function ( mw ) {
 
-   mw.popups.counts = {};
-
/**
 * Return count bucket for the number of edits a user has made.
 *
@@ -13,7 +11,7 @@
 * @param {Number} count
 * @return {String}
 */
-   mw.popups.counts.getEditCountBucket = function ( count ) {
+   function getEditCountBucket( count ) {
var bucket;
 
if ( count === 0 ) {
@@ -45,7 +43,7 @@
 * @param {Number} count
 * @return {String}
 */
-   mw.popups.counts.getPreviewCountBucket = function ( count ) {
+   function getPreviewCountBucket( count ) {
var bucket;
 
if ( count === -1 ) {
@@ -65,4 +63,9 @@
return bucket + ' previews';
};
 
+   mw.popups.counts = {
+   getPreviewCountBucket: getPreviewCountBucket,
+   getEditCountBucket: getEditCountBucket,
+   };
+
 }( mediaWiki ) );
diff --git a/resources/ext.popups/renderer.js b/resources/ext.popups/renderer.js
index c8e2e90..17164f7 100644
--- a/resources/ext.popups/renderer.js
+++ b/resources/ext.popups/renderer.js
@@ -16,8 +16,6 @@
},
$window = $( window );
 
-   mw.popups.renderer = {};
-
/**
 * Extracted from `mw.popups.createSVGMasks`.
 */
@@ -48,7 +46,7 @@
/**
 * Initializes the renderer.
 */
-   mw.popups.renderer.init = function () {
+   function init() {
createPokeyMasks();
};
 
@@ -86,7 +84,7 @@
 * @param {Object} data
 * @return {mw.popups.Preview}
 */
-   mw.popups.renderer.render = function ( data ) {
+   function render( data ) {
var preview = data.extract === undefined ? createEmptyPreview( 
data ) : createPreview( data );
 
return {
@@ -684,4 +682,9 @@
return result;
}
 
+   mw.popups.renderer = {
+   render: render,
+   init: createPokeyMasks
+   };
+
 }( mediaWiki, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa5d78fee1cdb6fc572d2f1781f1d4fb59475e84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Add hovercardsSuppressedByGadget to logging

[jenkins-bot (Code Review)]

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

Change subject: Add hovercardsSuppressedByGadget to logging
..


Add hovercardsSuppressedByGadget to logging

I4c15296e introduced the wgPopupsConflictsWithNavPopupGadget client-side
config variable, an always-available flag that represents whether the
user has enabled the NavPopups gadget. This property has been missing
from the Popups instrumentation since I8a3f5835.

Changes:
* Add the value of wgPopupsConflictsWithNavPopupGadget to BOOT action
  and reduce it into the base instrumentation data.

Bug: T151058
Change-Id: I09924d0cb10e96b0a846940506ebfeaa7086cd17
---
M resources/ext.popups/actions.js
M resources/ext.popups/reducers/eventLogging.js
M tests/qunit/ext.popups/actions.test.js
M tests/qunit/ext.popups/reducers/eventLogging.test.js
4 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 3135794..d9662e5 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -78,6 +78,7 @@
return {
type: types.BOOT,
isEnabled: isEnabled,
+   isNavPopupsEnabled: config.get( 
'wgPopupsConflictsWithNavPopupGadget' ),
sessionToken: user.sessionId(),
pageToken: generateToken(),
page: {
diff --git a/resources/ext.popups/reducers/eventLogging.js 
b/resources/ext.popups/reducers/eventLogging.js
index 5bea6d2..85ee24c 100644
--- a/resources/ext.popups/reducers/eventLogging.js
+++ b/resources/ext.popups/reducers/eventLogging.js
@@ -45,7 +45,8 @@
pageToken: action.pageToken,
sessionToken: 
action.sessionToken,
editCountBucket: 
popups.counts.getEditCountBucket( action.user.editCount ),
-   previewCountBucket: 
popups.counts.getPreviewCountBucket( action.user.previewCount )
+   previewCountBucket: 
popups.counts.getPreviewCountBucket( action.user.previewCount ),
+   hovercardsSuppressedByGadget: 
action.isNavPopupsEnabled
},
event: {
action: 'pageLoaded'
diff --git a/tests/qunit/ext.popups/actions.test.js 
b/tests/qunit/ext.popups/actions.test.js
index f32d841..ea40db4 100644
--- a/tests/qunit/ext.popups/actions.test.js
+++ b/tests/qunit/ext.popups/actions.test.js
@@ -16,7 +16,8 @@
wgTitle: 'Foo',
wgNamespaceNumber: 1,
wgArticleId: 2,
-   wgUserEditCount: 3
+   wgUserEditCount: 3,
+   wgPopupsConflictsWithNavPopupGadget: true
} );
 
stubUserSettings = {
@@ -40,6 +41,7 @@
{
type: 'BOOT',
isEnabled: false,
+   isNavPopupsEnabled: true,
sessionToken: '0123456789',
pageToken: '9876543210',
page: {
diff --git a/tests/qunit/ext.popups/reducers/eventLogging.test.js 
b/tests/qunit/ext.popups/reducers/eventLogging.test.js
index f74e6f5..0448c40 100644
--- a/tests/qunit/ext.popups/reducers/eventLogging.test.js
+++ b/tests/qunit/ext.popups/reducers/eventLogging.test.js
@@ -26,6 +26,7 @@
var action = {
type: 'BOOT',
isEnabled: true,
+   isNavPopupsEnabled: false,
sessionToken: '0123456789',
pageToken: '9876543210',
page: {
@@ -58,7 +59,8 @@
pageToken: action.pageToken,
sessionToken: action.sessionToken,
editCountBucket: 
expectedEditCountBucket,
-   previewCountBucket: 
expectedPreviewCountBucket
+   previewCountBucket: 
expectedPreviewCountBucket,
+   hovercardsSuppressedByGadget: 
action.isNavPopupsEnabled
},
event: {
action: 'pageLoaded'

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Fix page content language direction handling

[jenkins-bot (Code Review)]

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

Change subject: Fix page content language direction handling
..


Fix page content language direction handling

Ieb00709e changed the names of the page content language related
variables returned by the API from langdir and langcode to
languageDirection and languageCode respectively without updating the
renderer.

Moreover, the extract truncation mechanism introduced in I2ec0c04
couldn't handle RTL languages.

Both of these issues were found while writing a test plan for Page
Previews.

Change-Id: Ied3dbd7cf82749198e792a2f9d2241582aeff25c
---
M resources/ext.popups/styles/ext.popups.core.less
M resources/ext.popups/templates/preview.mustache
2 files changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/resources/ext.popups/styles/ext.popups.core.less 
b/resources/ext.popups/styles/ext.popups.core.less
index 2c9872f..a8e0e6e 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -126,7 +126,6 @@
&:after {
content: ' ';
position: absolute;
-   right: 0;
bottom: 0;
width: 25%;
height: 24px;
@@ -136,6 +135,14 @@
background-image: -o-linear-gradient( to right, rgba( 
255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% );
background-image: linear-gradient( to right, rgba( 255, 
255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% );
}
+
+   &[dir='ltr']:after {
+   right: 0;
+   }
+
+   &[dir='rtl']:after {
+   left: 0;
+   }
}
 
&.mwe-popups-is-tall {
diff --git a/resources/ext.popups/templates/preview.mustache 
b/resources/ext.popups/templates/preview.mustache
index cbeb146..0615e5e 100644
--- a/resources/ext.popups/templates/preview.mustache
+++ b/resources/ext.popups/templates/preview.mustache
@@ -4,7 +4,7 @@
 {{#hasThumbnail}}
 
 {{/hasThumbnail}}
-
+
 
   {{lastModifiedMsg}}
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied3dbd7cf82749198e792a2f9d2241582aeff25c
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Note how to re-generate flow.dblist

[jenkins-bot (Code Review)]

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

Change subject: Note how to re-generate flow.dblist
..


Note how to re-generate flow.dblist

Change-Id: Id0cf6880594388aa812f7564d1be616797a96766
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c48b9e3..69e077a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16172,8 +16172,12 @@
 
 'wmgUseFlow' => [
'default' => false,
-   // This is computed in flow.dblist as all - "a specific list" 
(nonflow.dblist)
-   // - "all private wikis" (private.dblist) + "private wikis with Flow" 
(flowprivate.dblist)
+   // To update flow.dblist, regenerate it (with expanddblist) from
+   // flow-computed.dblist.
+   //
+   // as all - "a specific list" (nonflow.dblist)
+   // - "all private wikis" (private.dblist) - "all fishbowl wikis" 
(fishbowl.dblist)
+   // + "private wikis with Flow" (flowprivate.dblist)
'flow' => true,
 ],
 'wmgFlowEnglishNamespaceOnly' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0cf6880594388aa812f7564d1be616797a96766
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Mattflaschen 
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]: Note how to re-generate flow.dblist

[Mattflaschen (Code Review)]

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

Change subject: Note how to re-generate flow.dblist
..

Note how to re-generate flow.dblist

Change-Id: Id0cf6880594388aa812f7564d1be616797a96766
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b18b972..7e5329c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16163,8 +16163,12 @@
 
 'wmgUseFlow' => [
'default' => false,
-   // This is computed in flow.dblist as all - "a specific list" 
(nonflow.dblist)
-   // - "all private wikis" (private.dblist) + "private wikis with Flow" 
(flowprivate.dblist)
+   // To update flow.dblist, regenerate it (with expanddblist) from
+   // flow-computed.dblist.
+   //
+   // as all - "a specific list" (nonflow.dblist)
+   // - "all private wikis" (private.dblist) - "all fishbowl wikis" 
(fishbowl.dblist)
+   // + "private wikis with Flow" (flowprivate.dblist)
'flow' => true,
 ],
 'wmgFlowEnglishNamespaceOnly' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: setting archiva.w.o to use le 1 or 2

[RobH (Code Review)]

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

Change subject: setting archiva.w.o to use le 1 or 2
..

setting archiva.w.o to use le 1 or 2

this patch should generate the challenge file and setup new LE certs in
place on the archiva host.  it does NOT change the actual certificate
path, since doing that before generation will cause a race condition
failure.  (it tries to restart to create the challenge file, but cannot
reference the non-existent LE cert until its been generated.)

Bug:T154942
Change-Id: I16f899efd72013f428d54fb1e44b2ad6fd3632a0
---
M modules/archiva/manifests/proxy.pp
M modules/archiva/templates/proxy.nginx.erb
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/334229/1

diff --git a/modules/archiva/manifests/proxy.pp 
b/modules/archiva/manifests/proxy.pp
index 90c824c..59f4faf 100644
--- a/modules/archiva/manifests/proxy.pp
+++ b/modules/archiva/manifests/proxy.pp
@@ -40,9 +40,11 @@
 
 # Install the certificate if it is not the snakeoil cert
 if $certificate_name != 'ssl-cert-snakeoil' {
-sslcert::certificate { $certificate_name:
-before => Nginx::Site['archiva'],
-}
+letsencrypt::cert::integrated { 'archiva':
+subjects   => 'archiva.wikimedia.org',
+puppet_svc => 'nginx',
+system_svc => 'nginx',
+}
 }
 
 $ssl_certificate_chained = $certificate_name ? {
diff --git a/modules/archiva/templates/proxy.nginx.erb 
b/modules/archiva/templates/proxy.nginx.erb
index 3861d71..84cf6d8 100644
--- a/modules/archiva/templates/proxy.nginx.erb
+++ b/modules/archiva/templates/proxy.nginx.erb
@@ -13,6 +13,7 @@
 <% if @ssl_enabled %>
 server {
 listen 80;
+include /etc/acme/challenge-nginx.conf;
 return 301 https://$host$request_uri;
 }
 <% end %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16f899efd72013f428d54fb1e44b2ad6fd3632a0
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]: Designate sink: Don't use keystone to resolve project_id

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334228 )

Change subject: Designate sink:  Don't use keystone to resolve project_id
..

Designate sink:  Don't use keystone to resolve project_id

Now that project_id==project_name, we can leave keystone
out of the whole process.  That should make all of this
considerably less fragile.

Bug: T156297
Change-Id: Ib45a7efd70b7619c3bf3371e0a9ea02c74e7b330
---
M modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
M modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
M modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py
M modules/openstack/files/mitaka/designate/nova_fixed_multi/novamulti.py
M modules/openstack/templates/liberty/designate/designate.conf.erb
5 files changed, 14 insertions(+), 114 deletions(-)


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

diff --git a/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py 
b/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
index bde2d65..b9773c7 100644
--- a/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
+++ b/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py
@@ -23,12 +23,6 @@
 from designate.context import DesignateContext
 from designate.notification_handler.base import BaseAddressHandler
 from designate.objects import Record
-from keystoneclient.auth.identity import v3
-from keystoneclient import client
-from keystoneclient import exceptions as keystoneexceptions
-from keystoneclient.v3 import projects
-from keystoneclient import session
-
 
 LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
@@ -73,18 +67,9 @@
 
 context = DesignateContext.get_admin_context(all_tenants=True)
 
-# Extra magic!  The event record contains a tenant id but not a tenant 
name.  So
-#  if our formats include project_name then we need to ask keystone 
for the name.
-need_project_name = False
-for fmt in cfg.CONF[self.name].get('format'):
-if 'project_name' in fmt:
-need_project_name = True
-break
-if 'project_name' in cfg.CONF[self.name].get('reverse_format'):
-need_project_name = True
-if need_project_name:
-project_name = self._resolve_project_name(data['tenant_id'])
-data['project_name'] = project_name
+# We have a hack elsewhere in keystone to ensure that tenant id == 
tenant name.
+#  So... we can safely use the id in the fqdn.
+data['project_name'] = data['tenant_id']
 
 for addr in addresses:
 event_data = data.copy()
@@ -209,31 +194,3 @@
 central_api.delete_record(context,
   reverse_domain_id,
   record['recordset_id'], record['id'])
-
-def _resolve_project_name(self, tenant_id):
-try:
-username = cfg.CONF[self.name].keystone_auth_name
-passwd = cfg.CONF[self.name].keystone_auth_pass
-project = cfg.CONF[self.name].keystone_auth_project
-url = cfg.CONF[self.name].keystone_auth_url
-except KeyError:
-LOG.warn('Missing a config setting for keystone auth.')
-return
-
-try:
-auth = v3.Password(auth_url=url,
-   user_id=username,
-   password=passwd,
-   project_id=project)
-sess = session.Session(auth=auth)
-keystone = client.Client(session=sess, auth_url=url)
-except keystoneexceptions.AuthorizationFailure:
-LOG.warn('Keystone client auth failed.')
-return
-projectmanager = projects.ProjectManager(keystone)
-proj = projectmanager.get(tenant_id)
-if proj:
-LOG.debug('Resolved project id %s as %s' % (tenant_id, proj.name))
-return proj.name
-else:
-return 'unknown'
diff --git 
a/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py 
b/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
index 1c1b314..0f44b22 100644
--- a/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
+++ b/modules/openstack/files/liberty/designate/nova_fixed_multi/novamulti.py
@@ -37,11 +37,6 @@
 cfg.MultiStrOpt('format', default=[]),
 cfg.StrOpt('reverse-domain-id', default=None),
 cfg.StrOpt('reverse-format', default=None),
-
-cfg.StrOpt('keystone_auth_name', default=None),
-cfg.StrOpt('keystone_auth_pass', default=None),
-cfg.StrOpt('keystone_auth_project', default=None),
-cfg.StrOpt('keystone_auth_url', default=None),
 ], group='handler:nova_fixed_multi')
 
 
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid races in MessageCache::replace()

[jenkins-bot (Code Review)]

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

Change subject: Avoid races in MessageCache::replace()
..


Avoid races in MessageCache::replace()

Do the process cache update immediately (as before) but push
the shared cache updates to a deferred update. This update
will thus start with a clear transaction snapshot, so it can
acquire the lock before the first SELECT as is proper.

Also added some missing method visibilities.

Bug: T144952
Change-Id: I462554b300d4688b09ab80cd1bb8a4340ffaa786
---
M includes/cache/MessageCache.php
M tests/phpunit/includes/cache/MessageCacheTest.php
2 files changed, 97 insertions(+), 53 deletions(-)

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



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 352a94c..d40156d 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -444,7 +444,7 @@
 * @param integer $mode Use MessageCache::FOR_UPDATE to skip process 
cache
 * @return array Loaded messages for storing in caches
 */
-   function loadFromDB( $code, $mode = null ) {
+   protected function loadFromDB( $code, $mode = null ) {
global $wgMaxMsgCacheEntrySize, $wgLanguageCode, 
$wgAdaptiveMessageCache;
 
$dbr = wfGetDB( ( $mode == self::FOR_UPDATE ) ? DB_MASTER : 
DB_REPLICA );
@@ -518,7 +518,7 @@
wfDebugLog(
'MessageCache',
__METHOD__
-   . ": failed to load message 
page text for {$row->page_title} ($code)"
+   . ": failed to load message page text 
for {$row->page_title} ($code)"
);
} else {
$entry = ' ' . $text;
@@ -541,11 +541,11 @@
/**
 * Updates cache as necessary when message page is changed
 *
-* @param string|bool $title Name of the page changed (false if deleted)
+* @param string $title Message cache key with initial uppercase letter.
 * @param string|bool $text New contents of the page (false if deleted)
 */
public function replace( $title, $text ) {
-   global $wgMaxMsgCacheEntrySize, $wgContLang, $wgLanguageCode;
+   global $wgLanguageCode;
 
if ( $this->mDisable ) {
return;
@@ -557,63 +557,75 @@
return;
}
 
-   // Note that if the cache is volatile, load() may trigger a DB 
fetch.
-   // In that case we reenter/reuse the existing cache key lock to 
avoid
-   // a self-deadlock. This is safe as no reads happen *directly* 
in this
-   // method between getReentrantScopedLock() and load() below. 
There is
-   // no risk of data "changing under our feet" for replace().
-   $scopedLock = $this->getReentrantScopedLock( wfMemcKey( 
'messages', $code ) );
-   // Load the messages from the master DB to avoid race conditions
-   $this->load( $code, self::FOR_UPDATE );
-
-   // Load the new value into the process cache...
+   // (a) Update the process cache with the new message text
if ( $text === false ) {
+   // Page deleted
$this->mCache[$code][$title] = '!NONEXISTENT';
-   } elseif ( strlen( $text ) > $wgMaxMsgCacheEntrySize ) {
-   $this->mCache[$code][$title] = '!TOO BIG';
-   // Pre-fill the individual key cache with the known 
latest message text
-   $key = $this->wanCache->makeKey( 'messages-big', 
$this->mCache[$code]['HASH'], $title );
-   $this->wanCache->set( $key, " $text", $this->mExpiry );
} else {
+   // Ignore $wgMaxMsgCacheEntrySize so the process cache 
is up to date
$this->mCache[$code][$title] = ' ' . $text;
}
-   // Mark this cache as definitely being "latest" (non-volatile) 
so
-   // load() calls do not try to refresh the cache with replica DB 
data
-   $this->mCache[$code]['LATEST'] = time();
 
-   // Update caches if the lock was acquired
-   if ( $scopedLock ) {
-   $this->saveToCaches( $this->mCache[$code], 'all', $code 
);
-   } else {
-   LoggerFactory::getInstance( 'MessageCache' )->error(
-   __METHOD__ . ': could not acquire lock to 
update {title} ({code})',
-   [ 'title' => $title, 'code' => $code ] );
-   }
+   

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Add box shadow to headers

[Jdlrobson (Code Review)]

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

Change subject: Add box shadow to headers
..

Add box shadow to headers

The chrome-header is now opt in (not added by default)
This restores the correct chrome headers for talk, category
and notification overlays and only shows it for the Search
overlay. #blamenirzar

Bug: T152458
Change-Id: I1c7129bd18effb1e72c63ee2afb2b15ab5a56840
---
M includes/skins/minerva.mustache
M resources/mobile.languages.structured/LanguageOverlay.js
M resources/mobile.overlays/Overlay.js
M resources/mobile.overlays/Overlay.less
M resources/mobile.search/SearchOverlay.js
M resources/skins.minerva.base.styles/ui.less
6 files changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 616f275..9ec03a0 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -8,7 +8,7 @@

{{>banners}}

-   
+   

{{{menuButton}}}

diff --git a/resources/mobile.languages.structured/LanguageOverlay.js 
b/resources/mobile.languages.structured/LanguageOverlay.js
index fc13b40..9b8889e 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.js
+++ b/resources/mobile.languages.structured/LanguageOverlay.js
@@ -46,8 +46,7 @@
inputPlaceholder: mw.msg( 
'mobile-frontend-languages-structured-overlay-search-input-placeholder' ),
// we can't rely on CSS only to uppercase the headings. 
See 
https://stackoverflow.com/questions/3777443/css-text-transform-not-working-properly-for-turkish-characters
allLanguagesHeader: mw.msg( 
'mobile-frontend-languages-structured-overlay-all-languages-header' 
).toLocaleUpperCase(),
-   suggestedLanguagesHeader: mw.msg( 
'mobile-frontend-languages-structured-overlay-suggested-languages-header' 
).toLocaleUpperCase(),
-   headerChrome: false
+   suggestedLanguagesHeader: mw.msg( 
'mobile-frontend-languages-structured-overlay-suggested-languages-header' 
).toLocaleUpperCase()
} ),
/** @inheritdoc */
templatePartials: $.extend( {}, 
Overlay.prototype.templatePartials, {
diff --git a/resources/mobile.overlays/Overlay.js 
b/resources/mobile.overlays/Overlay.js
index 8f2eeb3..e9fdb4d 100644
--- a/resources/mobile.overlays/Overlay.js
+++ b/resources/mobile.overlays/Overlay.js
@@ -79,7 +79,7 @@
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).toHtmlString(),
headerButtonsListClassName: '',
-   headerChrome: true,
+   headerChrome: false,
fixedHeader: true,
spinner: icons.spinner().toHtmlString()
},
diff --git a/resources/mobile.overlays/Overlay.less 
b/resources/mobile.overlays/Overlay.less
index a1b1ee6..e7ea056 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -297,11 +297,6 @@
 
 .overlay-header-container {
top: 0;
-   border-bottom-color: @chromeContentSeparator;
-
-   &.header-chrome {
-   background-color: @chromeColor;
-   }
 }
 
 .overlay-footer-container {
diff --git a/resources/mobile.search/SearchOverlay.js 
b/resources/mobile.search/SearchOverlay.js
index 2b21455..5a047d7 100644
--- a/resources/mobile.search/SearchOverlay.js
+++ b/resources/mobile.search/SearchOverlay.js
@@ -65,6 +65,7 @@
 * @cfg {Object} defaults.feedback options for the feedback 
link below the search results
 */
defaults: $.extend( {}, Overlay.prototype.defaults, {
+   headerChrome: true,
clearIcon: new Icon( {
tagName: 'button',
name: 'clear',
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 327ab7e..6aa6ab1 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -15,8 +15,13 @@
 }
 
 .header-container {
-   background-color: @chromeColor;
-   border-bottom: 1px solid transparent;
+   border-bottom: solid 1px @chromeContentSeparator;
+
+   &.header-chrome {
+   background-color: @chromeColor;
+   border: none;
+   box-shadow: inset 0px -1px 3px rgba(0, 0, 0, 0.08);
+   }
 }
 
 #searchIcon {

-- 
To view, visit https://gerrit.wikimedia.org/r/334226
To 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Add box shadow to headers

[Jdlrobson (Code Review)]

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

Change subject: Add box shadow to headers
..

Add box shadow to headers

The chrome-header is now opt in (not added by default)
This restores the correct chrome headers for talk, category
and notification overlays and only shows it for the Search
overlay. #blamenirzar

Bug: T152458
Change-Id: I1c7129bd18effb1e72c63ee2afb2b15ab5a56840
---
M includes/skins/minerva.mustache
M resources/mobile.languages.structured/LanguageOverlay.js
M resources/mobile.overlays/Overlay.js
M resources/mobile.overlays/Overlay.less
M resources/mobile.search/SearchOverlay.js
M resources/skins.minerva.base.styles/ui.less
6 files changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 2e59c92..eefbdf6 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -8,7 +8,7 @@

{{>banners}}

-   
+   

{{{menuButton}}}

diff --git a/resources/mobile.languages.structured/LanguageOverlay.js 
b/resources/mobile.languages.structured/LanguageOverlay.js
index fc13b40..9b8889e 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.js
+++ b/resources/mobile.languages.structured/LanguageOverlay.js
@@ -46,8 +46,7 @@
inputPlaceholder: mw.msg( 
'mobile-frontend-languages-structured-overlay-search-input-placeholder' ),
// we can't rely on CSS only to uppercase the headings. 
See 
https://stackoverflow.com/questions/3777443/css-text-transform-not-working-properly-for-turkish-characters
allLanguagesHeader: mw.msg( 
'mobile-frontend-languages-structured-overlay-all-languages-header' 
).toLocaleUpperCase(),
-   suggestedLanguagesHeader: mw.msg( 
'mobile-frontend-languages-structured-overlay-suggested-languages-header' 
).toLocaleUpperCase(),
-   headerChrome: false
+   suggestedLanguagesHeader: mw.msg( 
'mobile-frontend-languages-structured-overlay-suggested-languages-header' 
).toLocaleUpperCase()
} ),
/** @inheritdoc */
templatePartials: $.extend( {}, 
Overlay.prototype.templatePartials, {
diff --git a/resources/mobile.overlays/Overlay.js 
b/resources/mobile.overlays/Overlay.js
index 8f2eeb3..e9fdb4d 100644
--- a/resources/mobile.overlays/Overlay.js
+++ b/resources/mobile.overlays/Overlay.js
@@ -79,7 +79,7 @@
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).toHtmlString(),
headerButtonsListClassName: '',
-   headerChrome: true,
+   headerChrome: false,
fixedHeader: true,
spinner: icons.spinner().toHtmlString()
},
diff --git a/resources/mobile.overlays/Overlay.less 
b/resources/mobile.overlays/Overlay.less
index a1b1ee6..e7ea056 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -297,11 +297,6 @@
 
 .overlay-header-container {
top: 0;
-   border-bottom-color: @chromeContentSeparator;
-
-   &.header-chrome {
-   background-color: @chromeColor;
-   }
 }
 
 .overlay-footer-container {
diff --git a/resources/mobile.search/SearchOverlay.js 
b/resources/mobile.search/SearchOverlay.js
index 7cdb52d..9ee0b11 100644
--- a/resources/mobile.search/SearchOverlay.js
+++ b/resources/mobile.search/SearchOverlay.js
@@ -65,6 +65,7 @@
 * @cfg {Object} defaults.feedback options for the feedback 
link below the search results
 */
defaults: $.extend( {}, Overlay.prototype.defaults, {
+   headerChrome: true,
clearIcon: new Icon( {
tagName: 'button',
name: 'clear',
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 5f9af8e..f7657a4 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -15,8 +15,13 @@
 }
 
 .header-container {
-   background-color: @chromeColor;
-   border-bottom: 1px solid transparent;
+   border-bottom: solid 1px @chromeContentSeparator;
+
+   &.header-chrome {
+   background-color: @chromeColor;
+   border: none;
+   box-shadow: inset 0px -1px 3px rgba(0, 0, 0, 0.08);
+   }
 }
 
 #searchIcon {

-- 
To view, visit https://gerrit.wikimedia.org/r/334227
To 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Some leftover cleanup from the switch to domino for treebuil...

[Arlolra (Code Review)]

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

Change subject: Some leftover cleanup from the switch to domino for treebuilding
..

Some leftover cleanup from the switch to domino for treebuilding

 * Should have been part of 37a109a69

Change-Id: I4cde895b89c09488608bb3719738df9f6b2540ca
---
M lib/wt2html/HTML5TreeBuilder.js
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/lib/wt2html/HTML5TreeBuilder.js b/lib/wt2html/HTML5TreeBuilder.js
index 6a58fa5..31e325e 100644
--- a/lib/wt2html/HTML5TreeBuilder.js
+++ b/lib/wt2html/HTML5TreeBuilder.js
@@ -52,14 +52,10 @@
this.pipelineId = id;
 };
 
-// HTML5 tokenizer stubs
-TreeBuilder.prototype.setState = function(state) {};
-
 TreeBuilder.prototype.resetState = function() {
// Reset vars
this.tagId = 1;  // Assigned to start/self-closing tags
this.inTransclusion = false;
-   this.precededByPre = false;
 
/* 
 * Crude tracking of whether we are in a table

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cde895b89c09488608bb3719738df9f6b2540ca
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] operations/puppet[production]: Keystone: Assign more threads to the admin API uwsgi handler

[Andrew Bogott (Code Review)]

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

Change subject: Keystone: Assign more threads to the admin API uwsgi handler
..


Keystone: Assign more threads to the admin API uwsgi handler

Seems like this has an awful lot of threads already, but
I'm seeing intermittent keystoneclient.exceptions.ConnectionRefused
and this might help.

Bug: T156297
Change-Id: Ib16bf9ad95a157b7fed4611d7e211b3226863565
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 5a23fa5..f5bdbc1 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -106,7 +106,7 @@
 wsgi-file => '/usr/bin/keystone-wsgi-admin',
 name  => 'keystone',
 processes => '20',
-threads   => '2',
+threads   => '4',
 logto => '/var/log/keystone/uwsgi/keystone-admin.log',
 logger=> 
'file:/var/log/keystone/uwsgi/keystone-admin-uwsgi.log',
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib16bf9ad95a157b7fed4611d7e211b3226863565
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystone: Assign more threads to the admin API uwsgi handler

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334224 )

Change subject: Keystone: Assign more threads to the admin API uwsgi handler
..

Keystone: Assign more threads to the admin API uwsgi handler

Seems like this has an awful lot of threads already, but
I'm seeing intermittent keystoneclient.exceptions.ConnectionRefused
and this might help.

Bug: T156297
Change-Id: Ib16bf9ad95a157b7fed4611d7e211b3226863565
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/334224/1

diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 5a23fa5..f5bdbc1 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -106,7 +106,7 @@
 wsgi-file => '/usr/bin/keystone-wsgi-admin',
 name  => 'keystone',
 processes => '20',
-threads   => '2',
+threads   => '4',
 logto => '/var/log/keystone/uwsgi/keystone-admin.log',
 logger=> 
'file:/var/log/keystone/uwsgi/keystone-admin-uwsgi.log',
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib16bf9ad95a157b7fed4611d7e211b3226863565
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix fatal in prod caused by deprecated function removal

[MaxSem (Code Review)]

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

Change subject: Fix fatal in prod caused by deprecated function removal
..

Fix fatal in prod caused by deprecated function removal

Bug: T156310
Change-Id: I3cc42352cdd32928226a403cabe49dc8d1cb1ce4
---
M backend/FlaggedRevision.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index c812eae..fec26c6 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -6,6 +6,7 @@
  * of templates and files (to determine template inclusion and thumbnails)
  */
 class FlaggedRevision {
+   /** @var Revision */
private $mRevision; // base revision
private $mTemplates;// included template versions
private $mFiles;// included file versions
@@ -477,7 +478,7 @@
 * @return string|false revision timestamp in MW format
 */
public function getRevText() {
-   return $this->mRevision->getText();
+   return ContentHandler::getContentText( 
$this->mRevision->getContent() );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Add an html/parsoid section for a nowiki test

[Arlolra (Code Review)]

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

Change subject: Add an html/parsoid section for a nowiki test
..

Add an html/parsoid section for a nowiki test

Change-Id: I0ebbc6bca8fbfe3c6656da35e15d39e998e36370
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index bafb8e5..5e63865 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -591,7 +591,6 @@
 add("html2wt", "Non-word characters don't terminate tag names (bug 17663, 
40670, 52022)", "a\n\n doesn't 
terminate \n\n doesn't terminate \n\n doesn't terminate 
\n\n doesn't terminate \n\n\n");
 add("html2wt", "Non-word characters don't terminate tag names + tidy", 
"a\n\n doesn't terminate \n\n doesn't terminate 
\n\n doesn't terminate \n\n doesn't terminate 
\n\n\n");
 add("html2wt", "Bare pipe character from a template (bug 52363)", "|\n");
-add("html2wt", "Entities inside ", "<\n");
 add("html2wt", "T71950: 2. Put nowiki as close to cause as possible, after ' 
:'", "This text : L''[[Foo]]\n");
 add("html2wt", "Comments and Indent-Pre", " asdf\n\n asdf\n\n asdf\n\nxyz\n\n 
asdf\n xyz\n");
 add("html2wt", "Comment test 2a", "asdf\njkl\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 847066c..8b9720d 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -1488,9 +1488,11 @@
 Entities inside 
 !! wikitext
 
-!! html
+!! html/php
 
 
+!! html/parsoid
+
 !! end
 
 !! test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ebbc6bca8fbfe3c6656da35e15d39e998e36370
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] operations/puppet[production]: switch install_server to carbon for initial rsync of APT rep...

[Dzahn (Code Review)]

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

Change subject: switch install_server to carbon for initial rsync of APT repo 
data
..


switch install_server to carbon for initial rsync of APT repo data

The install_server setting in Hiera influences which servers
gets rsync and ferm rules to be able to rsync APT repo data (/srv/)
from.

Switch it to carbon temporarily to run an initial rsync
from carbon to install1001 and install2001.

Later switch it back to install1001 to sync from there to 2001
and stop using carbon.

Bug: T843380
Bug: T132757
Change-Id: I11d8239576cf067f1a6bd679e42ff4864fb18e34
---
M hieradata/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f950a80..91638ec 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -452,4 +452,4 @@
 id: 2003
 
 deployment_server: tin.eqiad.wmnet
-install_server: install1001.wikimedia.org
+install_server: carbon.wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11d8239576cf067f1a6bd679e42ff4864fb18e34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
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]: Merge filebackend-labs.php and filebackend-production.php

[jenkins-bot (Code Review)]

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

Change subject: Merge filebackend-labs.php and filebackend-production.php
..


Merge filebackend-labs.php and filebackend-production.php

Change-Id: If0834fc057ad66f95606ad1b0d88f068949802f9
---
M wmf-config/CommonSettings.php
D wmf-config/filebackend-labs.php
R wmf-config/filebackend.php
3 files changed, 38 insertions(+), 232 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 07e81b3..7514e16 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1036,7 +1036,7 @@
 
 if ( $wmgUseClusterFileBackend ) {
# Cluster-dependent files for file backend
-   require "{$wmfConfigDir}/filebackend-{$wmfRealm}.php";
+   require "{$wmfConfigDir}/filebackend.php";
 } else {
$wgUseInstantCommons = true;
 }
diff --git a/wmf-config/filebackend-labs.php b/wmf-config/filebackend-labs.php
deleted file mode 100644
index c55a267..000
--- a/wmf-config/filebackend-labs.php
+++ /dev/null
@@ -1,216 +0,0 @@
- 'SwiftFileBackend',
-   'name'   => "local-swift-eqiad",
-   'wikiId' => "{$site}-{$lang}",
-   'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig['eqiad']['authUrl'],
-   'swiftUser'  => $wmfSwiftConfig['eqiad']['user'],
-   'swiftKey'   => $wmfSwiftConfig['eqiad']['key'],
-   'swiftTempUrlKey'=> $wmfSwiftConfig['eqiad']['tempUrlKey'],
-   'shardViaHashLevels' => [
-   'local-public'
-   => [ 'levels' => $wmfSwiftShardLocal, 'base' => 16, 
'repeat' => 1 ],
-   'local-thumb'
-   => [ 'levels' => $wmfSwiftShardLocal, 'base' => 16, 
'repeat' => 1 ],
-   'local-temp'
-   => [ 'levels' => $wmfSwiftShardLocal, 'base' => 16, 
'repeat' => 1 ],
-   'local-transcoded'
-   => [ 'levels' => $wmfSwiftShardLocal, 'base' => 16, 
'repeat' => 1 ],
-   'local-deleted'
-   => [ 'levels' => $wmfSwiftShardLocal, 'base' => 36, 
'repeat' => 0 ]
-   ],
-   'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true,
-   // When used by FileBackendMultiWrite, read from this cluster if it's 
the local one
-   'readAffinity'   => true
-];
-$wgFileBackends[] = [ // backend config for wiki's access to shared repo
-   'class'  => 'SwiftFileBackend',
-   'name'   => "shared-swift-eqiad",
-   'wikiId' => "wikipedia-commons",
-   'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig['eqiad']['authUrl'],
-   'swiftUser'  => $wmfSwiftConfig['eqiad']['user'],
-   'swiftKey'   => $wmfSwiftConfig['eqiad']['key'],
-   'swiftTempUrlKey'=> $wmfSwiftConfig['eqiad']['tempUrlKey'],
-   'shardViaHashLevels' => [
-   'local-public'
-   => [ 'levels' => $wmfSwiftShardCommon, 'base' => 16, 
'repeat' => 1 ],
-   'local-thumb'
-   => [ 'levels' => $wmfSwiftShardCommon, 'base' => 16, 
'repeat' => 1 ],
-   'local-temp'
-   => [ 'levels' => $wmfSwiftShardCommon, 'base' => 16, 
'repeat' => 1 ],
-   'local-transcoded'
-   => [ 'levels' => $wmfSwiftShardCommon, 'base' => 16, 
'repeat' => 1 ],
-   ],
-   'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true,
-   // When used by FileBackendMultiWrite, read from this cluster if it's 
the local one
-   'readAffinity'   => true
-];
-$wgFileBackends[] = [ // backend config for wiki's access to shared files
-   'class'  => 'SwiftFileBackend',
-   'name'   => "global-swift-eqiad",
-   'wikiId' => "global-data",
-   'lockManager'=> 'redisLockManager',
-   'swiftAuthUrl'   => $wmfSwiftConfig['eqiad']['authUrl'],
-   'swiftUser'  => $wmfSwiftConfig['eqiad']['user'],
-   'swiftKey'   => $wmfSwiftConfig['eqiad']['key'],
-   'swiftTempUrlKey'=> $wmfSwiftConfig['eqiad']['tempUrlKey'],
-   'shardViaHashLevels' => [
-   'math-render'  => [ 'levels' => 2, 'base' => 16, 'repeat' => 0 
],
-   ],
-   'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true,
-   // When used by FileBackendMultiWrite, read from this cluster if it's 
the local one
-   'readAffinity'   => true
-];
-$wgFileBackends[] = [ // backend config for wiki's access to shared test repo
-   'class'  => 'SwiftFileBackend',
-   'name'   => "shared-testwiki-swift-eqiad",
-   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: switch install_server to carbon for initial rsync of APT rep...

[Dzahn (Code Review)]

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

Change subject: switch install_server to carbon for initial rsync of APT repo 
data
..

switch install_server to carbon for initial rsync of APT repo data

The install_server setting in Hiera influences which servers
gets rsync and ferm rules to be able to rsync APT repo data (/srv/)
from.

Switch it to carbon temporarily to run an initial rsync
from carbon to install1001 and install2001.

Later switch it back to install1001 to sync from there to 2001
and stop using carbon.

Bug: T843380
Bug: T132757
Change-Id: I11d8239576cf067f1a6bd679e42ff4864fb18e34
---
M hieradata/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/334221/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f950a80..91638ec 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -452,4 +452,4 @@
 id: 2003
 
 deployment_server: tin.eqiad.wmnet
-install_server: install1001.wikimedia.org
+install_server: carbon.wikimedia.org

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable deprecation logging in prod

[jenkins-bot (Code Review)]

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

Change subject: Enable deprecation logging in prod
..


Enable deprecation logging in prod

Our deprecation policy requires code that is pending removal to
call wfDeprecated(), which will log to the 'deprecated' channel. We are
not logging this to logstash, which makes it possible for code to be
removed that is still being used somewhere in production. Enable this
logging channel so we get information about deprecated usage.

I think this is all that is needed, but there is a bit of a dance going
on in MWDebug::deprecated() so I'm not 100% sure.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 65d0453..c48b9e3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4644,6 +4644,7 @@
'csp' => 'info',
'csp-report-only' => 'info',
'DBPerformance' => [ 'logstash' => 'debug', 'udp2log' => 
'warning' ],
+   'deprecated' => 'debug',
'diff' => 'debug',
'Echo' => 'debug',
'es-hit' => 'debug',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8a7ddab914d537c591619ec7926e1630262f86f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: UploadBase: Allow RDF Schema namespace in SVG files

[jenkins-bot (Code Review)]

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

Change subject: UploadBase: Allow RDF Schema namespace in SVG files
..


UploadBase: Allow RDF Schema namespace in SVG files

Bug: T153285
Change-Id: I88938644e7e35ce9372ec33be687c7a899970534
---
M includes/upload/UploadBase.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 96f8638..79166ef 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1440,6 +1440,7 @@
'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
'http://www.w3.org/2000/svg',
'http://www.w3.org/tr/rec-rdf-syntax/',
+   'http://www.w3.org/2000/01/rdf-schema#',
];
 
// Inkscape mangles namespace definitions created by Adobe 
Illustrator.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88938644e7e35ce9372ec33be687c7a899970534
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix missing ct_id recovery

[jenkins-bot (Code Review)]

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

Change subject: Fix missing ct_id recovery
..


Fix missing ct_id recovery

We were returning a blank when there were no ct_ids on any associated
contributions. Don't return early if empty, and let the existing
backfill logic do its job.

Bug: T147873
Change-Id: Id6a9374260d6bbc4b73df90e3924cb6f38c6f198
---
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
M sites/all/modules/wmf_civicrm/tracking.inc
3 files changed, 23 insertions(+), 3 deletions(-)

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



diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module 
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 4b6588b..106e2b7 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -167,8 +167,10 @@
 $query = "SELECT id FROM {contribution_tracking} WHERE contribution_id 
IN ( {$id_list} )";
 // we can use this related contribution tracking id
 $contribution_tracking_id = db_query( $query )->fetchField();
-watchdog( 'recurring', 'recurring_get_contribution_tracking_id: 
Selected contrib tracking id from past contributions, %cti', array( '%cti' => 
$contribution_tracking_id ), WATCHDOG_DEBUG );
-return $contribution_tracking_id;
+if ( !empty( $contribution_tracking_id ) ) {
+  watchdog( 'recurring', 'recurring_get_contribution_tracking_id: 
Selected contrib tracking id from past contributions, %cti', array( '%cti' => 
$contribution_tracking_id ), WATCHDOG_DEBUG );
+  return $contribution_tracking_id;
+}
   }
 }
 
diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
index 7bfada8..fcc4d59 100644
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
@@ -186,4 +186,22 @@
$this->assertTrue( $result->getCommunicationStatus() );
$this->assertRegExp( '/SET_PAYMENT/', $result->getRawResponse() 
);
}
+
+   /**
+* Recover from missing ct_ids on all associated contributions
+*/
+   public function testBackfillContributionTracking() {
+   $id_list = implode( ',', $this->contributions );
+
+   $dbs = wmf_civicrm_get_dbs();
+   $dbs->push( 'donations' );
+   $query = "DELETE FROM {contribution_tracking} WHERE 
contribution_id IN( $id_list )";
+   db_query( $query );
+   $contribution_tracking_id = 
recurring_get_contribution_tracking_id( array(
+   'txn_type' => 'subscr_payment',
+   'subscr_id' => $this->subscriptionId,
+   'payment_date' => strtotime( "now" ),
+   ) );
+   $this->assertNotEmpty( $contribution_tracking_id );
+   }
 }
diff --git a/sites/all/modules/wmf_civicrm/tracking.inc 
b/sites/all/modules/wmf_civicrm/tracking.inc
index 178af4f..6d7739c 100644
--- a/sites/all/modules/wmf_civicrm/tracking.inc
+++ b/sites/all/modules/wmf_civicrm/tracking.inc
@@ -7,7 +7,7 @@
  * particular transaction.  Rare, but inserting some data for a trxn when
  * absent helps facilitate better analytics.
  * 
- * @return the contribution_tracking id 
+ * @return int the contribution_tracking id
  */
 function wmf_civicrm_insert_contribution_tracking( $utm_source, $utm_medium, 
$utm_campaign, $ts, $contrib_id=null, $optout=null, $anonymous=null ) {
 // make sure we're using the default (drupal) db

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/wikitech-static: add contact_group for https monitor

[Dzahn (Code Review)]

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

Change subject: icinga/wikitech-static: add contact_group for https monitor
..

icinga/wikitech-static: add contact_group for https monitor

Add a new contact group to Icinga called wikitech-static,
consisting of admins (IRC bot) and krenair.

Use contact group for newly added HTTPS monitoring of wikitech-static
for email notifications.

Bug: T156294
Change-Id: Ib018d82092b319eb58811015181cd38fe400ed68
---
M modules/icinga/manifests/monitor/certs.pp
M modules/nagios_common/files/contactgroups.cfg
2 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/334220/1

diff --git a/modules/icinga/manifests/monitor/certs.pp 
b/modules/icinga/manifests/monitor/certs.pp
index c7335fa..f0f6a17 100644
--- a/modules/icinga/manifests/monitor/certs.pp
+++ b/modules/icinga/manifests/monitor/certs.pp
@@ -9,9 +9,10 @@
 host_fqdn => 'blog.wikimedia.org',
 }
 monitoring::service { 'https_blog':
-description   => 'HTTPS-blog',
-check_command => 'check_ssl_http_letsencrypt!blog.wikimedia.org',
-host  => 'blog.wikimedia.org',
+description=> 'HTTPS-blog',
+check_command  => 'check_ssl_http_letsencrypt!blog.wikimedia.org',
+host   => 'blog.wikimedia.org',
+   contact_groups => 'wikitech-static',
 }
 
 # policy.wikimedia.org (external, Wordpress/Automattic)
diff --git a/modules/nagios_common/files/contactgroups.cfg 
b/modules/nagios_common/files/contactgroups.cfg
index 032e128..3a9007b 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -90,3 +90,8 @@
 contactgroup_name   legal
 members slaporte,zhousquared
 }
+
+define contactgroup {
+contactgroup_name   wikitech-static
+members admins, krenair
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib018d82092b319eb58811015181cd38fe400ed68
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] wikidata...rdf[master]: Replacing the custom assembly by an overlay to generate blaz...

[jenkins-bot (Code Review)]

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

Change subject: Replacing the custom assembly by an overlay to generate 
blazegraph WAR
..


Replacing the custom assembly by an overlay to generate blazegraph WAR

Using WAR overlays is a more standard way to customize an existing WAR
file. This is the technique used by blazegraph itself. Using overlay
lets Maven be aware of dependencies and opens the way to smarter dependency
management.

Change-Id: I5e7f0fefb02525bc3d2503dcf746e3804c2b022f
---
M .gitignore
M blazegraph/pom.xml
M dist/pom.xml
M dist/src/assembly/dist.xml
M pom.xml
M tools/pom.xml
M war/pom.xml
D war/src/assembly/dist.xml
R war/src/main/webapp/WEB-INF/web.xml
9 files changed, 72 insertions(+), 95 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 5b5c2bb..d3a36ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 **/rules.log
 .execution-hints-*.log
 node_modules
+war/overlays
\ No newline at end of file
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 2cc411d..a994b6a 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -41,10 +41,28 @@
   test
 
 
-   org.linkeddatafragments
-   ldfserver
-   0.1.1-wmf2
-   classes
+  org.linkeddatafragments
+  ldfserver
+  0.1.1-wmf2
+  classes
+  
+
+  javax.servlet
+  javax.servlet-api
+
+
+  org.eclipse.jetty
+  jetty-server
+
+
+  org.eclipse.jetty
+  jetty-servlet
+
+
+  commons-cli
+  commons-cli
+
+  
 
   
 
diff --git a/dist/pom.xml b/dist/pom.xml
index ef78b9c..ba8fd47 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -24,7 +24,6 @@
   org.wikidata.query.rdf
   blazegraph-service
   ${project.parent.version}
-  dist
   war
 
 
diff --git a/dist/src/assembly/dist.xml b/dist/src/assembly/dist.xml
index e413eed..a694704 100644
--- a/dist/src/assembly/dist.xml
+++ b/dist/src/assembly/dist.xml
@@ -54,7 +54,7 @@
 
   
   
-org.wikidata.query.rdf:blazegraph-service:war:dist
+org.wikidata.query.rdf:blazegraph-service:war
   
   false
 
diff --git a/pom.xml b/pom.xml
index f524816..779838c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
   
 UTF-8
 2.1.4
-2.8.1
+2.7.12
 9.2.9.v20150224
   
 
diff --git a/tools/pom.xml b/tools/pom.xml
index 0958837..678dcaa 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -19,6 +19,11 @@
 
   
 
+  
+
+2.8.1
+  
+
   
 
   com.google.guava
diff --git a/war/pom.xml b/war/pom.xml
index ac70242..58203f6 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -7,7 +7,7 @@
 0.2.4-SNAPSHOT
   
   blazegraph-service
-  pom
+  war
 
   Blazegraph Service Package
   Package for running Blazegraph service.
@@ -27,6 +27,19 @@
   war
 
 
+  org.linkeddatafragments
+  ldfserver
+  0.1.1-wmf2
+  war
+
+
+
+  com.blazegraph
+  bigdata-war
+  ${blazegraph.version}
+  pom
+
+
   org.wikidata.query.rdf
   common
 
@@ -35,29 +48,37 @@
   blazegraph
   ${project.parent.version}
 
-
-   org.linkeddatafragments
-   ldfserver
-   0.1.1-wmf2
-
   
 
   
 
   
 org.apache.maven.plugins
-maven-assembly-plugin
+maven-war-plugin
+3.0.0
 
-  src/assembly/dist.xml
+  
+
+  com.blazegraph
+  bigdata-war
+  
+
+WEB-INF/lib/*
+  
+
+
+  org.linkeddatafragments
+  ldfserver
+  
+WEB-INF/classes/assets/**
+  
+
+  
 
-
-  
-package
-
-  single
-
-  
-
   
 
   
diff --git a/war/src/assembly/dist.xml b/war/src/assembly/dist.xml
deleted file mode 100644
index 76c0c2d..000
--- a/war/src/assembly/dist.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd;>
-
-  dist
-  false
-
-  
-war
-  
-
-  
-
-  true
-  WEB-INF
-  ${project.basedir}/src/config
-
-  
-
-  
-
-  
-  true
-  
-com.blazegraph:bigdata-war:war
-  
-   
- 
-   **/web.xml
- 
-
-  false
- true
-
-
-
-  WEB-INF/lib
-  
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

a5a7c70 Update libraries (no more Stomp!)

Also update vendor and stop nulling out packages-dev in composer.lock

Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
---
M composer.lock
M vendor
2 files changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 31128a6..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1204,9 +1204,6 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-<<< HEAD   (cd058a Merge branch 'master' into deployment)
-"packages-dev": null,
-===
 "packages-dev": [
 {
 "name": "doctrine/instantiator",
@@ -2265,7 +2262,6 @@
 "time": "2016-11-23 20:04:58"
 }
 ],
->>> BRANCH (a5a7c7 Update libraries (no more Stomp!))
 "aliases": [],
 "minimum-stability": "stable",
 "stability-flags": {
diff --git a/vendor b/vendor
index 4260d17..e3c1e1c 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 4260d175c1691436047aa1e1d8fb19c50b823f03
+Subproject commit e3c1e1c5474b032280763d753c31479e942124bf

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

a5a7c70 Update libraries (no more Stomp!)

Also update vendor and stop nulling out packages-dev in composer.lock

Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
---
M composer.lock
M vendor
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/19/334219/1

diff --git a/composer.lock b/composer.lock
index 31128a6..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1204,9 +1204,6 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-<<< HEAD   (cd058a Merge branch 'master' into deployment)
-"packages-dev": null,
-===
 "packages-dev": [
 {
 "name": "doctrine/instantiator",
@@ -2265,7 +2262,6 @@
 "time": "2016-11-23 20:04:58"
 }
 ],
->>> BRANCH (a5a7c7 Update libraries (no more Stomp!))
 "aliases": [],
 "minimum-stability": "stable",
 "stability-flags": {
diff --git a/vendor b/vendor
index 4260d17..e3c1e1c 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 4260d175c1691436047aa1e1d8fb19c50b823f03
+Subproject commit e3c1e1c5474b032280763d753c31479e942124bf

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Install package nethogs from jessie-backports

[Madhuvishy (Code Review)]

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

Change subject: labstore: Install package nethogs from jessie-backports
..

labstore: Install package nethogs from jessie-backports

Change-Id: I88318b3a399c15b0588052c00fefea22fec389f2
---
M modules/labstore/manifests/init.pp
1 file changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/modules/labstore/manifests/init.pp 
b/modules/labstore/manifests/init.pp
index ed44e05..6aa91f9 100644
--- a/modules/labstore/manifests/init.pp
+++ b/modules/labstore/manifests/init.pp
@@ -11,6 +11,19 @@
 require_package('lvm2')
 require_package('nfsd-ldap')
 
+# Nethogs is useful to monitor NFS client resource utilization
+# The version in jessie has a bug that shows up in linux kernel 4.2+,
+# so using newer version from backports.
+apt::pin {'nethogs':
+pin  => 'release a=jessie-backports',
+priority => '1001',
+before   => Package['nethogs'],
+}
+
+package { 'nethogs':
+ensure => present,
+}
+
 $ldapincludes = ['openldap', 'nss', 'utils']
 class { 'ldap::role::client::labs': ldapincludes => $ldapincludes }
 

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add table column tests

[jenkins-bot (Code Review)]

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

Change subject: VisualDiff: Add table column tests
..


VisualDiff: Add table column tests

This adds coverage to the subtree methods, putting us >90% coverage
for all visual diff files.

Change-Id: I5640305a9ea1dc7f67fc41704d6082992b527b42
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index 03c40e7..e38bb67 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -131,6 +131,30 @@
'' +
'foo bar bazbaz!' +
''
+   },
+   {
+   msg: 'Insert table column',
+   oldDoc: 
'AC',
+   newDoc: 
'ABCD',
+   expected:
+   '' +
+   '' +
+   'AB' +
+   'CD' +
+   '' +
+   ''
+   },
+   {
+   msg: 'Remove table column',
+   oldDoc: 
'ABCD',
+   newDoc: 
'AC',
+   expected:
+   '' +
+   '' +
+   'AB' +
+   'CD' +
+   '' +
+   ''
}
];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5640305a9ea1dc7f67fc41704d6082992b527b42
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Tchanders 
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]: Set src as the original value when using title as href

[jenkins-bot (Code Review)]

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

Change subject: Set src as the original value when using title as href
..


Set src as the original value when using title as href

 * Further regression fixing following fa6906a and 643d5392

Change-Id: Ifdfb167859a0c96837076d411feea8ced9d57912
---
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 34 insertions(+), 26 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 43ad0e8..66a2c71 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1063,7 +1063,7 @@

innerContain.addNormalizedAttribute('href', this.env.makeLink(link), 
opts.link.src);
} else {
// Treat same as if opts.link weren't 
present
-   
innerContain.addNormalizedAttribute('href', this.env.makeLink(opts.title.v));
+   
innerContain.addNormalizedAttribute('href', this.env.makeLink(opts.title.v), 
opts.title.src);
// but maybe consider it a caption
var pos = 
token.dataAttribs.optList.reduce(function(prv, cur, ind) {
return cur.ck === 'link' ? ind 
: prv;
@@ -1076,7 +1076,7 @@
}
// No href if link= was specified
} else {
-   innerContain.addNormalizedAttribute('href', 
this.env.makeLink(opts.title.v));
+   innerContain.addNormalizedAttribute('href', 
this.env.makeLink(opts.title.v), opts.title.src);
}
}
 
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index b9eb71f..bafb8e5 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -142,7 +142,7 @@
 add("wt2html", "{{#speciale:}} page name, unknown", "Parser 
function implementation for pf_#speciale missing in Parsoid.");
 add("wt2html", "Image with link parameter, wgNoFollowLinks set to false", "http://example.com/\; data-parsoid=\"{}\">");
 add("wt2html", "Image with link parameter, wgNoFollowDomainExceptions", "http://example.com/\; data-parsoid=\"{}\">");
-add("wt2html", "SVG thumbnails with invalid language code", "caption");
+add("wt2html", "SVG thumbnails with invalid language code", "caption");
 add("wt2html", "BUG 561: {{/Subpage}}", "Warning:
 Page/template fetching disabled, and no cache for Page/Subpage");
 add("wt2html", "PAGESINCATEGORY invalid title fatal (r33546 fix)", "Parser
 function implementation for pf_pagesincategory missing in Parsoid.");
 add("wt2html", "Parsoid: Defaultsort (template-generated)", "");
@@ -173,12 +173,12 @@
 add("wt2html", "Say the magic word", " 
Parser
 test\n \n Parser
 test\n Parser
 test\n Warning:
 Page/template fetching disabled, and no cache for 
Template:BASEPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:BASEPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAMEE\n 
Parser
 test\n Warning:
 Page/template fetching disabled, and no cache for 
Template:TALKPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTPAGENAME\n Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTPAGENAMEE\n Main\n Main\n 0\n Talk\n Warning:
 Page/template fetching disabled, and no cache for 
Template:TALKSPACEE\n 
Main\n Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTSPACEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:Dynamic");
 add("wt2html", "Gallery override link with absolute external link with 
LanguageConverter", "\nhttp://www.example.org\;>caption\n");
 add("wt2html", "Illegal character references (T106578)", " 
Null �\n FF \f\n CR \r\n Control (low) \b\n Control (high) 
 Ÿ\n Surrogate ��\n This is an okay astral 
character ");
-add("wt2html", "Centre-aligned image", "");
-add("wt2html", "None-aligned image", "");
-add("wt2html", "Width + Height sized image (using px) (height is ignored)", 
"");
-add("wt2html", "Width-sized image (using px, no following whitespace)", "");
-add("wt2html", "Width-sized image (using px, with following whitespace - test 
regression from r39467)", "");
-add("wt2html", "Width-sized image (using px, with preceding whitespace - 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add paragraph moving tests

[jenkins-bot (Code Review)]

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

Change subject: VisualDiff: Add paragraph moving tests
..


VisualDiff: Add paragraph moving tests

Change-Id: I434909c088a71c3d54f1528b35c02384727147e7
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index 6fc482e..03c40e7 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -111,6 +111,26 @@
'' +
'Alien' +
''
+   },
+   {
+   msg: 'Paragraphs moved',
+   oldDoc: 'foobar',
+   newDoc: 'barfoo',
+   expected:
+   'bar' +
+   'foo'
+   },
+   {
+   msg: 'Paragraphs moved and modified',
+   oldDoc: 'foo bar bazquux whee',
+   newDoc: 'quux whee!foo bar baz!',
+   expected:
+   '' +
+   'quux wheewhee!' +
+   '' +
+   '' +
+   'foo bar bazbaz!' +
+   ''
}
];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I434909c088a71c3d54f1528b35c02384727147e7
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add node insertion/removal tests

[jenkins-bot (Code Review)]

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

Change subject: VisualDiff: Add node insertion/removal tests
..


VisualDiff: Add node insertion/removal tests

Change-Id: I724bf1e0ea2d9f06ca9bd48cad474fa6825c2df3
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index e2c8561..6fc482e 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -91,6 +91,26 @@
'' +
'bar' +
''
+   },
+   {
+   msg: 'Node inserted',
+   oldDoc: 'foo',
+   newDoc: 'fooAlien',
+   expected:
+   'foo' +
+   '' +
+   'Alien' +
+   ''
+   },
+   {
+   msg: 'Node removed',
+   oldDoc: 'fooAlien',
+   newDoc: 'foo',
+   expected:
+   'foo' +
+   '' +
+   'Alien' +
+   ''
}
];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I724bf1e0ea2d9f06ca9bd48cad474fa6825c2df3
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Tchanders 
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]: (WIP) Drop in replacement of eval.php based on psysh

[Hashar (Code Review)]

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

Change subject: (WIP) Drop in replacement of eval.php based on psysh
..

(WIP) Drop in replacement of eval.php based on psysh

eval.php is meant to eval() commands in MediaWiki global scope. We had
at least a couple attempts to move it to a regular Maintenance script.

As noted on the revert commit b475e930 r54839, using a Maintenance
script drop us in the callee function scope instead of the global scope.
That is a hard requirement.

http://psysh.org/ is a Read-Eval-Print-Loop. It supports injecting a
scope (eg: $GLOBALS, which address the revert reason mentioned above).
The integration as a maintenance script ends up straightforward.

Introduce maintenance/console.php with MediaWikiConsole class.
Support the undocumented '-d' arguments from eval.php:
  0 set $wgDebugLogFile to stdout. Eval.php used /dev/stdout, make it
php://stdout in the new script.
  1 additionally set DBO_DEBUG on all the database load balancer servers

Passing command from stdin is supported.
Execution is forked for graceful handling of PHP fatal errors.
Color!!!

Example usage:

$ php maintenance/console.php

>>> $wgFullyInitialised
=> true

>>> $hashar = User::newFromName( 'hashar' )
=> User {#274
 +mId: null,
 +mName: "Hashar",
 ...

>>> ls --long --all $h


Bug: T117661
Change-Id: I3d6d42e138d3cc4a0aaafdd7f5f97cb17d8b8cb3
---
M composer.json
A maintenance/console.php
2 files changed, 88 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/334217/1

diff --git a/composer.json b/composer.json
index e825152..9ea6a46 100644
--- a/composer.json
+++ b/composer.json
@@ -54,6 +54,7 @@
"nikic/php-parser": "2.1.0",
"nmred/kafka-php": "0.1.5",
"phpunit/phpunit": "4.8.31",
+   "psy/psysh": "0.8.1",
"wikimedia/avro": "1.7.7"
},
"suggest": {
diff --git a/maintenance/console.php b/maintenance/console.php
new file mode 100644
index 000..c493391
--- /dev/null
+++ b/maintenance/console.php
@@ -0,0 +1,87 @@
+http://psysh.org/ and drop a console in the global
+ * scope.
+ *
+ * Copyright © 2017 Antoine Musso 
+ * Copyright © 2017 Wikimedia Foundation Inc.
+ * https://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Interactive shell with completion and global scope.
+ *
+ */
+class MediaWikiConsole extends Maintenance {
+
+   public function __construct() {
+   parent::__construct();
+   $this->addOption( 'd',
+   'For back compatibility with eval.php. ' .
+   '0 send debug to stdout. ' .
+   'With 1 additionally initialize database with debugging 
',
+   false, true
+   );
+   }
+
+   public function execute() {
+   global $__builtInGlobals;
+
+   $shell = new \Psy\Shell();
+   if ( $this->hasOption( 'd' ) ) {
+   $this->setupLegacy();
+   }
+
+   $shell->setScopeVariables( $GLOBALS );
+   $shell->run();
+   }
+
+   /**
+* For back compatibility with eval.php
+*/
+   protected function setupLegacy() {
+   global $wgDebugLogFile;
+
+   $d = intval( $this->getOption( 'd' ) );
+   if ( $d > 0 ) {
+   $wgDebugLogFile = 'php://stdout';
+   }
+   if ( $d > 1 ) {
+   # Set DBO_DEBUG (equivalent of $wgDebugDumpSql)
+   # XXX copy pasted from eval.php :(
+   $lb = wfGetLB();
+   $serverCount = $lb->getServerCount();
+   for ( $i = 0; $i < $serverCount; $i++ ) {
+   $server = $lb->getServerInfo( $i );
+   $server['flags'] |= DBO_DEBUG;
+   $lb->setServerInfo( $i, $server );
+  

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Remove Stomp, update other libraries

[Ejegg (Code Review)]

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

Change subject: Remove Stomp, update other libraries
..


Remove Stomp, update other libraries

(also snip the traits out of Psr\log to placate php53lint)

Change-Id: I22cca38819c8f608e113ca378a9e56d99638c0e7
---
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
A coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/LICENSE
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/installed.json
D fusesource/stomp-php/.gitignore
D fusesource/stomp-php/.travis.yml
D fusesource/stomp-php/README.md
D fusesource/stomp-php/build.xml
D fusesource/stomp-php/composer.json
D fusesource/stomp-php/examples/activemq-connectivity.xml
D fusesource/stomp-php/examples/activemq-security.xml
D fusesource/stomp-php/examples/binary.php
D fusesource/stomp-php/examples/connectivity.php
D fusesource/stomp-php/examples/durable.php
D fusesource/stomp-php/examples/first.php
D fusesource/stomp-php/examples/security.php
D fusesource/stomp-php/examples/transactions.php
D fusesource/stomp-php/examples/transformation.php
D fusesource/stomp-php/phpunit.xml
D fusesource/stomp-php/src/FuseSource/Stomp/Exception/StompException.php
D fusesource/stomp-php/src/FuseSource/Stomp/ExceptionInterface.php
D fusesource/stomp-php/src/FuseSource/Stomp/Frame.php
D fusesource/stomp-php/src/FuseSource/Stomp/Message.php
D fusesource/stomp-php/src/FuseSource/Stomp/Message/Bytes.php
D fusesource/stomp-php/src/FuseSource/Stomp/Message/Map.php
D fusesource/stomp-php/src/FuseSource/Stomp/Stomp.php
D fusesource/stomp-php/tests/bootstrap.php
D fusesource/stomp-php/tests/functional/StompASyncTest.php
D fusesource/stomp-php/tests/functional/StompFailoverTest.php
D fusesource/stomp-php/tests/functional/StompRabbitTest.php
D fusesource/stomp-php/tests/functional/StompSslTest.php
D fusesource/stomp-php/tests/functional/StompSyncTest.php
D fusesource/stomp-php/tests/functional/StompTest.php
D fusesource/stomp-php/tests/stubbed/StompUnitTest.php
D fusesource/stomp-php/tests/stubbed/fusesource_stream_function_stubs.php
D fusesource/stomp-php/travisci/bin/ci/install_dependencies.sh
D fusesource/stomp-php/travisci/conf/amq/activemq.xml
M minfraud/http/Changes
M minfraud/http/README.md
M minfraud/http/composer.json
M minfraud/http/examples/minfraud.php
M minfraud/http/src/HTTPBase.php
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/Event.php
M symfony/event-dispatcher/EventDispatcher.php
M symfony/event-dispatcher/GenericEvent.php
M symfony/event-dispatcher/LICENSE
M symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php
M symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
M 
symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
M symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
M symfony/http-foundation/AcceptHeader.php
M symfony/http-foundation/AcceptHeaderItem.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/Cookie.php
M symfony/http-foundation/File/File.php
M symfony/http-foundation/File/MimeType/ExtensionGuesser.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/LICENSE
M symfony/http-foundation/RedirectResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
M symfony/http-foundation/StreamedResponse.php
M symfony/http-foundation/Tests/CookieTest.php
M symfony/http-foundation/Tests/File/FileTest.php
M symfony/http-foundation/Tests/JsonResponseTest.php
M symfony/http-foundation/Tests/RequestTest.php
M symfony/http-foundation/Tests/ResponseHeaderBagTest.php
M symfony/http-foundation/Tests/ResponseTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
M symfony/polyfill-mbstring/Mbstring.php
M symfony/polyfill-mbstring/bootstrap.php
M 

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Make sorting of projects case insensitive in ApiQueryProjects

[Kaldari (Code Review)]

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

Change subject: Make sorting of projects case insensitive in ApiQueryProjects
..

Make sorting of projects case insensitive in ApiQueryProjects

Otherwise it will list the projects like:
Afghanistan, Pinball, Woodworking, etymology, iOS, liberalism

Change-Id: If8b9730c4c2480b2242f0e3f32de109eeab512ca
---
M api/ApiQueryProjects.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/api/ApiQueryProjects.php b/api/ApiQueryProjects.php
index d12faff..4a53a54 100644
--- a/api/ApiQueryProjects.php
+++ b/api/ApiQueryProjects.php
@@ -31,7 +31,7 @@
if ( !$params['subprojects'] ) {
$this->addWhere( 'pap_parent_id IS NULL' );
}
-   $this->addOption( 'ORDER BY', 'pap_project_title' );
+   $this->addOption( 'ORDER BY', 'UPPER( pap_project_title )' );
 
// Execute the query and put the results in an array
$db_res = $this->select( __METHOD__ );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8b9730c4c2480b2242f0e3f32de109eeab512ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
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] mediawiki...parsoid[master]: Set attributes as strings

[jenkins-bot (Code Review)]

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

Change subject: Set attributes as strings
..


Set attributes as strings

Change-Id: I77179eafc9c2369a5f465baffad89f36b4a33fed
---
M lib/wt2html/tt/LinkHandler.js
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 5f02fc2..43ad0e8 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1046,8 +1046,8 @@
 
if (!/\bmw:Error\b/.test(rdfaType)) {
// Add (read-only) information about original file size (T64881)
-   img.addAttribute('data-file-width', info.width);
-   img.addAttribute('data-file-height', info.height);
+   img.addAttribute('data-file-width', String(info.width));
+   img.addAttribute('data-file-height', String(info.height));
img.addAttribute('data-file-type', 
info.mediatype.toLowerCase());
}
 
@@ -1135,11 +1135,11 @@
}
 
if (size.height) {
-   img.addNormalizedAttribute('height', size.height.toString());
+   img.addNormalizedAttribute('height', String(size.height));
}
 
if (size.width) {
-   img.addNormalizedAttribute('width', size.width.toString());
+   img.addNormalizedAttribute('width', String(size.width));
}
 
// If the format is something we *recognize*, add the subtype

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77179eafc9c2369a5f465baffad89f36b4a33fed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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]: Rewrite extract2 to handle Article::getContent() disappearing

[jenkins-bot (Code Review)]

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

Change subject: Rewrite extract2 to handle Article::getContent() disappearing
..


Rewrite extract2 to handle Article::getContent() disappearing

Change-Id: I1b1ff93898f74b7b4c510c23423f70c44ed2fa2e
---
M w/extract2.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/w/extract2.php b/w/extract2.php
index c9895c5..85b6709 100644
--- a/w/extract2.php
+++ b/w/extract2.php
@@ -26,7 +26,7 @@
 
 $wgTitle = Title::newFromText( $template );
 $wgArticle = new Article( $wgTitle );
-$rawHtml = $wgArticle->getContent( false );
+$rawHtml = $wgArticle->getPage()->getContent()->getNativeData();
 
 $lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp( TS_UNIX, 
$wgArticle->getTouched() ) ) . ' GMT';
 header( 'Content-Type: text/html; charset=utf-8' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b1ff93898f74b7b4c510c23423f70c44ed2fa2e
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add debug logging

[MaxSem (Code Review)]

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

Change subject: Add debug logging
..

Add debug logging

For "Empty regular expression in 
php-1.29.0-wmf.9/includes/parser/DateFormatter.php"

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/334215/1

diff --git a/includes/parser/DateFormatter.php 
b/includes/parser/DateFormatter.php
index 08e3c77..d5af6e7 100644
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -198,6 +198,10 @@
// Another horrible hack
$this->mLinked = $linked;
$text = preg_replace_callback( $regex, [ &$this, 
'replace' ], $text );
+   if ( $text === null ) {
+   wfDebugLog( 'AdHocDebug', 'Empty regex 
processing '
+   . 
RequestContext::getMain()->getTitle()->getPrefixedText() );
+   }
unset( $this->mLinked );
}
return $text;

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update libraries (no more Stomp!)

[jenkins-bot (Code Review)]

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

Change subject: Update libraries (no more Stomp!)
..


Update libraries (no more Stomp!)

Change-Id: Ie4469b95afa8ba721783737ffaff856131593004
---
M composer.lock
1 file changed, 111 insertions(+), 154 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index f2f8e19..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "d56c5bd69dad595f2e00a3e10c851736b1feb57b"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2017-01-04 21:01:15"
 },
 {
 "name": "cogpowered/finediff",
@@ -203,56 +203,6 @@
 "time": "2014-05-19 10:25:02"
 },
 {
-"name": "fusesource/stomp-php",
-"version": "2.1.1",
-"source": {
-"type": "git",
-"url": "https://github.com/dejanb/stomp-php.git;,
-"reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/dejanb/stomp-php/zipball/4ac51c0abee05078e198faf13f48c056a72f8f8c;,
-"reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.0"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"FuseSource": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"Apache-2.0"
-],
-"authors": [
-{
-"name": "Dejan Bosnanac",
-"email": "de...@nighttale.net",
-"homepage": "http://www.nighttale.net;
-},
-{
-"name": "Sören Rohweder",
-"email": "s.rohwe...@blage.net",
-"homepage": "http://www.monofone.de;
-}
-],
-"description": "stomp support for PHP",
-"homepage": "http://github.com/dejanb/stomp-php;,
-"keywords": [
-"activeMQ",
-"jms",
-"messaging",
-"stomp"
-],
-"abandoned": "stomp-php/stomp-php",
-"time": "2013-02-23 17:34:44"
-},
-{
 "name": "ircmaxell/password-compat",
 "version": "v1.0.4",
 "source": {
@@ -296,23 +246,22 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -333,7 +282,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
 },
 {
 "name": "monolog/monolog",
@@ -659,22 +608,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-   

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Add test for non-semantic whitespace diff

[jenkins-bot (Code Review)]

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

Change subject: Add test for non-semantic whitespace diff
..


Add test for non-semantic whitespace diff

Change-Id: I4a96b771a7f490c0ee7105205d09ea94c37c8d8e
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index cd42b90..5f6b6b9 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -26,6 +26,12 @@
''
},
{
+   msg: 'Non semantic whitespace change (no diff)',
+   oldDoc: 'foo',
+   newDoc: '  foo  ',
+   expected: 'No changes'
+   },
+   {
msg: 'Simple text change with non-whitespace 
word break boundaires',
oldDoc: 'foo"bar"baz',
newDoc: 'foo"bXr"baz',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a96b771a7f490c0ee7105205d09ea94c37c8d8e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Add i18n for 'No changes' message

[jenkins-bot (Code Review)]

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

Change subject: Add i18n for 'No changes' message
..


Add i18n for 'No changes' message

Change-Id: Iabad266e6b6b83861197e9dcd01536cf4e51bb34
---
M i18n/en.json
M i18n/qqq.json
M src/ui/elements/ve.ui.DiffElement.js
M tests/ui/ve.ui.DiffElement.test.js
4 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index a06f1cc..a1f7993 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -64,6 +64,7 @@
"visualeditor-dialog-language-search-title": "Select language",
"visualeditor-dialog-table-caption": "Caption",
"visualeditor-dialog-table-title": "Table properties",
+   "visualeditor-diff-nochanges": "No changes",
"visualeditor-dimensionswidget-px": "px",
"visualeditor-dimensionswidget-times": "×",
"visualeditor-find-and-replace-done": "Done",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 584403e..03bf4aa 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -72,6 +72,7 @@
"visualeditor-dialog-language-search-title": "Title for language search 
dialog\n{{Identical|Select language}}",
"visualeditor-dialog-table-caption": "Label for caption toggle in table 
dialog.\n{{Identical|Caption}}",
"visualeditor-dialog-table-title": "Title for the table dialog.",
+   "visualeditor-diff-nochanges": "Label shown when there are no changes 
in the diff",
"visualeditor-dimensionswidget-px": "{{optional}}\nLabel for the 
dimensions properties denoting pixel units.",
"visualeditor-dimensionswidget-times": "{{optional}}\nLabel for the 
dimensions properties denoting 'by', as in width x height.",
"visualeditor-find-and-replace-done": "Label for button to finish using 
the find and replace dialog\n{{Identical|Done}}",
diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index 63b6e24..948ce4a 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -137,7 +137,7 @@
}
 
if ( !anyChanges ) {
-   return [ $( '' 
).text( 'No changes' ) ];
+   return [ $( '' 
).text( ve.msg( 'visualeditor-diff-nochanges' ) ) ];
} else {
return diffHtml;
}
diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index 5f6b6b9..e2c8561 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -29,7 +29,7 @@
msg: 'Non semantic whitespace change (no diff)',
oldDoc: 'foo',
newDoc: '  foo  ',
-   expected: 'No changes'
+   expected: '' + ve.msg( 'visualeditor-diff-nochanges' 
) + ''
},
{
msg: 'Simple text change with non-whitespace 
word break boundaires',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabad266e6b6b83861197e9dcd01536cf4e51bb34
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: raid_handler improvements

[Volans (Code Review)]

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

Change subject: icinga: raid_handler improvements
..


icinga: raid_handler improvements

- cleanup default ArgumentParser action (store)
- use Nagios variable for service description, cleanup Puppet code to
  not pass it as parameter
- add option --message-remain to include the remaining lines of the
  Nagios status message, if multiline
- add option --skip-nrpe to not perform the NRPE call to gather the RAID
  status but instead use the complete Nagios status message in the task.
  This option is required for frack instances where an NRPE call is not
  possible
- allow to pass 'n/a' as RAID type, if the information is not available.
  In this case it behaves as --skip-nrpe was set.

Once merged it requires a change in secret('nagios/nsca_frack.cfg') to
add the event handler for the check_raid checks with something like:
event_handler  raid_handler_skip_nrpe!raid-type!dcname

where:
- raid-type is one of ('megacli', 'hpssacli', 'mpt', 'md', 'n/a'). When
  using raid_handler_skip_nrpe is just used in messages and
  logging, so also a 'n/a' can be provided if the information is not
  available.
- dcname is the datacenter where the host is in (i.e. eqiad), and has to
  match the equivalent Phabricator component (ops-$dcname).

Bug: T149913
Change-Id: I1b052f01d887908d25f9555cb1ae549728c835a9
---
M modules/icinga/files/raid_handler.py
M modules/icinga/templates/event_handlers/raid_handler.cfg.erb
M modules/raid/manifests/init.pp
3 files changed, 46 insertions(+), 30 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jgreen: Looks good to me, but someone else must approve
  Volans: Looks good to me, approved



diff --git a/modules/icinga/files/raid_handler.py 
b/modules/icinga/files/raid_handler.py
index 0700433..de144e3 100644
--- a/modules/icinga/files/raid_handler.py
+++ b/modules/icinga/files/raid_handler.py
@@ -5,6 +5,7 @@
 import ConfigParser
 import logging
 import subprocess
+import sys
 import time
 import zlib
 
@@ -15,7 +16,7 @@
 SERVICE_STATES = ('OK', 'UNKNOWN', 'WARNING', 'CRITICAL')
 SERVICE_STATE_TYPES = ('SOFT', 'HARD')
 
-RAID_TYPES = ('megacli', 'hpssacli', 'mpt', 'md')
+RAID_TYPES = ('megacli', 'hpssacli', 'mpt', 'md', 'n/a')
 COMPRESSED_RAID_TYPES = ('megacli', 'hpssacli')
 
 SKIP_STRINGS = ('timeout', 'timed out', 'connection refused', 'out of bounds')
@@ -34,8 +35,8 @@
 PHABRICATOR_TASK_TITLE = "Degraded RAID on {host}"
 PHABRICATOR_TASK_DESCRIPTION_PREFIX = (
 "TASK AUTO-GENERATED by Nagios/Icinga RAID event handler\n\n"
-"A degraded RAID [[ {url} | was detected ]] on host `{host}`. An "
-"automatic snapshot of the current RAID status is attached below.\n\n"
+"A degraded RAID ({type}) [[ {url} | was detected ]] on host `{host}`. "
+"An automatic snapshot of the current RAID status is attached below.\n\n"
 "Please **sync with the service owner** to find the appropriate time "
 "window before actually replacing any failed hardware."
 )
@@ -49,29 +50,35 @@
 parser = argparse.ArgumentParser(
 description='Nagios/Icinga event handler for RAID checks')
 parser.add_argument(
-'-s', dest='service_state', action='store', required=True,
+'-s', dest='service_state', required=True,
 choices=SERVICE_STATES, help='Nagios/Icinga service state')
 parser.add_argument(
-'-t', dest='service_state_type', action='store', required=True,
+'-t', dest='service_state_type', required=True,
 choices=SERVICE_STATE_TYPES, help='Nagios/Icinga service state type')
 parser.add_argument(
-'-a', dest='service_attempts', action='store', required=True, type=int,
+'-a', dest='service_attempts', required=True, type=int,
 help='Nagios/Icinga service retry attemp counter')
 parser.add_argument(
-'-H', dest='host_address', action='store', required=True,
+'-H', dest='host_address', required=True,
 help='Hostname/address of the monitored host')
 parser.add_argument(
-'-r', dest='raid_type', action='store', required=True,
-choices=RAID_TYPES, help='The RAID type')
+'-r', dest='raid_type', required=True, choices=RAID_TYPES,
+help='The RAID type, if n/a behaves as --skip-nrpe was set')
 parser.add_argument(
-'-D', dest='service_description', action='store', required=True,
+'-D', dest='service_description', required=True,
 help='The Nagios/Icinga service description')
 parser.add_argument(
-'-c', dest='datacenter', action='store', required=True,
+'-c', dest='datacenter', required=True,
 help='The name of the datacenter the host is located in')
 parser.add_argument(
-'-m', dest='message', action='store', required=True,
+'-m', 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.9]: Add debug logging

[MaxSem (Code Review)]

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

Change subject: Add debug logging
..

Add debug logging

For "Empty regular expression in 
php-1.29.0-wmf.9/includes/parser/DateFormatter.php"

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/14/334214/1

diff --git a/includes/parser/DateFormatter.php 
b/includes/parser/DateFormatter.php
index 40da368..a7b7282 100644
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -192,6 +192,10 @@
// Another horrible hack
$this->mLinked = $linked;
$text = preg_replace_callback( $regex, [ &$this, 
'replace' ], $text );
+   if ( $text === null ) {
+   wfDebugLog( 'AdHocDebug', 'Empty regex 
processing '
+   . 
RequestContext::getMain()->getTitle()->getPrefixedText() );
+   }
unset( $this->mLinked );
}
return $text;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88e7031d174dcadb6c10a463dccae368195e84b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.9
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: InstantCommons: do not cache thumbs

[jenkins-bot (Code Review)]

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

Change subject: InstantCommons: do not cache thumbs
..


InstantCommons: do not cache thumbs

There is no point in local thumb caching when we set apibase
and thumbUrl to the remote wiki. It will only confuse MediaWiki
into creating local thumbnails for certain LinksUpdate tasks
even though the rendered page will reference thumbnails hosted
on Commons.

Bug: T145496
Change-Id: I0bd4b539f575036dd865bdd946660f10a9ee8801
---
M includes/Setup.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index 9f722af..c452779 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -242,7 +242,7 @@
'transformVia404' => true,
'fetchDescription' => true,
'descriptionCacheExpiry' => 43200,
-   'apiThumbCacheExpiry' => 86400,
+   'apiThumbCacheExpiry' => 0,
];
 }
 /*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bd4b539f575036dd865bdd946660f10a9ee8801
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Set attributes as strings

[Arlolra (Code Review)]

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

Change subject: Set attributes as strings
..

Set attributes as strings

Change-Id: I77179eafc9c2369a5f465baffad89f36b4a33fed
---
M lib/wt2html/tt/LinkHandler.js
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 5f02fc2..43ad0e8 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1046,8 +1046,8 @@
 
if (!/\bmw:Error\b/.test(rdfaType)) {
// Add (read-only) information about original file size (T64881)
-   img.addAttribute('data-file-width', info.width);
-   img.addAttribute('data-file-height', info.height);
+   img.addAttribute('data-file-width', String(info.width));
+   img.addAttribute('data-file-height', String(info.height));
img.addAttribute('data-file-type', 
info.mediatype.toLowerCase());
}
 
@@ -1135,11 +1135,11 @@
}
 
if (size.height) {
-   img.addNormalizedAttribute('height', size.height.toString());
+   img.addNormalizedAttribute('height', String(size.height));
}
 
if (size.width) {
-   img.addNormalizedAttribute('width', size.width.toString());
+   img.addNormalizedAttribute('width', String(size.width));
}
 
// If the format is something we *recognize*, add the subtype

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77179eafc9c2369a5f465baffad89f36b4a33fed
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] operations/puppet[production]: nfs: Make labstore1004 source for backups to secondary DC

[Madhuvishy (Code Review)]

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

Change subject: nfs: Make labstore1004 source for backups to secondary DC
..


nfs: Make labstore1004 source for backups to secondary DC

labstore1004 is the drbd secondary host right now, so we'll
have the backups to codfw set up here

Change-Id: Ic406babfe0c6a1ec83c7442efcc5787479867283
---
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.pp
2 files changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
index ac6cb01..617ebd9 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
@@ -8,12 +8,13 @@
 }
 
 labstore::device_backup { 'secondary-misc':
-remotehost  => 'labstore1005.eqiad.wmnet',
+remotehost  => 'labstore1004.eqiad.wmnet',
 remote_vg   => 'misc',
 remote_lv   => 'misc-project',
 remote_snapshot => 'misc-snap',
 localdev=> '/dev/backup/misc-project',
-weekday => 'tuesday',
+weekday => 'wednesday',
+hour=> 20,
 }
 
 }
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
index 76d1299..fe0020f 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
@@ -8,12 +8,13 @@
 }
 
 labstore::device_backup { 'secondary-tools':
-remotehost  => 'labstore1005.eqiad.wmnet',
+remotehost  => 'labstore1004.eqiad.wmnet',
 remote_vg   => 'tools',
 remote_lv   => 'tools-project',
 remote_snapshot => 'tools-snap',
 localdev=> '/dev/backup/tools-project',
-weekday => 'monday',
+weekday => 'tuesday',
+hour=> 20,
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic406babfe0c6a1ec83c7442efcc5787479867283
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Juniorsys 
Gerrit-Reviewer: Madhuvishy 
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[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

349b521 Always reconnect before sending queue messages
041a47f Round off all the geo_codes to 4 digits
4132268 Early return when there are no contacts to dedupe
fca1b88 Revert "Round off all the geo_codes to 4 digits"
1d1c10b Better fix for lat/long woes

Change-Id: I16c90fc58e3b4b542889a38a7fa0109b80e25b97
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 587 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 7566635..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<<< HEAD   (af8d73 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $this->contribution_id,
-'version' => '3',
-) );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$api = civicrm_api_classapi();
-$api->Contact->Get( array(
-'id' => $contribution['contact_id'],
-'version' => 3,
-) );
-$contact = (array) $api->values[0];
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $expected['contact'], $contact ) );
-foreach (array_keys($renamedFields) as $renamedField) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-'value' => $contact[$renamedField . '_id'],
-'option_group_id' => 'individual_' . $renamedField,
-'return' => 'name',
-)), $expected['contact'][$renamedField]);
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-// Make static so it isn't destroyed until class cleanup.
-self::$fixtures = CiviFixtures::create();
-
-$contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-$payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-$payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-$gateway_txn_id = mt_rand();
-$check_number = (string) mt_rand();
-
-$new_prefix = 'M' . mt_rand();
-
-return array(
- 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: API improvements needed for ProofreadPage extension.

[jenkins-bot (Code Review)]

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

Change subject: API improvements needed for ProofreadPage extension.
..


API improvements needed for ProofreadPage extension.

ProofreadPage wants to fetch its content w/ a specific non-wikitext
contentformat.

Change-Id: I3e039e36fd8202b5a068a7dcb2303e99bada8ad6
---
M lib/config/extapi.js
M lib/mw/ApiRequest.js
2 files changed, 11 insertions(+), 3 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified
  Arlolra: Looks good to me, approved



diff --git a/lib/config/extapi.js b/lib/config/extapi.js
index 193e30e..5b01687 100644
--- a/lib/config/extapi.js
+++ b/lib/config/extapi.js
@@ -28,6 +28,7 @@
// and explicitly mark the exported functions as 
"stable", ie
// we need to bump Parsoid's major version if the 
exported
// functions are changed.
+   TemplateRequest: 
require('../mw/ApiRequest.js').TemplateRequest,
Util: require('../utils/Util.js').Util,
DOMUtils: require('../utils/DOMUtils.js').DOMUtils,
JSUtils: require('../utils/jsutils.js').JSUtils,
diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index 2e4b440..c2f81fe 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -488,12 +488,13 @@
  * @param {string} title The template (or really, page) we should fetch from 
the wiki
  * @param {string} oldid The revision ID you want to get, defaults to "latest 
revision"
  */
-function TemplateRequest(env, title, oldid) {
+function TemplateRequest(env, title, oldid, opts) {
ApiRequest.call(this, env, title);
// IMPORTANT: Set queueKey to the 'title'
// since TemplateHandler uses it for recording listeners
this.queueKey = title;
this.reqType = "Template Fetch";
+   opts = opts || {}; // optional extra arguments
 
var apiargs = {
format: 'json',
@@ -502,6 +503,12 @@
rawcontinue: 1,
rvprop: PARSOID_RVPROP,
};
+
+   // Allow request to give a specific contentformat
+   // (otherwise wikitext is the default)
+   if (opts.contentformat) {
+   apiargs.rvcontentformat = opts.contentformat;
+   }
 
if (oldid) {
this.oldid = oldid;
@@ -613,8 +620,8 @@
 TemplateRequest.promise = promiseFor(TemplateRequest);
 
 // Function which returns a promise to set page src info.
-TemplateRequest.setPageSrcInfo = function(env, target, oldid) {
-   return TemplateRequest.promise(env, target, oldid).then(function(src) {
+TemplateRequest.setPageSrcInfo = function(env, target, oldid, opts) {
+   return TemplateRequest.promise(env, target, oldid, 
opts).then(function(src) {
env.setPageSrcInfo(src);
});
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e039e36fd8202b5a068a7dcb2303e99bada8ad6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

349b521 Always reconnect before sending queue messages
041a47f Round off all the geo_codes to 4 digits
4132268 Early return when there are no contacts to dedupe
fca1b88 Revert "Round off all the geo_codes to 4 digits"
1d1c10b Better fix for lat/long woes

Change-Id: I16c90fc58e3b4b542889a38a7fa0109b80e25b97
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 587 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/12/334212/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 7566635..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<<< HEAD   (af8d73 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $this->contribution_id,
-'version' => '3',
-) );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$api = civicrm_api_classapi();
-$api->Contact->Get( array(
-'id' => $contribution['contact_id'],
-'version' => 3,
-) );
-$contact = (array) $api->values[0];
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $expected['contact'], $contact ) );
-foreach (array_keys($renamedFields) as $renamedField) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-'value' => $contact[$renamedField . '_id'],
-'option_group_id' => 'individual_' . $renamedField,
-'return' => 'name',
-)), $expected['contact'][$renamedField]);
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-// Make static so it isn't destroyed until class cleanup.
-self::$fixtures = CiviFixtures::create();
-
-$contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-$payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-$payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-$gateway_txn_id = mt_rand();
-$check_number = (string) mt_rand();
-
-$new_prefix = 'M' . mt_rand();
-
-return array(

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Better fix for lat/long woes

[jenkins-bot (Code Review)]

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

Change subject: Better fix for lat/long woes
..


Better fix for lat/long woes

Rebuild the zip code lookup table with decimal columns, re-run update.

Bug: T155677
Change-Id: I2b6f70d63e46e2fedbae8601c3eb2e044ac03033
---
M sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
M sites/all/modules/wmf_civicrm/update_7310.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
3 files changed, 29 insertions(+), 13 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
index dc29374..236b1c5 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
@@ -453,8 +453,8 @@
 'city' => 'Somerville',
 'postal_code' => '02144',
 'street_address' => '1 Davis Square',
-'geo_code_1' => '42.3995',
-'geo_code_2' => '-71.1217',
+'geo_code_1' => '42.399546',
+'geo_code_2' => '-71.12165',
 'timezone' => 'UTC-5',
 )
 ),
diff --git a/sites/all/modules/wmf_civicrm/update_7310.php 
b/sites/all/modules/wmf_civicrm/update_7310.php
index 2df4676..6ca7979 100644
--- a/sites/all/modules/wmf_civicrm/update_7310.php
+++ b/sites/all/modules/wmf_civicrm/update_7310.php
@@ -3,13 +3,14 @@
 function _wmf_civicrm_update_7310_add_zip_geo() {
   $queries = array();
 
+  $queries[] = 'DROP TABLE IF EXISTS `wmf_zip_geo`';
   $queries[] = '
 CREATE TABLE `wmf_zip_geo` (
`zip` char(5) primary key,
`city` varchar(64),
`state` char(2),
-   `latitude` float,
-   `longitude` float,
+   `latitude` decimal(10,6),
+   `longitude` decimal(10,6),
`timezone` varchar(8),
`dst` tinyint
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index f15b5ea..96d1c9a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2375,8 +2375,8 @@
 CREATE TEMPORARY TABLE civicrm_address_geocode (
   id INT PRIMARY KEY,
   zip CHAR(5),
-  latitude DECIMAL (13,9),
-  longitude DECIMAL (13,9),
+  latitude DECIMAL (10,6),
+  longitude DECIMAL (10,6),
   timezone VARCHAR(8)
 )");
 
@@ -2396,13 +2396,18 @@
   c.timezone = g.timezone
   ");
 
-  CRM_Core_DAO::executeQuery("
-UPDATE civicrm_address a
-INNER JOIN civicrm_address_geocode c ON c.id = a.id
-SET a.geo_code_1 = c.latitude,
-  a.geo_code_2 = c.longitude,
-  a.timezone = c.timezone
-  ");
+  $batch = 10;
+  for($startId = 0; $startId < 210 * $batch; $startId += $batch) {
+$endId = $startId + $batch;
+CRM_Core_DAO::executeQuery("
+  UPDATE civicrm_address a
+  INNER JOIN civicrm_address_geocode c ON c.id = a.id
+  SET a.geo_code_1 = c.latitude,
+a.geo_code_2 = c.longitude,
+a.timezone = c.timezone
+  WHERE a.id BETWEEN $startId AND $endId
+");
+  }
 }
 
 /**
@@ -2467,3 +2472,13 @@
 AND entity_table = 'civicrm_contact'
   ");
 }
+
+/**
+ * Re-run fixed geocoding updates
+ *
+ * Bug: T155677
+ */
+function wmf_civicrm_update_7450() {
+  wmf_civicrm_update_7310();
+  wmf_civicrm_update_7320();
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: delete uni.wikimedia.org.crt

[Dzahn (Code Review)]

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

Change subject: delete uni.wikimedia.org.crt
..

delete uni.wikimedia.org.crt

This cert appears to have expired in December 2016:

openssl x509 -noout -dates < uni.wikimedia.org.crt  | grep After
notAfter=Dec 10 22:46:04 2016 GMT

So it should not be used anywhere.

Change-Id: I0ee1548f1455ce0ada223a2a372f624ff8cb62fe
---
D files/ssl/uni.wikimedia.org.crt
1 file changed, 0 insertions(+), 45 deletions(-)


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

diff --git a/files/ssl/uni.wikimedia.org.crt b/files/ssl/uni.wikimedia.org.crt
deleted file mode 100644
index e77c35c..000
--- a/files/ssl/uni.wikimedia.org.crt
+++ /dev/null
@@ -1,45 +0,0 @@
--BEGIN CERTIFICATE-
-MIIH3jCCBsagAwIBAgISESH2lUWyuuWm+VU1ZscSAZTOMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUxMjEwMjI0NjA0WhcNMTYxMjEwMjI0NjA0WjB5MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xGDAWBgNV
-BAMMDyoud2lraXBlZGlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANvQN+78a8YI+ibAMthX8AXlOMO7mb5IKHagPjyMOjnq4fJ00T9xUbJVJVi+
-6Qg7hmB7TzIWEnXj9CbNwOmf6qnlL7/6VLwUNPhsdbyW2NaF8Xy2WwYN/qZnrXNL
-cs9r/wL4ZyJDb4a8E5n8fvSogPuIdGSnAEKEe1C1+gMCvtxREioDXk1atIp/5v2i
-vMYK1a8sYmqlt1tDEKWjLj7ecIsWTo+iS0HH9yaoDqE8EYTJdWOMxXuIXILr4gCg
-SE7U63dyCji8gpKUeR52QHTqgCM36Ic491aH8HACEv0LhMaugBQxnP+i17uwXSC5
-fZvQSDBO1mXVIGBYSFK8n6MQBSUCAwEAAaOCBHEwggRtMA4GA1UdDwEB/wQEAwIF
-oDBJBgNVHSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3
-dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzCCArYGA1UdEQSCAq0wggKpgg8q
-Lndpa2lwZWRpYS5vcmeCDW1lZGlhd2lraS5vcmeCDXdpa2lib29rcy5vcmeCDHdp
-a2lkYXRhLm9yZ4INd2lraW1lZGlhLm9yZ4IXd2lraW1lZGlhZm91bmRhdGlvbi5v
-cmeCDHdpa2luZXdzLm9yZ4INd2lraXF1b3RlLm9yZ4IOd2lraXNvdXJjZS5vcmeC
-D3dpa2l2ZXJzaXR5Lm9yZ4IOd2lraXZveWFnZS5vcmeCDndpa3Rpb25hcnkub3Jn
-ggZ3Lndpa2mCDyoubWVkaWF3aWtpLm9yZ4IPKi53aWtpYm9va3Mub3Jngg4qLndp
-a2lkYXRhLm9yZ4IPKi53aWtpbWVkaWEub3JnghkqLndpa2ltZWRpYWZvdW5kYXRp
-b24ub3Jngg4qLndpa2luZXdzLm9yZ4IPKi53aWtpcXVvdGUub3JnghAqLndpa2lz
-b3VyY2Uub3JnghEqLndpa2l2ZXJzaXR5Lm9yZ4IQKi53aWtpdm95YWdlLm9yZ4IQ
-Ki53aWt0aW9uYXJ5Lm9yZ4IRKi5tLm1lZGlhd2lraS5vcmeCESoubS53aWtpcGVk
-aWEub3JnghEqLm0ud2lraWJvb2tzLm9yZ4IQKi5tLndpa2lkYXRhLm9yZ4IRKi5t
-Lndpa2ltZWRpYS5vcmeCGyoubS53aWtpbWVkaWFmb3VuZGF0aW9uLm9yZ4IQKi5t
-Lndpa2luZXdzLm9yZ4IRKi5tLndpa2lxdW90ZS5vcmeCEioubS53aWtpc291cmNl
-Lm9yZ4ITKi5tLndpa2l2ZXJzaXR5Lm9yZ4ISKi5tLndpa2l2b3lhZ2Uub3JnghIq
-Lm0ud2lrdGlvbmFyeS5vcmeCFCouemVyby53aWtpcGVkaWEub3Jngg13aWtpcGVk
-aWEub3JnMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MEkGA1UdHwRCMEAwPqA8oDqGOGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3Mv
-Z3Nvcmdhbml6YXRpb252YWxzaGEyZzIuY3JsMIGgBggrBgEFBQcBAQSBkzCBkDBN
-BggrBgEFBQcwAoZBaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQv
-Z3Nvcmdhbml6YXRpb252YWxzaGEyZzJyMS5jcnQwPwYIKwYBBQUHMAGGM2h0dHA6
-Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMjAd
-BgNVHQ4EFgQURcIqJ36zsWYuCXfXxCEFGadE4TYwHwYDVR0jBBgwFoAUlt5h8b0c
-FilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQELBQADggEBACGTXlURCZKF9auayDNU
-yZB7JTJ0H1KcXZFXUjw3D51jHPgmXcqH1o0ASQQZCOjC1Z/N6tgHO2oO5tOOjJV4
-eKBpw4D5fOkSWncZ6RZdMry4eBbNdYpz0isF2drVa9wVv1maLKtzpucTFE3v0/Ok
-yCgDl2MM1ByQfc6Pi1YjzjvOY6H7MaYVn2Jz6P75s84Cf2m7x4H8NnG4xr3lYXMn
-uW8eFnOAiqG7lN4xoOeXtX+uSB6+BExDSXsXDReGYThSEghSQNvKO6srcKAYuzf3
-ILjx9qLdDcd6THPp7u6mCjhcuEpOgCLHBoINi1sEW5oiDA0jwt3b0ZcpqWD54Jje
-wP4=
--END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ssl: delete ldap-eqiad/ldap-codfw.wikimedia.org SSL certs

[Dzahn (Code Review)]

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

Change subject: ssl: delete ldap-eqiad/ldap-codfw.wikimedia.org SSL certs
..

ssl: delete ldap-eqiad/ldap-codfw.wikimedia.org SSL certs

These certificates appear to have expired in 2016:

openssl x509 -noout -dates < ldap-eqiad.wikimedia.org.crt  | grep After
notAfter=Oct 20 19:41:02 2016 GMT

openssl x509 -noout -dates < ldap-codfw.wikimedia.org.crt  | grep After
notAfter=Oct 20 19:36:03 2016 GMT

So i think they are not used anywhere.

Change-Id: I7803d52d649cb0da415324e009bd8490d371d148
---
D files/ssl/ldap-codfw.wikimedia.org.crt
D files/ssl/ldap-eqiad.wikimedia.org.crt
2 files changed, 0 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/334211/1

diff --git a/files/ssl/ldap-codfw.wikimedia.org.crt 
b/files/ssl/ldap-codfw.wikimedia.org.crt
deleted file mode 100644
index d138906..000
--- a/files/ssl/ldap-codfw.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFUzCCBDugAwIBAgISESFO0TnDWJ2Ez0zBmQ9ZyFVDMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUwODI3MTczNjA0WhcNMTYxMDIwMTkzNjAzWjCBgjELMAkG
-A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu
-Y2lzY28xIzAhBgNVBAoTGldpa2ltZWRpYSBGb3VuZGF0aW9uLCBJbmMuMSEwHwYD
-VQQDExhsZGFwLWNvZGZ3Lndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDAr0YQbzwX+XsGP8veKvUqfxQ8fSxcT39EnksI0SfEb+u0
-BUTCEQMqT//KOuAPz5nMVMRkjhY2/pj1OT32x6tlOmfEatHTyXGRDRk3QJcjYlg3
-u+mSxwAT/n+yTUs4HZNpXZCJkecvXS4yiAoll39A4yjN585pQ6TsWh85GwWIqLIq
-QWIGJzWGKSx7KmOx0JgYfWPRy6lBi7IN0avt8IbX6BH7epY5GHNxf83hsbZwnaNJ
-x7v/6Tqilecq5Od3By7elWHMwDZXExs/HgAdpH6YRQ4MerldwphjHXaktnyJKqMM
-S8//LtG8Ndd39ytNXwpd/4mlSqiI4jr/JnDS6IeBAgMBAAGjggHcMIIB2DAOBgNV
-HQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYm
-aHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wIwYDVR0RBBww
-GoIYbGRhcC1jb2Rmdy53aWtpbWVkaWEub3JnMAkGA1UdEwQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMEkGA1UdHwRCMEAwPqA8oDqGOGh0dHA6Ly9j
-cmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzIuY3Js
-MIGgBggrBgEFBQcBAQSBkzCBkDBNBggrBgEFBQcwAoZBaHR0cDovL3NlY3VyZS5n
-bG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzJyMS5j
-cnQwPwYIKwYBBQUHMAGGM2h0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc29y
-Z2FuaXphdGlvbnZhbHNoYTJnMjAdBgNVHQ4EFgQU266r1LzgOZfvklKUhc7DG61U
-GVwwHwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQEL
-BQADggEBAILhjSVVteuFezDz2v9XJ9O021T8jF8K/RQcenHik7I8ZcLgzm+FRfAI
-fHVYs+QDge2W8hsTkrRFC3UR+B8mXeBhZgIdod59pr9zEaszN5+Br0lbpmpVHNsk
-NwKvFJL+v3yiyrxiuKTOzK159ZP/KnSVwx6NJ1QrgTDr6SBLPQIARjPp5D+iARj7
-U++1VmvjXKAH0Q+JSBovei7IbI5cBmP81x4kNo/zT4EAk/0PaJ0YPQq64KLtTbsX
-L9LX2Y6qmgd/j+9/ItW1fEdNRD/i5R5tQF/qbcPmQm4ha8oA+GgTN8LNL0Z3n5ty
-CNu4yvrWWYg5XDV2IEeCYwW5IWtAD/E=
--END CERTIFICATE-
diff --git a/files/ssl/ldap-eqiad.wikimedia.org.crt 
b/files/ssl/ldap-eqiad.wikimedia.org.crt
deleted file mode 100644
index 4b72cfa..000
--- a/files/ssl/ldap-eqiad.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFUzCCBDugAwIBAgISESFWGhm6pMU/gXs7M6chHUQlMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUwODI3MTc0MTAyWhcNMTYxMDIwMTk0MTAyWjCBgjELMAkG
-A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu
-Y2lzY28xIzAhBgNVBAoTGldpa2ltZWRpYSBGb3VuZGF0aW9uLCBJbmMuMSEwHwYD
-VQQDExhsZGFwLWVxaWFkLndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDXhVMtvWVvRyqcGuyb1dYij+DXbTID744VYgXhB09KTWgr
-lYP9CkjpRHqO3wQNZHlkOSca4LM3IbZ+YEhHRKTj5H1t1eomlg2miyyoQqNH7DyW
-EXOXbM38KlpYQdBb6LQKPzlYYOTIshVhgakJJZNiJ4+gxMZMM2YMbgLm/WgWDN7g
-Y1szBT0GxY8o2Nzx1CqGSz+NTeVN+c1udszH009y0NYVXkt06+w6RfQLbEMztvsM
-/XI5RHQFJqTd2bApwnqGbBjOoQqLobEdngytNHU3MakOJehQ6IzmowHsf0cezZv9
-OGSUHU65+HToYbZkXu07W5rlCTZ39JSkW8ECmZGXAgMBAAGjggHcMIIB2DAOBgNV
-HQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYm
-aHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wIwYDVR0RBBww
-GoIYbGRhcC1lcWlhZC53aWtpbWVkaWEub3JnMAkGA1UdEwQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMEkGA1UdHwRCMEAwPqA8oDqGOGh0dHA6Ly9j
-cmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzIuY3Js
-MIGgBggrBgEFBQcBAQSBkzCBkDBNBggrBgEFBQcwAoZBaHR0cDovL3NlY3VyZS5n
-bG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzJyMS5j
-cnQwPwYIKwYBBQUHMAGGM2h0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc29y
-Z2FuaXphdGlvbnZhbHNoYTJnMjAdBgNVHQ4EFgQUfqA+pdTzJtgk+wVksvv+9/Xu
-63UwHwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQEL
-BQADggEBAHdOc4VIcjaf0Lank98a40/Pk/+BoBmWZ+mIyU8O3jh6eRn2C9UEFuqf
-va1DS/800G9bCYWPy94qEfPSm6UOytBtvfpkJCyam80pdntJxmXmvrOw1Qgel+ch
-ugVjRwTqyPuIRLuDiHJo9F5ammGzQUYZKpCUzDqn9to0suh4ed4oBXeT/OiV4qnI

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ssl: delete ecc-uni.wikimedia.org.crt

[Dzahn (Code Review)]

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

Change subject: ssl: delete ecc-uni.wikimedia.org.crt
..

ssl: delete ecc-uni.wikimedia.org.crt

This certificate appears to have expired in 2016.

 openssl x509 -noout -dates < ecc-uni.wikimedia.org.crt  | grep After
notAfter=Dec 10 22:46:04 2016 GMT

So it should not be used anywhere.

Change-Id: Iece53cbba7259e91d3e553545b550a12074184a7
---
D files/ssl/ecc-uni.wikimedia.org.crt
1 file changed, 0 insertions(+), 40 deletions(-)


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

diff --git a/files/ssl/ecc-uni.wikimedia.org.crt 
b/files/ssl/ecc-uni.wikimedia.org.crt
deleted file mode 100644
index 3a02ce8..000
--- a/files/ssl/ecc-uni.wikimedia.org.crt
+++ /dev/null
@@ -1,40 +0,0 @@
--BEGIN CERTIFICATE-
-MIIHEzCCBfugAwIBAgISESGiJboEAteRhUhUyLpgaGqbMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUxMjEwMjMyMjA1WhcNMTYxMjEwMjI0NjA0WjB5MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xGDAWBgNV
-BAMMDyoud2lraXBlZGlhLm9yZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMvb
-0EZBebjTbi7IXDLT94JExFttNlEb5o8pNJL+fDJljyP9GIKyNUAT/XrBzsg62lIZ
-kxALqlka8POL79x7C/2jggRxMIIEbTAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIw
-QDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2ln
-bi5jb20vcmVwb3NpdG9yeS8wggK2BgNVHREEggKtMIICqYIPKi53aWtpcGVkaWEu
-b3Jngg1tZWRpYXdpa2kub3Jngg13aWtpYm9va3Mub3Jnggx3aWtpZGF0YS5vcmeC
-DXdpa2ltZWRpYS5vcmeCF3dpa2ltZWRpYWZvdW5kYXRpb24ub3Jnggx3aWtpbmV3
-cy5vcmeCDXdpa2lxdW90ZS5vcmeCDndpa2lzb3VyY2Uub3Jngg93aWtpdmVyc2l0
-eS5vcmeCDndpa2l2b3lhZ2Uub3Jngg53aWt0aW9uYXJ5Lm9yZ4IGdy53aWtpgg8q
-Lm1lZGlhd2lraS5vcmeCDyoud2lraWJvb2tzLm9yZ4IOKi53aWtpZGF0YS5vcmeC
-Dyoud2lraW1lZGlhLm9yZ4IZKi53aWtpbWVkaWFmb3VuZGF0aW9uLm9yZ4IOKi53
-aWtpbmV3cy5vcmeCDyoud2lraXF1b3RlLm9yZ4IQKi53aWtpc291cmNlLm9yZ4IR
-Ki53aWtpdmVyc2l0eS5vcmeCECoud2lraXZveWFnZS5vcmeCECoud2lrdGlvbmFy
-eS5vcmeCESoubS5tZWRpYXdpa2kub3JnghEqLm0ud2lraXBlZGlhLm9yZ4IRKi5t
-Lndpa2lib29rcy5vcmeCECoubS53aWtpZGF0YS5vcmeCESoubS53aWtpbWVkaWEu
-b3JnghsqLm0ud2lraW1lZGlhZm91bmRhdGlvbi5vcmeCECoubS53aWtpbmV3cy5v
-cmeCESoubS53aWtpcXVvdGUub3JnghIqLm0ud2lraXNvdXJjZS5vcmeCEyoubS53
-aWtpdmVyc2l0eS5vcmeCEioubS53aWtpdm95YWdlLm9yZ4ISKi5tLndpa3Rpb25h
-cnkub3JnghQqLnplcm8ud2lraXBlZGlhLm9yZ4INd2lraXBlZGlhLm9yZzAJBgNV
-HRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHR8EQjBA
-MD6gPKA6hjhodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3JnYW5pemF0
-aW9udmFsc2hhMmcyLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwTQYIKwYBBQUHMAKG
-QWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0L2dzb3JnYW5pemF0
-aW9udmFsc2hhMmcycjEuY3J0MD8GCCsGAQUFBzABhjNodHRwOi8vb2NzcDIuZ2xv
-YmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxzaGEyZzIwHQYDVR0OBBYEFJR6
-MoTg5Oyr1L74P4VOswRxH2JYMB8GA1UdIwQYMBaAFJbeYfG9HBYpUxzAzH07gwBA
-5hp8MA0GCSqGSIb3DQEBCwUAA4IBAQCyxq9LiDHCRDM3IEgBcQaBOaUDvBYPIXsp
-I2KhhPzQ9fktCibG3H+oMZlPBe+q76mCssNo91M6DLfq6KWCHdp1mMaSaRwVNI0c
-GgKQtvDR/gfuCk91Wjslb1/7xmymvaO84m/IDtfE5qaZhscktRrmYcOGE1nnK0RX
-ZPcgIfbm24/lFqVIBhtCVzEMnmjmpo5hDMIIp1QlizN8auaFMVzaIm6LZX5VL5xp
-sy9+WXz15j4jKJEFLZ76cykHu8iYLjJcbjh0T2YeomW3Kg3lj9prEMcu5Klpoph3
-dpw59uD23Dy0CZ4D69eTJtT+pP1GghMUPIR/FeUDHrNQNEaw+Tn7
--END CERTIFICATE-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iece53cbba7259e91d3e553545b550a12074184a7
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] VisualEditor/VisualEditor[master]: VisualDiff: Remove redundant length check

[jenkins-bot (Code Review)]

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

Change subject: VisualDiff: Remove redundant length check
..


VisualDiff: Remove redundant length check

If the node lengths are the same (which we check a few lines above)
then the linear data lengths must be too.

(PS I cheated and discovered this using the code coverage report)

Change-Id: If8f37f6e19a572ffd780680cdb66d2707e7c15b4
---
M src/dm/ve.dm.VisualDiff.js
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index 48ac90a..8621dbd 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -123,9 +123,6 @@
oldData = this.oldDoc.getData( oldDocChild.getOuterRange() );
newData = this.newDoc.getData( newDocChild.getOuterRange() );
 
-   if ( oldData.length !== newData.length ) {
-   return false;
-   }
if ( JSON.stringify( oldData ) === JSON.stringify( newData ) ) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8f37f6e19a572ffd780680cdb66d2707e7c15b4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tchanders 
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]: Sync parserTests with core.

[jenkins-bot (Code Review)]

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

Change subject: Sync parserTests with core.
..


Sync parserTests with core.

New failing parser tests, added to blacklist:
* T156308: We don't properly strip whitespace around interlanguage links.
* T156309: We don't support {{PAGELANGUAGE}}.  (We actually need to have
  the page language available for LanguageConverter.)
* T43716: LanguageConverter syntax in attributes.

There were also two changes to the html2html stored in the blacklist,
caused by a change in the localized name of the image thumbnail attribute.
This is a side-effect of Id36550e864acf0df472b6a6a12f750eb28cbdd1d.

Change-Id: I09b794af5a8eb83b99f90f128f1c67efabec8576
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 74 insertions(+), 7 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 29310ae..b9eb71f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -58,6 +58,7 @@
 add("wt2html", "Self-link to numeric title", "0");
 add("wt2html", " inside a link", "Main Page the main page [it's not very good]");
 add("wt2html", "Interlanguage link with spacing", "Blah blah blah\nhttp://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\; 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\"},\"sa\":{\"href\":\;
   zh  :Chinese \"},\"dsr\":[15,43,null,null]}'/>");
+add("wt2html", "Escaping of interlanguage links (T129218, T156308)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Spanish\; title=\"es:Spanish\" 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Spanish\"},\"sa\":{\"href\":\":es:Spanish\"},\"isIW\":true,\"dsr\":[15,30,2,2]}'>es:Spanish\n : zh : Chinese ");
 add("wt2html", "Space and question mark encoding in interlanguage links 
(T95473)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Foo%20bar?\; 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Foo%20bar?\"},\"sa\":{\"href\":\"es:Foo
 bar?\"},\"dsr\":[15,30,null,null]}'/>");
 add("wt2html", "2. Lists with start-of-line-transparent tokens before bullets: 
Template close", "foo
 bar\n*baz");
 add("wt2html", "Multiple list tags generated by templates", "a\nb\nc");
@@ -93,6 +94,8 @@
 add("wt2html", "Magic Word: {{REVISIONID}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:REVISIONID");
 add("wt2html", "Magic Word: {{SCRIPTPATH}}", "/");
 add("wt2html", "Magic Word: {{STYLEPATH}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:STYLEPATH");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}}", "Warning:
 Page/template fetching disabled, and no cache for 
Modèle:PAGELANGUAGE");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}} on a page with no explicitly set 
language", "Warning:
 Page/template fetching disabled, and no cache for 
Template:PAGELANGUAGE");
 add("wt2html", "Case-sensitive magic words, when cased differently, should 
just be template transclusions", "Warning:
 Page/template fetching disabled, and no cache for 
Template:CurrentMonth\nWarning:
 Page/template fetching disabled, and no cache for 
Template:Currentday\nWarning:
 Page/template fetching disabled, and no cache for 
Template:CURreNTweEK\nWarning:
 Page/template fetching disabled, and no cache for 
Template:CurrentHour");
 add("wt2html", "Parsoid: Template-generated DISPLAYTITLE", "");
 add("wt2html", "Namespace 1 {{ns:1}}", "1");
@@ -214,6 +217,7 @@
 add("wt2html", "Unidirectional converter rule entries with an empty \"from\" 
string should be ignored (T53551)", "-{H|=>zh-cn:foo;}-foobar");
 add("wt2html", "Empty converter rule entries shouldn't be inserted into the 
conversion table (T53551)", "-{H|}-foobar");
 add("wt2html", "Nested using of manual convert syntax", "Nested: -{zh-hans:Hi 
-{zh-cn:China;zh-sg:Singapore;}-;zh-hant:Hello -{zh-tw:Taiwan;zh-hk:H-{ong}- 
K-{}-ong;}-;}-!");
+add("wt2html", "HTML markups with conversion syntax in attribs, nested in 
other conversion blocks", "-{zh;zh-hans;zh-hant|A}-");
 add("wt2html", "Proper conversion of text in external links", "http://www.google.com\; 
data-parsoid='{\"stx\":\"url\",\"dsr\":[0,21,0,0]}'>http://www.google.com\ngopher://www.google.com\; 
data-parsoid='{\"stx\":\"url\",\"dsr\":[22,45,0,0]}'>gopher://www.google.com\nhttp://www.google.com\; 
data-parsoid='{\"targetOff\":69,\"contentOffsets\":[69,90],\"dsr\":[46,91,23,1]}'>http://www.google.com\ngopher://www.google.com\; 
data-parsoid='{\"targetOff\":117,\"contentOffsets\":[117,140],\"dsr\":[92,141,25,1]}'>gopher://www.google.com\nhttps://www.google.com\; 

[MediaWiki-commits] [Gerrit] mediawiki...HitCounters[master]: Release version 0.4.0

[Kghbln (Code Review)]

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

Change subject: Release version 0.4.0
..

Release version 0.4.0

* Move internal code changes by Chad and code cleanup by Cindy to the public
* Prevent "Special:PopularPages" from hiding behind MiserMode

Bug: T119561
Change-Id: I4310b252415614b6a90bc6ae585335b053746472
---
M extension.json
M includes/SpecialPopularPages.php
2 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HitCounters 
refs/changes/08/334208/1

diff --git a/extension.json b/extension.json
index 83b6457..9957cb4 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "HitCounters",
"namemsg": "hitcounters-extensionname",
-   "version": "0.3",
+   "version": "0.4.0",
"author": [
"[//mwstake.org Mark A. Hershberger]"
],
diff --git a/includes/SpecialPopularPages.php b/includes/SpecialPopularPages.php
index 2e9adc2..7764ba6 100644
--- a/includes/SpecialPopularPages.php
+++ b/includes/SpecialPopularPages.php
@@ -40,9 +40,7 @@
}
 
public function isExpensive() {
-   # page_counter is not indexed
-   # Is there a reason not to index it now?
-   return true;
+   return false;
}
 
public function isSyndicated() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4310b252415614b6a90bc6ae585335b053746472
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: master
Gerrit-Owner: Kghbln 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Workaround issues in completion with empty tokens

[jenkins-bot (Code Review)]

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

Change subject: Workaround issues in completion with empty tokens
..


Workaround issues in completion with empty tokens

We seem to be affected by a bug in the completion suggester.
If the analyzer generates an empty token the completion suggester
will fail at index time.
The bug seems to be fixed in elastic5 so we may be able to remove
this workaround.

Bug: T156234
Change-Id: Ia35e4990ae335cbb7f4099d5461b8798287f00a0
---
M includes/Maintenance/SuggesterAnalysisConfigBuilder.php
M tests/browser/features/suggest_api.feature
M tests/browser/features/support/hooks.rb
3 files changed, 25 insertions(+), 2 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Tjones: Looks good to me, but someone else must approve
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Maintenance/SuggesterAnalysisConfigBuilder.php 
b/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
index 8d1d0a0..ea12ec9 100644
--- a/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
+++ b/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
@@ -25,7 +25,7 @@
  */
 
 class SuggesterAnalysisConfigBuilder extends AnalysisConfigBuilder {
-   const VERSION = "1.2";
+   const VERSION = "1.3";
 
/**
 * @param string $langCode The language code to build config for
@@ -113,7 +113,16 @@
"token_limit" => [
"type" => "limit",
"max_token_count" => "20"
-   ]
+   ],
+   // Workaround what seems to be a bug in the
+   // completion suggester, empty tokens cause an
+   // issue similar to
+   // 
https://github.com/elastic/elasticsearch/pull/11158
+   // can be removed with es5 if we want
+   "remove_empty" => [
+   "type" => "length",
+   "min" => 1,
+   ],
],
'analyzer' => [
"stop_analyzer" => [
@@ -122,6 +131,7 @@
"lowercase",
"stop_filter",
"accentfolding",
+   "remove_empty",
"token_limit"
],
"tokenizer" => $textTokenizer,
@@ -134,6 +144,7 @@
"filter" => [
"lowercase",
"accentfolding",
+   "remove_empty",
"token_limit"
],
"tokenizer" => $textTokenizer,
@@ -142,6 +153,7 @@
"type" => "custom",
"char_filter" => [ 'word_break_helper' 
],
"filter" => [
+   "remove_empty",
"token_limit",
"lowercase"
],
@@ -151,6 +163,7 @@
"type" => "custom",
"char_filter" => [ 'word_break_helper' 
],
"filter" => [
+   "remove_empty",
"token_limit",
"lowercase"
],
@@ -164,6 +177,7 @@
"filter" => [
"lowercase",
"accentfolding",
+   "remove_empty",
"token_limit"
],
"tokenizer" => $textTokenizer,
@@ -173,6 +187,7 @@
"filter" => [
"lowercase",
"accentfolding",
+   "remove_empty",
"token_limit"
],

[MediaWiki-commits] [Gerrit] operations/puppet[production]: delete stream.wikimedia.org SSL cert

[Dzahn (Code Review)]

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

Change subject: delete stream.wikimedia.org SSL cert
..

delete stream.wikimedia.org SSL cert

This cert has expired in 2016 and
stream.wikimedia.org now resolves to misc-web varnish,
so this should not be used anymore.

openssl x509 -noout -dates < stream.wikimedia.org.crt
notBefore=Jun 23 00:00:00 2014 GMT
notAfter=Jun 27 12:00:00 2016 GMT

Change-Id: I4136168a21e7fd1013ced88c397db130dee0d7c5
---
D files/ssl/stream.wikimedia.org.crt
1 file changed, 0 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/334207/1

diff --git a/files/ssl/stream.wikimedia.org.crt 
b/files/ssl/stream.wikimedia.org.crt
deleted file mode 100644
index a441a1a..000
--- a/files/ssl/stream.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFXTCCBEWgAwIBAgIQD0XPdMBS1JkZrb9cqbKMPzANBgkqhkiG9w0BAQsFADBw
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMS8wLQYDVQQDEyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNz
-dXJhbmNlIFNlcnZlciBDQTAeFw0xNDA2MjMwMDAwMDBaFw0xNjA2MjcxMjAwMDBa
-MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMSMwIQYDVQQKExpXaWtpbWVkaWEgRm91bmRhdGlvbiwgSW5j
-LjEdMBsGA1UEAxMUc3RyZWFtLndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDS72mLSZa8h0wEDHL5u2nnlfgN34lv8uCvSuBhPqSe
-t+PvbIqNGsBXJaEeI6mBLCzbbI3wn2xTk4q8/s8cI/SkWpMg4aQKW9wn6lf9WJxv
-nJt2L78O5mPG31+tQ1pZK8WTb6LlMpVxJOE8GsQCCI/GHxKgqyVj8Q2dFgWkjAog
-OiEaBof8DuAU5KV0UP3ROyr8V3LF4ZkXjJJnJ8tNXRRX6VIwGogWRkMFg4kRwgvR
-uxWvnQ8fsakS5o/dejFgkWxaa10UhqWToVLV4V+5L+s5iBSdkIa/7k0qW6o+tweU
-+y0Bp9bjqP+ifhXiqSG9qFJnqn8wJmvyiEmIjXVR4hwTAgMBAAGjggHjMIIB3zAf
-BgNVHSMEGDAWgBRRaP+QrwIHdTzM2WVkYqISuFlyOzAdBgNVHQ4EFgQUge6PrEKU
-6+K3fzBySmUAtFhMTXkwHwYDVR0RBBgwFoIUc3RyZWFtLndpa2ltZWRpYS5vcmcw
-DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB1
-BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc2hhMi1o
-YS1zZXJ2ZXItZzIuY3JsMDSgMqAwhi5odHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-c2hhMi1oYS1zZXJ2ZXItZzIuY3JsMEIGA1UdIAQ7MDkwNwYJYIZIAYb9bAEBMCow
-KAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYMGCCsG
-AQUFBwEBBHcwdTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29t
-ME0GCCsGAQUFBzAChkFodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNl
-cnRTSEEySGlnaEFzc3VyYW5jZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQAJxSJYwdL26xrL0ptPYYnM9zVhmd/jQpVl+RjLGYsl
-R+q527PXFeYvG2aesY/46gh8mJ6ZABP1stR+IbMzo8UkCCNV2DamMLySLyV1D1Q5
-U/R+zpO3/Az36vXprJgFat+2Kz/DAJdKx+chFLeCM7jgCNMEeZez31oBsr7/g8JX
-67nX++sC9HJWLFSY0KU85i+d5IrRmphwTfRROfnpU+WNPG8/q3GxIk2DB2RgiigZ
-yyA2vKxGgvLvQf45mXNYPE7oZZp6AQJ8QrmVR6fzLj2otV/s6ZR1EUH/vtOniVl4
-MaPAzaRPWfJwU6mj1N5jHVDk2INRcypmqS6+aOEuWbQG
--END CERTIFICATE-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4136168a21e7fd1013ced88c397db130dee0d7c5
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] VisualEditor/VisualEditor[master]: Follow-up on Id00817

[Tchanders (Code Review)]

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

Change subject: Follow-up on Id00817
..

Follow-up on Id00817

Correct a mistake with handling of forced replacements.

Change-Id: I348899e0a467f9e8bd4fc95abba0218ada5963b5
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 35 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/05/334205/1

diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index 63b6e24..2075de1 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -223,31 +223,42 @@
subTreeRootNodeData = this.oldDoc.getData( 
subTreeRootNode.node.getOuterRange() );
subTreeRootNodeData[ 0 ] = this.addClassesToNode( 
subTreeRootNodeData[ 0 ], this.oldDoc, 'remove' );
 
-   // Find the node that corresponds to the "previous node" of 
this node. The
-   // "previous node" is either:
-   // - the rightmost left sibling that corresponds to a node in 
the new document
-   // - or if there isn't one, then this node's parent (which must 
correspond to
-   // a node in the new document, or this node would have been 
marked already
-   // processed)
-   siblingNodes = subTreeRootNode.parent.children;
-   for ( i = 0, ilen = siblingNodes.length; i < ilen; i++ ) {
-   if ( siblingNodes[ i ].index === nodeIndex ) {
-   break;
-   } else {
-   oldPreviousNodeIndex = siblingNodes[ i ].index;
-   newPreviousNodeIndex = 
correspondingNodes.oldToNew[ oldPreviousNodeIndex ] || newPreviousNodeIndex;
+   // If this node is a child of the document node, then it won't 
have a "previous
+   // node" (see below), in which case, insert it just before its 
corresponding
+   // node in the new document.
+   if ( subTreeRootNode.index === 0 ) {
+   insertIndex = newNodes[ correspondingNodes.oldToNew[ 0 
] ]
+   .node.getOuterRange().from - nodeRange.from;
+   } else {
+
+   // Find the node that corresponds to the "previous 
node" of this node. The
+   // "previous node" is either:
+   // - the rightmost left sibling that corresponds to a 
node in the new document
+   // - or if there isn't one, then this node's parent 
(which must correspond to
+   // a node in the new document, or this node would have 
been marked already
+   // processed)
+   siblingNodes = subTreeRootNode.parent.children;
+   for ( i = 0, ilen = siblingNodes.length; i < ilen; i++ 
) {
+   if ( siblingNodes[ i ].index === nodeIndex ) {
+   break;
+   } else {
+   oldPreviousNodeIndex = siblingNodes[ i 
].index;
+   newPreviousNodeIndex = 
correspondingNodes.oldToNew[ oldPreviousNodeIndex ] || newPreviousNodeIndex;
+   }
}
+
+   // If previous node was found among siblings, insert 
the removed subtree just
+   // after its corresponding node in the new document. 
Otherwise insert the
+   // removed subtree just inside its parent node's 
corresponding node.
+   if ( newPreviousNodeIndex ) {
+   insertIndex = newNodes[ newPreviousNodeIndex 
].node.getRange().to - nodeRange.from;
+   } else {
+   newPreviousNodeIndex = 
correspondingNodes.oldToNew[ subTreeRootNode.parent.index ];
+   insertIndex = newNodes[ newPreviousNodeIndex 
].node.getRange().from - nodeRange.from;
+   }
+
}
 
-   // If previous node was found among siblings, insert the 
removed subtree just
-   // after its corresponding node in the new document. Otherwise 
insert the
-   // removed subtree just inside its parent node's corresponding 
node.
-   if ( newPreviousNodeIndex ) {
-   insertIndex = newNodes[ newPreviousNodeIndex 
].node.getRange().to - nodeRange.from;
-   } else {
-   newPreviousNodeIndex = correspondingNodes.oldToNew[ 
subTreeRootNode.parent.index ];
-   insertIndex = newNodes[ newPreviousNodeIndex 
].node.getRange().from - nodeRange.from;
-   }
   

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable deprecation logging in prod

[EBernhardson (Code Review)]

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

Change subject: Enable deprecation logging in prod
..

Enable deprecation logging in prod

Our deprecation policy requires code that is pending removal to
call wfDeprecated(), which will log to the 'deprecated' channel. We are
not logging this to logstash, which makes it possible for code to be
removed that is still being used somewhere in production. Enable this
logging channel so we get information about deprecated usage.

I think this is all that is needed, but there is a bit of a dance going
on in MWDebug::deprecated() so I'm not 100% sure.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6585c9e..445023e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4575,6 +4575,7 @@
'csp' => 'info',
'csp-report-only' => 'info',
'DBPerformance' => [ 'logstash' => 'debug', 'udp2log' => 
'warning' ],
+   'deprecated' => 'debug',
'diff' => 'debug',
'Echo' => 'debug',
'es-hit' => 'debug',

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Better fix for lat/long woes

[Ejegg (Code Review)]

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

Change subject: Better fix for lat/long woes
..

Better fix for lat/long woes

Rebuild the zip code lookup table with decimal columns, re-run update.

Bug: T155677
Change-Id: I2b6f70d63e46e2fedbae8601c3eb2e044ac03033
---
M sites/all/modules/wmf_civicrm/update_7310.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
2 files changed, 25 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/04/334204/1

diff --git a/sites/all/modules/wmf_civicrm/update_7310.php 
b/sites/all/modules/wmf_civicrm/update_7310.php
index 2df4676..5398257 100644
--- a/sites/all/modules/wmf_civicrm/update_7310.php
+++ b/sites/all/modules/wmf_civicrm/update_7310.php
@@ -3,13 +3,14 @@
 function _wmf_civicrm_update_7310_add_zip_geo() {
   $queries = array();
 
+  $queries[] = 'DROP TABLE IF EXISTS `wmf_zip_geo`';
   $queries[] = '
 CREATE TABLE `wmf_zip_geo` (
`zip` char(5) primary key,
`city` varchar(64),
`state` char(2),
-   `latitude` float,
-   `longitude` float,
+   `latitude` decimal(13,9),
+   `longitude` decimal(13,9),
`timezone` varchar(8),
`dst` tinyint
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index f15b5ea..21b164c 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2396,13 +2396,18 @@
   c.timezone = g.timezone
   ");
 
-  CRM_Core_DAO::executeQuery("
-UPDATE civicrm_address a
-INNER JOIN civicrm_address_geocode c ON c.id = a.id
-SET a.geo_code_1 = c.latitude,
-  a.geo_code_2 = c.longitude,
-  a.timezone = c.timezone
-  ");
+  $batch = 10;
+  for($startId = 0; $startId < 210 * $batch; $startId += $batch) {
+$endId = $startId + $batch;
+CRM_Core_DAO::executeQuery("
+  UPDATE civicrm_address a
+  INNER JOIN civicrm_address_geocode c ON c.id = a.id
+  SET a.geo_code_1 = c.latitude,
+a.geo_code_2 = c.longitude,
+a.timezone = c.timezone
+  WHERE a.id BETWEEN $startId AND $endId
+");
+  }
 }
 
 /**
@@ -2467,3 +2472,13 @@
 AND entity_table = 'civicrm_contact'
   ");
 }
+
+/**
+ * Re-run fixed geocoding updates
+ *
+ * Bug: T155677
+ */
+function wmf_civicrm_update_7450() {
+  wmf_civicrm_update_7310();
+  wmf_civicrm_update_7320();
+}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Revert "Round off all the geo_codes to 4 digits"

[jenkins-bot (Code Review)]

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

Change subject: Revert "Round off all the geo_codes to 4 digits"
..


Revert "Round off all the geo_codes to 4 digits"

This is not the fix we're looking for - the problem is with the
float columns. Need to drop and re-create that table.

This reverts commit 041a47feaf4c535131842ff35c07c50458268fc7.

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

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 441421f..f15b5ea 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2467,21 +2467,3 @@
 AND entity_table = 'civicrm_contact'
   ");
 }
-
-/**
- * Round latitude and longitude to 4 digits, to match the values currently
- * being assigned and avoid dedupe conflicts
- */
-function wmf_civicrm_update_7450() {
-  // Update 1,000,000 at a time to avoid locking things up for too long
-  civicrm_initialize();
-  $million = 100;
-  for($startId = 0; $startId <= 21 * $million; $startId += $million) {
-$endId = $startId + $million;
-CRM_Core_DAO::executeQuery("
-  UPDATE civicrm_address
-  SET geo_code_1 = ROUND(geo_code_1, 4), geo_code_2 = ROUND(geo_code_2, 4)
-  WHERE id BETWEEN $startId AND $endId
-");
-  }
-}

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Re-group and order help menu items

[jenkins-bot (Code Review)]

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

Change subject: Re-group and order help menu items
..


Re-group and order help menu items

I can explain in detail why I'm going for this order. Please ask me.

Change-Id: Ice442bd35a5fe259c44af911868c14c3e8913f0a
---
M index.html
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/index.html b/index.html
index 3ff09ca..215c74a 100644
--- a/index.html
+++ b/index.html
@@ -80,16 +80,16 @@



-   https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;
 data-i18n="wdqs-app-help-feedback">
-   https://www.wikidata.org/wiki/Wikidata:Request_a_query; 
data-i18n="wdqs-app-help-request-query">
-   
https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help;
 data-i18n="wdqs-app-help-portal">
https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual; 
data-i18n="wdqs-app-help-manual">
-   https://www.w3.org/TR/sparql11-query/;>SPARQL
https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/queries/examples;
 data-i18n="wdqs-app-help-examples">

+   https://www.w3.org/TR/sparql11-query/;>SPARQL
https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format; 
data-i18n="wdqs-app-help-datamodel">
https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Full_list_of_prefixes;
 data-i18n="wdqs-app-help-prefixes">
+   
+   https://www.wikidata.org/wiki/Wikidata:Request_a_query; 
data-i18n="wdqs-app-help-request-query">
+   https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;
 data-i18n="wdqs-app-help-feedback">




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice442bd35a5fe259c44af911868c14c3e8913f0a
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Make help button a split button dropdown linking to help portal

[jenkins-bot (Code Review)]

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

Change subject: Make help button a split button dropdown linking to help portal
..


Make help button a split button dropdown linking to help portal

Bug: T154993
Change-Id: If1610d15143b2e6f338d35859c49f3312c8ef743
---
M index.html
1 file changed, 24 insertions(+), 16 deletions(-)

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



diff --git a/index.html b/index.html
index 00ea1e7..3ff09ca 100644
--- a/index.html
+++ b/index.html
@@ -50,7 +50,7 @@



-   
+   



@@ -70,21 +70,29 @@
https://github.com/wikimedia/wikidata-query-rdf/blob/master/docs/exploring-linked-data.md;> Exploring 
Linked Data
https://tools.wmflabs.org/wdq2sparql/w2s.php;> WDQ Syntax 
Translator
https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual#SPARQL_endpoint;> SPARQL REST 
Endpoint
-   
-   
-   
-   
-   https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;
 data-i18n="wdqs-app-help-feedback">
-   https://www.wikidata.org/wiki/Wikidata:Request_a_query; 
data-i18n="wdqs-app-help-request-query">
-   
-   https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help;
 data-i18n="wdqs-app-help-portal">
-   https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual; 
data-i18n="wdqs-app-help-manual">
-   https://www.w3.org/TR/sparql11-query/;>SPARQL
-   https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/queries/examples;
 data-i18n="wdqs-app-help-examples">
-   
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format; 
data-i18n="wdqs-app-help-datamodel">
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Full_list_of_prefixes;
 data-i18n="wdqs-app-help-prefixes">
-   
+   
+   
+   
+   https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help;
 target="_blank" class="btn btn-default">
+
+   
+   
+   
+   
+   
+   https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;
 data-i18n="wdqs-app-help-feedback">
+   https://www.wikidata.org/wiki/Wikidata:Request_a_query; 
data-i18n="wdqs-app-help-request-query">
+   
+   https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help;
 data-i18n="wdqs-app-help-portal">
+   https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual; 
data-i18n="wdqs-app-help-manual">
+   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tool: convert HBA source host mechanism to static

[Rush (Code Review)]

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

Change subject: tool: convert HBA source host mechanism to static
..

tool: convert HBA source host mechanism to static

The existing process relies on Puppet managing state files
on NFS and then individual nodes building their own version of
the required SSH and pam files from those state files via
bash scripts that depend on lengthy 'test' evaulations to determine
if changes have been made.  As an aside, we are still relying on
NFS to do perform a similar function for known_hosts.

This fell apart yesterday because of being predicated on the factor
fact $ipaddress representing eth0.  We fixed that in the short term
by qualifying with $ipaddress_eth0 but the whole thing is fragile.
This all seems to be in service of not  managing two files explicitly and
that I believe the cure here is worse than the disease.
The last time these files would have legitamitely changed is 2016-03-30
with the introduction of bastion-03.

For now this seems like a reasonable price to avoid the calamity here.

There are additionally issues with the process itself where
the test logic does not account for locally modified state files
(such as /etc/project) that are products of the 'resource collection' on
NFS making this whole process not idempotent at all.

Bugs: T156168

Change-Id: Ia16cd1a487c0bb201c6556a0b763cbe76a062f56
---
D modules/toollabs/files/project-make-access
D modules/toollabs/files/project-make-shosts
A modules/toollabs/files/ssh_shosts.equiv
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/hba.pp
M modules/toollabs/manifests/init.pp
6 files changed, 22 insertions(+), 57 deletions(-)


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

diff --git a/modules/toollabs/files/project-make-access 
b/modules/toollabs/files/project-make-access
deleted file mode 100644
index c93e272..000
--- a/modules/toollabs/files/project-make-access
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-#
-# This script is managed by puppet
-#
-
-cd /data/project/.system/store
-echo '+:ALL:' $(for host in submithost-*; do
-  if [ -s $host ]; then
-cat $host
-  fi
-done)
diff --git a/modules/toollabs/files/project-make-shosts 
b/modules/toollabs/files/project-make-shosts
deleted file mode 100644
index 1f84dd6..000
--- a/modules/toollabs/files/project-make-shosts
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-#
-# This script is managed by puppet
-#
-
-cd /data/project/.system/store
-(for host in submithost-*; do
-  if [ -s $host ]; then
-echo $host
-  fi
-done) | sed -e 's/^submithost-//'
diff --git a/modules/toollabs/files/ssh_shosts.equiv 
b/modules/toollabs/files/ssh_shosts.equiv
new file mode 100644
index 000..636df03
--- /dev/null
+++ b/modules/toollabs/files/ssh_shosts.equiv
@@ -0,0 +1,6 @@
+tools-bastion-02.tools.eqiad.wmflabs
+tools-bastion-03.tools.eqiad.wmflabs
+tools-bastion-05.tools.eqiad.wmflabs
+tools-checker-01.tools.eqiad.wmflabs
+tools-checker-02.tools.eqiad.wmflabs
+tools-precise-dev.tools.eqiad.wmflabs
diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index 4545c63..4ff018e 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -185,15 +185,6 @@
 source => 'puppet:///modules/toollabs/submithost-ssh_config',
 }
 
-file { "${toollabs::store}/submithost-${::fqdn}":
-ensure  => file,
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-require => File[$toollabs::store],
-content => "${::ipaddress_eth0}\n",
-}
-
 # Display tips.
 file { '/etc/profile.d/motd-tips.sh':
 ensure  => absent,
diff --git a/modules/toollabs/manifests/hba.pp 
b/modules/toollabs/manifests/hba.pp
index c40c8e9..885170b 100644
--- a/modules/toollabs/manifests/hba.pp
+++ b/modules/toollabs/manifests/hba.pp
@@ -1,19 +1,25 @@
-# Establish the ability to do Host Based Auth from bastions to execs/webgrid
+# Establish the ability to do Host Based Auth from bastions/submit hosts to 
execs/webgrid
+#
+# Add hosts we want to be able to SSH to all hosts not protected by the
+# toollabs::infrastructure mechanism to both the shosts.equiv file
+# and the pam access control line manually.
 
 class toollabs::hba {
 
 file { '/usr/local/sbin/project-make-shosts':
-ensure => file,
+ensure => absent,
 owner  => 'root',
 group  => 'root',
 mode   => '0755',
 source => 'puppet:///modules/toollabs/project-make-shosts',
 }
 
-exec { 'make-shosts':
-command => '/usr/local/sbin/project-make-shosts 
>/etc/ssh/shosts.equiv~',
-onlyif  => "/usr/bin/test -n \"\$(/usr/bin/find 
/data/project/.system/store -maxdepth 1 \\( -type d -or -type f -name 
submithost-\\* \\) -newer /etc/ssh/shosts.equiv~)\" -o ! -s 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Sync parserTests with core.

[C. Scott Ananian (Code Review)]

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334202 )

Change subject: Sync parserTests with core.
..

Sync parserTests with core.

New failing parser tests, added to blacklist:
* T156308: We don't properly strip whitespace around interlanguage links.
* T156309: We don't support {{PAGELANGUAGE}}.  (We actually need to have
  the page language available for LanguageConverter.)
* T43716: LanguageConverter syntax in attributes.

There were also two changes to the html2html stored in the blacklist,
caused by a change in the localized name of the image thumbnail attribute.
This is a side-effect of Id36550e864acf0df472b6a6a12f750eb28cbdd1d.

Change-Id: I09b794af5a8eb83b99f90f128f1c67efabec8576

blaclist extra

Change-Id: Ib95c4dfb27c2680873f11be823297d975b48cfea
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 74 insertions(+), 7 deletions(-)


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

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 29310ae..b9eb71f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -58,6 +58,7 @@
 add("wt2html", "Self-link to numeric title", "0");
 add("wt2html", " inside a link", "Main Page the main page [it's not very good]");
 add("wt2html", "Interlanguage link with spacing", "Blah blah blah\nhttp://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\; 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\"},\"sa\":{\"href\":\;
   zh  :Chinese \"},\"dsr\":[15,43,null,null]}'/>");
+add("wt2html", "Escaping of interlanguage links (T129218, T156308)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Spanish\; title=\"es:Spanish\" 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Spanish\"},\"sa\":{\"href\":\":es:Spanish\"},\"isIW\":true,\"dsr\":[15,30,2,2]}'>es:Spanish\n : zh : Chinese ");
 add("wt2html", "Space and question mark encoding in interlanguage links 
(T95473)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Foo%20bar?\; 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Foo%20bar?\"},\"sa\":{\"href\":\"es:Foo
 bar?\"},\"dsr\":[15,30,null,null]}'/>");
 add("wt2html", "2. Lists with start-of-line-transparent tokens before bullets: 
Template close", "foo
 bar\n*baz");
 add("wt2html", "Multiple list tags generated by templates", "a\nb\nc");
@@ -93,6 +94,8 @@
 add("wt2html", "Magic Word: {{REVISIONID}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:REVISIONID");
 add("wt2html", "Magic Word: {{SCRIPTPATH}}", "/");
 add("wt2html", "Magic Word: {{STYLEPATH}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:STYLEPATH");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}}", "Warning:
 Page/template fetching disabled, and no cache for 
Modèle:PAGELANGUAGE");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}} on a page with no explicitly set 
language", "Warning:
 Page/template fetching disabled, and no cache for 
Template:PAGELANGUAGE");
 add("wt2html", "Case-sensitive magic words, when cased differently, should 
just be template transclusions", "Warning:
 Page/template fetching disabled, and no cache for 
Template:CurrentMonth\nWarning:
 Page/template fetching disabled, and no cache for 
Template:Currentday\nWarning:
 Page/template fetching disabled, and no cache for 
Template:CURreNTweEK\nWarning:
 Page/template fetching disabled, and no cache for 
Template:CurrentHour");
 add("wt2html", "Parsoid: Template-generated DISPLAYTITLE", "");
 add("wt2html", "Namespace 1 {{ns:1}}", "1");
@@ -214,6 +217,7 @@
 add("wt2html", "Unidirectional converter rule entries with an empty \"from\" 
string should be ignored (T53551)", "-{H|=>zh-cn:foo;}-foobar");
 add("wt2html", "Empty converter rule entries shouldn't be inserted into the 
conversion table (T53551)", "-{H|}-foobar");
 add("wt2html", "Nested using of manual convert syntax", "Nested: -{zh-hans:Hi 
-{zh-cn:China;zh-sg:Singapore;}-;zh-hant:Hello -{zh-tw:Taiwan;zh-hk:H-{ong}- 
K-{}-ong;}-;}-!");
+add("wt2html", "HTML markups with conversion syntax in attribs, nested in 
other conversion blocks", "-{zh;zh-hans;zh-hant|A}-");
 add("wt2html", "Proper conversion of text in external links", "http://www.google.com\; 
data-parsoid='{\"stx\":\"url\",\"dsr\":[0,21,0,0]}'>http://www.google.com\ngopher://www.google.com\; 
data-parsoid='{\"stx\":\"url\",\"dsr\":[22,45,0,0]}'>gopher://www.google.com\nhttp://www.google.com\; 
data-parsoid='{\"targetOff\":69,\"contentOffsets\":[69,90],\"dsr\":[46,91,23,1]}'>http://www.google.com\ngopher://www.google.com\; 
data-parsoid='{\"targetOff\":117,\"contentOffsets\":[117,140],\"dsr\":[92,141,25,1]}'>gopher://www.google.com\nhttps://www.google.com\; 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add table column tests

[Esanders (Code Review)]

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

Change subject: VisualDiff: Add table column tests
..

VisualDiff: Add table column tests

This adds coverage to the subtree methods, putting us >90% coverage
for all visual diff files.

Change-Id: I5640305a9ea1dc7f67fc41704d6082992b527b42
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/01/334201/1

diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index 58eb92d..554bd79 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -149,6 +149,30 @@
'' +
'foo bar bazbaz!' +
''
+   },
+   {
+   msg: 'Insert table column',
+   oldDoc: 
'AC',
+   newDoc: 
'ABCD',
+   expected:
+   '' +
+   '' +
+   'AB' +
+   'CD' +
+   '' +
+   ''
+   },
+   {
+   msg: 'Remove table column',
+   oldDoc: 
'ABCD',
+   newDoc: 
'AC',
+   expected:
+   '' +
+   '' +
+   'AB' +
+   'CD' +
+   '' +
+   ''
}
];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5640305a9ea1dc7f67fc41704d6082992b527b42
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Revert "Round off all the geo_codes to 4 digits"

[Ejegg (Code Review)]

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

Change subject: Revert "Round off all the geo_codes to 4 digits"
..

Revert "Round off all the geo_codes to 4 digits"

This is not the fix we're looking for - the problem is with the
float columns. Need to drop and re-create that table.

This reverts commit 041a47feaf4c535131842ff35c07c50458268fc7.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/00/334200/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 441421f..f15b5ea 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2467,21 +2467,3 @@
 AND entity_table = 'civicrm_contact'
   ");
 }
-
-/**
- * Round latitude and longitude to 4 digits, to match the values currently
- * being assigned and avoid dedupe conflicts
- */
-function wmf_civicrm_update_7450() {
-  // Update 1,000,000 at a time to avoid locking things up for too long
-  civicrm_initialize();
-  $million = 100;
-  for($startId = 0; $startId <= 21 * $million; $startId += $million) {
-$endId = $startId + $million;
-CRM_Core_DAO::executeQuery("
-  UPDATE civicrm_address
-  SET geo_code_1 = ROUND(geo_code_1, 4), geo_code_2 = ROUND(geo_code_2, 4)
-  WHERE id BETWEEN $startId AND $endId
-");
-  }
-}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Early return when there are no contacts to dedupe

[jenkins-bot (Code Review)]

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

Change subject: Early return when there are no contacts to dedupe
..


Early return when there are no contacts to dedupe

Bug: TT156306
Change-Id: Ia5484dfc0bf7bb29fb7bb5a97085ce0580e78dc0
---
M sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc 
b/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
index 1b5196d..2f2c7a7 100644
--- a/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
+++ b/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
@@ -61,6 +61,11 @@
 array(1 => array($start, 'Integer'), 2 => array($batch_size, 'Integer'))
   );
 
+  if (empty($end)) {
+watchdog('civicrm_merge', 'Deduping contact range from %start - there are 
no more contacts to dedupe.', array('%start' => $start), WATCHDOG_INFO);
+return;
+  }
+
   $mergeParams = array(
 'criteria' => array(
   'contact' => array('id' => array('BETWEEN' => array($start, $end))),

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add paragraph moving tests

[Esanders (Code Review)]

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

Change subject: VisualDiff: Add paragraph moving tests
..

VisualDiff: Add paragraph moving tests

Change-Id: I434909c088a71c3d54f1528b35c02384727147e7
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/99/334199/1

diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index 7d3eb73..e8f9107 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -121,6 +121,14 @@
'' +
'Alien' +
''
+   },
+   {
+   msg: 'Paragraphs moved',
+   oldDoc: 'foobar',
+   newDoc: 'barfoo',
+   expected:
+   'bar' +
+   'foo'
}
];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I434909c088a71c3d54f1528b35c02384727147e7
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Early return when there are no contacts to dedupe

[Eileen (Code Review)]

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

Change subject: Early return when there are no contacts to dedupe
..

Early return when there are no contacts to dedupe

Bug: TT156306
Change-Id: Ia5484dfc0bf7bb29fb7bb5a97085ce0580e78dc0
---
M sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc 
b/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
index 1b5196d..2f2c7a7 100644
--- a/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
+++ b/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc
@@ -61,6 +61,11 @@
 array(1 => array($start, 'Integer'), 2 => array($batch_size, 'Integer'))
   );
 
+  if (empty($end)) {
+watchdog('civicrm_merge', 'Deduping contact range from %start - there are 
no more contacts to dedupe.', array('%start' => $start), WATCHDOG_INFO);
+return;
+  }
+
   $mergeParams = array(
 'criteria' => array(
   'contact' => array('id' => array('BETWEEN' => array($start, $end))),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5484dfc0bf7bb29fb7bb5a97085ce0580e78dc0
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...parsoid[master]: Update baseconfig; add frwiki.

[C. Scott Ananian (Code Review)]

C. Scott Ananian has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334170 )

Change subject: Update baseconfig; add frwiki.
..


Update baseconfig; add frwiki.

Add a README which explains how to regenerate the baseconfig JSON files
using tools/sync-baseconfig.js.

Regenerate all baseconfigs *except for enwiki* from the current wiki
configurations.  Add frwiki, since this is needed in an upcoming
parserTests merge.

The enwiki configuration appears to have changed in a way which causes
numerous parserTests failures (T156295, T156296).  So we haven't updated
it here; we'll tackle those issues in a follow-up patch.

Change-Id: Id36550e864acf0df472b6a6a12f750eb28cbdd1d
---
A lib/config/baseconfig/README
M lib/config/baseconfig/be-taraskwiki.json
M lib/config/baseconfig/cawiki.json
M lib/config/baseconfig/cswiki.json
M lib/config/baseconfig/dewiki.json
M lib/config/baseconfig/eswiki.json
M lib/config/baseconfig/fawiki.json
M lib/config/baseconfig/fiwiki.json
A lib/config/baseconfig/frwiki.json
M lib/config/baseconfig/iswiki.json
M lib/config/baseconfig/kaawiki.json
M lib/config/baseconfig/lnwiki.json
M lib/config/baseconfig/nlwiki.json
M lib/config/baseconfig/srwiki.json
M lib/config/baseconfig/trwiki.json
M lib/config/baseconfig/zhwiki.json
A tools/sync-baseconfig.js
17 files changed, 94,635 insertions(+), 7,384 deletions(-)




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id36550e864acf0df472b6a6a12f750eb28cbdd1d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add node insertion/removal tests

[Esanders (Code Review)]

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

Change subject: VisualDiff: Add node insertion/removal tests
..

VisualDiff: Add node insertion/removal tests

Change-Id: I724bf1e0ea2d9f06ca9bd48cad474fa6825c2df3
---
M tests/ui/ve.ui.DiffElement.test.js
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/97/334197/1

diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
index e2c8561..6fc482e 100644
--- a/tests/ui/ve.ui.DiffElement.test.js
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -91,6 +91,26 @@
'' +
'bar' +
''
+   },
+   {
+   msg: 'Node inserted',
+   oldDoc: 'foo',
+   newDoc: 'fooAlien',
+   expected:
+   'foo' +
+   '' +
+   'Alien' +
+   ''
+   },
+   {
+   msg: 'Node removed',
+   oldDoc: 'fooAlien',
+   newDoc: 'foo',
+   expected:
+   'foo' +
+   '' +
+   'Alien' +
+   ''
}
];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I724bf1e0ea2d9f06ca9bd48cad474fa6825c2df3
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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