date:20170103

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

2017-01-03 Thread Marostegui (Code Review)

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

Change subject: db-codfw.php: Depool db2060
..

db-codfw.php: Depool db2060

db2060 crashed and needs a restart. Depooling it temporarily.
Using db2046 to server API while db2060 is out

Bug: T154031
Change-Id: I493116f45c87e019957627b61719f8738557919c
---
M wmf-config/db-codfw.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 2739757..9fe4bbf 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -137,9 +137,9 @@
's6' => [
'db2028' => 0,   # 2.9TB  96GB, master
'db2039' => 50,  # 2.9TB 160GB, rc, log
-   'db2046' => 400, # 2.9TB 160GB
+   'db2046' => 100, # 2.9TB 160GB #temporarily serving API #T154031
'db2053' => 100, # 2.9TB 160GB, dump (inactive), vslow
-   'db2060' => 100, # 3.3TB 160GB, api
+#  'db2060' => 100, # 3.3TB 160GB, api #maintenance T154031
'db2067' => 400, # 3.3TB 160GB
],
's7' => [
@@ -381,7 +381,7 @@
'db2053' => 1,
],
'api' => [
-   'db2060' => 1,
+   'db2046' => 1,
],
],
's7' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I493116f45c87e019957627b61719f8738557919c
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] translatewiki[master]: Move lib.reviews to github

2017-01-03 Thread Nikerabbit (Code Review)

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

Change subject: Move lib.reviews to github
..

Move lib.reviews to github

Change-Id: Ic486491ed654de725ee16c674afe1dae2b00779d
---
M repoconfig.commit.json
M repoconfig.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/75/330375/1

diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 32d1ec6..22b89af 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -206,7 +206,7 @@
"group": "lib.reviews",
"repos": {
"lib.reviews": {
-   "type": "git",
+   "type": "github",
"url": 
"g...@github.com:eloquence/lib.reviews.git"
}
}
diff --git a/repoconfig.json b/repoconfig.json
index c0d1907..8b48387 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -204,7 +204,7 @@
"group": "lib.reviews",
"repos": {
"lib.reviews": {
-   "type": "git",
+   "type": "github",
"url": 
"https://github.com/eloquence/lib.reviews.git;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic486491ed654de725ee16c674afe1dae2b00779d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] mediawiki...Interlanguage[master]: Fix $wgMessagesDirs for InterlanguageCentral

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

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

Change subject: Fix $wgMessagesDirs for InterlanguageCentral
..


Fix $wgMessagesDirs for InterlanguageCentral

At the moment messages loaded over the shim.

Change-Id: I3ef942e91e2547bb126e1c2577f699d0260ebdd8
---
M InterlanguageCentral.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/InterlanguageCentral.php b/InterlanguageCentral.php
index ede0cac..38f21e2 100644
--- a/InterlanguageCentral.php
+++ b/InterlanguageCentral.php
@@ -34,7 +34,7 @@
'descriptionmsg'=> 'interlanguagecentral-desc',
 );
 
-$wgMessagesDirs['InterlanguageCentral'] = __DIR__ . '/i18n';
+$wgMessagesDirs['InterlanguageCentral'] = __DIR__ . '/i18n/central';
 $wgExtensionMessagesFiles['InterlanguageCentral'] = dirname(__FILE__) . 
'/InterlanguageCentral.i18n.php';
 $wgExtensionMessagesFiles['InterlanguageCentralMagic'] = dirname(__FILE__) . 
'/InterlanguageCentral.i18n.magic.php';
 $wgAutoloadClasses['InterlanguageCentralExtensionPurgeJob'] = 
dirname(__FILE__) .  '/InterlanguageCentralExtensionPurgeJob.php';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ef942e91e2547bb126e1c2577f699d0260ebdd8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Interlanguage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demo: Add test for ClippableElements at the bottom of their ...

2017-01-03 Thread Prtksxna (Code Review)

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

Change subject: demo: Add test for ClippableElements at the bottom of their 
containers
..

demo: Add test for ClippableElements at the bottom of their containers

Change-Id: I82ac7c8f558818435483672aa4896db1d54339f8
---
M demos/pages/dialogs.js
1 file changed, 80 insertions(+), 0 deletions(-)


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

diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index bed75f9..186a4b7 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -675,6 +675,79 @@
return 
DialogWithDropdowns.parent.prototype.getActionProcess.call( this, action );
};
 
+   function DialogWithPopupAndDropdown( config ) {
+   DialogWithPopupAndDropdown.parent.call( this, config );
+   }
+   OO.inheritClass( DialogWithPopupAndDropdown, OO.ui.ProcessDialog );
+   DialogWithPopupAndDropdown.static.title = 'Dialog with popup and 
dropdown (ClippableElement test)';
+   DialogWithPopupAndDropdown.static.actions = [
+   { action: 'save', label: 'Done', flags: [ 'primary', 
'progressive' ] },
+   { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] }
+   ];
+   DialogWithPopupAndDropdown.prototype.getBodyHeight = function () {
+   return 300;
+   };
+   DialogWithPopupAndDropdown.prototype.initialize = function () {
+   var $spacer = $( '' ).height( 240 );
+   DialogWithPopupAndDropdown.parent.prototype.initialize.apply( 
this, arguments );
+   this.bookletLayout = new OO.ui.BookletLayout( {
+   outlined: true
+   } );
+   this.pages = [
+   new SamplePage( 'info', {
+   label: 'Information',
+   icon: 'info',
+   content: [
+   'Widgets that don\'t use $overlay get 
clipped at the bottom of their container. ',
+   'This is a test of two such cases'
+   ]
+   } ),
+   new SamplePage( 'dropdownbottom', {
+   label: 'DropdownWidget at bottom',
+   content: [ $spacer.clone(), new 
OO.ui.DropdownWidget( {
+   menu: {
+   items: this.makeItems()
+   }
+   } )]
+   } ),
+   new SamplePage( 'popupbottom', {
+   label: 'Popup at bottom',
+   content: [ $spacer.clone(),
+   new OO.ui.PopupButtonWidget( {
+   icon: 'info',
+   label: 'Popup here',
+   framed: false,
+   popup: {
+   head: true,
+   label: 'More 
information',
+   $content: $( 'Extra 
information here.' ),
+   padded: true
+   }
+   } )
+   ]
+   } )
+   ];
+   this.bookletLayout.addPages( this.pages );
+   this.$body.append( this.bookletLayout.$element );
+   };
+   DialogWithPopupAndDropdown.prototype.makeItems = function () {
+   return [ 0, 1, 2 ].map( function ( val ) {
+   return new OO.ui.MenuOptionWidget( {
+   data: val,
+   label: String( val )
+   } );
+   } );
+   };
+
+   DialogWithPopupAndDropdown.prototype.getActionProcess = function ( 
action ) {
+   if ( action ) {
+   return new OO.ui.Process( function () {
+   this.close( { action: action } );
+   }, this );
+   }
+   return 
DialogWithPopupAndDropdown.parent.prototype.getActionProcess.call( this, action 
);
+   };
+
configQuick = [
{
name: 'Quick alert',
@@ -845,6 +918,13 @@
}
},
{
+   name: 'Dialog with popup and dropdown (ClippableElement 
test)',
+   dialogClass: DialogWithPopupAndDropdown,
+

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove unused import in SpecialNewItem

2017-01-03 Thread Aude (Code Review)

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

Change subject: Remove unused import in SpecialNewItem
..

Remove unused import in SpecialNewItem

Change-Id: I2a765d555c33f11635baf5d0616bacb50a49667e
---
M repo/includes/Specials/SpecialNewItem.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/repo/includes/Specials/SpecialNewItem.php 
b/repo/includes/Specials/SpecialNewItem.php
index 26c46ac..b74d42c 100644
--- a/repo/includes/Specials/SpecialNewItem.php
+++ b/repo/includes/Specials/SpecialNewItem.php
@@ -11,7 +11,6 @@
 use Wikibase\Repo\Specials\HTMLForm\HTMLAliasesField;
 use Wikibase\Repo\Specials\HTMLForm\HTMLTrimmedTextField;
 use Wikibase\Repo\Specials\HTMLForm\HTMLContentLanguageField;
-use Wikibase\SettingsArray;
 use Wikibase\Summary;
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a765d555c33f11635baf5d0616bacb50a49667e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Avoid master db connection on special page GET requests

2017-01-03 Thread Aude (Code Review)

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

Change subject: Avoid master db connection on special page GET requests
..

Avoid master db connection on special page GET requests

Don't think slave lag is so much a problem on these
pages, and using a slave connection is okay here.

Bug: T154555
Change-Id: I7016af403e01e90f60c58b2f69691db8a5f3720c
---
M repo/includes/Specials/SpecialModifyEntity.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/repo/includes/Specials/SpecialModifyEntity.php 
b/repo/includes/Specials/SpecialModifyEntity.php
index aa5acb2..0842f2b 100644
--- a/repo/includes/Specials/SpecialModifyEntity.php
+++ b/repo/includes/Specials/SpecialModifyEntity.php
@@ -173,11 +173,11 @@
}
 
$entityId = $this->parseEntityId( $idString );
-   $this->entityRevision = $this->loadEntity( $entityId );
+   $this->entityRevision = $this->loadEntityRevision( $entityId );
}
 
/**
-* Loads the entity for this entity id.
+* Loads the latest EntityRevision for this entity id.
 *
 * @since 0.5
 *
@@ -187,12 +187,12 @@
 * @throws UserInputException
 * @return EntityRevision
 */
-   protected function loadEntity( EntityId $id ) {
+   protected function loadEntityRevision( EntityId $id ) {
try {
-   $entity = $this->entityRevisionLookup
-   ->getEntityRevision( $id, 0, 
EntityRevisionLookup::LATEST_FROM_MASTER );
+   $entityRevision = $this->entityRevisionLookup
+   ->getEntityRevision( $id, 0, 
EntityRevisionLookup::LATEST_FROM_SLAVE );
 
-   if ( $entity === null ) {
+   if ( $entityRevision === null ) {
throw new UserInputException(
'wikibase-wikibaserepopage-invalid-id',
array( $id->getSerialization() ),
@@ -213,7 +213,7 @@
);
}
 
-   return $entity;
+   return $entityRevision;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7016af403e01e90f60c58b2f69691db8a5f3720c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystone: Move api service to uwsgi/nginx

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

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

Change subject: Keystone:  Move api service to uwsgi/nginx
..

Keystone:  Move api service to uwsgi/nginx

Change-Id: I8b82360b5080dbe0b2b6e043bec0db1c8f9c4655
Depends-on: 330370
Bug: T150774
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 53 insertions(+), 15 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93e7062..16ea298 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,6 +357,7 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
+  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4f05197..4b9c47f 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,6 +145,7 @@
 
 keystoneconfig:
   auth_port: '35357'
+  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1e59764..f18e091 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,6 +455,7 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
+public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 08d77e2..2982a66 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,15 +53,13 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
+# Disable the keystone process itself; this will be handled
+#  by nginx and uwsgi
+'/etc/init/keystone.conf':
+ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
-service { 'keystone':
-ensure=> running,
-subscribe => File['/etc/keystone/keystone.conf'],
-require   => Package['keystone'];
-}
-
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -75,10 +73,6 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
-nrpe::monitor_service { 'check_keystone_process':
-description  => 'keystone process',
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
-}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -87,10 +81,12 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-} else {
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
-}
+}
+
+# stop the keystone process itself; this will be handled
+#  by nginx and uwsgi
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index c8a568c..824948b 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,4 +30,43 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
+
+file { '/var/log/uwsgi/keystone':
+ensure => directory,
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0644',
+}
+
+# Keystone admin API
+service::uwsgi { 'keystone-admin':
+port=> $keystoneconfig['auth_port'],
+healthcheck_url => '/',
+deployment  => None,
+config  => {
+wsgi-file => '/usr/bin/keystone-wsgi-admin',
+name  => 'keystone',
+uid   => 'keystone',
+gid   => 'keystone',
+processes => '10',
+threads   => '2',
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: uwsgi: uwsgi should run as root, not as www-data

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

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

Change subject: uwsgi:  uwsgi should run as root, not as www-data
..

uwsgi:  uwsgi should run as root, not as www-data

Uwsgi includes config options like uid and gid to set
the user that an app runs as.  Those args only work
if uwsgi itself is running as root.

For example, I need to run keystone with uwsgi as
the 'keystone' user.  That's not compatible with
the existing www-data presumption.

Bug: T150774
Change-Id: Ibb572f6a074ec549949803f2b33a73e06d6e5f37
---
M modules/uwsgi/manifests/init.pp
M modules/uwsgi/templates/initscripts/uwsgi-startup.upstart.erb
M modules/uwsgi/templates/initscripts/uwsgi.systemd.erb
M modules/uwsgi/templates/initscripts/uwsgi.upstart.erb
4 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/330370/1

diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index b98bfeb..9da85ad 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -44,8 +44,8 @@
 
 file { '/run/uwsgi':
 ensure => directory,
-owner  => 'www-data',
-group  => 'www-data',
+owner  => 'root',
+group  => 'root',
 mode   => '0755',
 }
 
@@ -56,7 +56,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => 'd /run/uwsgi 0755 www-data www-data',
+content => 'd /run/uwsgi 0755 root root',
 }
 } else {
 base::service_unit { 'uwsgi-startup':
diff --git a/modules/uwsgi/templates/initscripts/uwsgi-startup.upstart.erb 
b/modules/uwsgi/templates/initscripts/uwsgi-startup.upstart.erb
index 7d11dd2..308710d 100644
--- a/modules/uwsgi/templates/initscripts/uwsgi-startup.upstart.erb
+++ b/modules/uwsgi/templates/initscripts/uwsgi-startup.upstart.erb
@@ -4,4 +4,4 @@
 
 task
 
-exec install -d -o www-data -g www-data /run/uwsgi
+exec install -d -o root -g root /run/uwsgi
diff --git a/modules/uwsgi/templates/initscripts/uwsgi.systemd.erb 
b/modules/uwsgi/templates/initscripts/uwsgi.systemd.erb
index 6bb9f6d..b236527 100644
--- a/modules/uwsgi/templates/initscripts/uwsgi.systemd.erb
+++ b/modules/uwsgi/templates/initscripts/uwsgi.systemd.erb
@@ -4,8 +4,8 @@
 
 [Service]
 ExecStart = /usr/bin/uwsgi --die-on-term --autoload --ini <%= @inipath %>
-User = www-data
-Group = www-data
+User = root
+Group = root
 SyslogIdentifier = uwsgi-<%= @basename %>
 
 [Install]
diff --git a/modules/uwsgi/templates/initscripts/uwsgi.upstart.erb 
b/modules/uwsgi/templates/initscripts/uwsgi.upstart.erb
index a182e72..fd6d7b5 100644
--- a/modules/uwsgi/templates/initscripts/uwsgi.upstart.erb
+++ b/modules/uwsgi/templates/initscripts/uwsgi.upstart.erb
@@ -1,8 +1,8 @@
 # This file is managed by Puppet
 description "<%= @title %> uwsgi app"
 
-setuid www-data
-setgid www-data
+setuid root
+setgid root
 
 exec /usr/bin/uwsgi --die-on-term --autoload --ini <%= @inipath %>
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb572f6a074ec549949803f2b33a73e06d6e5f37
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] operations/dns[master]: DNS: Add mgmt and production DNS entries for elastic2025-ela...

2017-01-03 Thread Papaul (Code Review)

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

Change subject: DNS: Add mgmt and production DNS entries for 
elastic2025-elastic2036 Bug:T154251
..

DNS: Add mgmt and production DNS entries for elastic2025-elastic2036
Bug:T154251

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/69/330369/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0c577b9..5b48a98 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2577,6 +2577,9 @@
 74  1H IN PTR   mw2248.codfw.wmnet.
 75  1H IN PTR   mw2249.codfw.wmnet.
 76  1H IN PTR   mw2250.codfw.wmnet.
+77  1H IN PTR   elastic2025.codfw.wmnet.
+78  1H IN PTR   elastic2026.codfw.wmnet.
+79  1H IN PTR   elastic2027.codfw.wmnet.
 
 114 1H IN PTR   mw2075.codfw.wmnet.
 115 1H IN PTR   mw2076.codfw.wmnet.
@@ -2818,6 +2821,9 @@
 188 1H IN PTR   restbase2010-c.codfw.wmnet.
 189 1H IN PTR   prometheus2004.codfw.wmnet.
 190 1H IN PTR   ms-fe2006.codfw.wmnet.
+191 1H IN PTR   elastic2028.codfw.wmnet.
+192 1H IN PTR   elastic2029.codfw.wmnet.
+193 1H IN PTR   elastic2030.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
@@ -3006,6 +3012,9 @@
 153 1H IN PTR   restbase2011-b.codfw.wmnet.
 154 1H IN PTR   restbase2011-c.codfw.wmnet.
 155 1H IN PTR   ms-fe2007.codfw.wmnet.
+156 1H IN PTR   elastic2031.codfw.wmnet.
+157 1H IN PTR   elastic2032.codfw.wmnet.
+158 1H IN PTR   elastic2033.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
@@ -3096,6 +3105,9 @@
 70  1H IN PTR   restbase2012-c.codfw.wmnet.
 71  1H IN PTR   gerrit2001.codfw.wmnet.
 72  1H IN PTR   ms-fe2008.codfw.wmnet.
+73  1H IN PTR   elastic2034.codfw.wmnet.
+74  1H IN PTR   elastic2035.codfw.wmnet.
+75  1H IN PTR   elastic2036.codfw.wmnet.
 
 $ORIGIN 49.192.{{ zonename }}.
 1   1H IN PTR   vl2020-eth3.lvs2001.codfw.wmnet.
@@ -3480,6 +3492,30 @@
 162 1H IN PTR  wdqs2003.mgmt.codfw.wmnet.
 162 1H IN PTR  wmf6479.mgmt.codfw.wmnet.
 
+163 1H IN PTR  elastic2025.mgmt.codfw.wmnet.
+163 1H IN PTR  wmf6490.mgmt.codfw.wmnet.
+164 1H IN PTR  elastic2026.mgmt.codfw.wmnet.
+164 1H IN PTR  wmf6491.mgmt.codfw.wmnet.
+165 1H IN PTR  elastic2027.mgmt.codfw.wmnet.
+165 1H IN PTR  wmf6492.mgmt.codfw.wmnet.
+166 1H IN PTR  elastic2028.mgmt.codfw.wmnet.
+166 1H IN PTR  wmf6493.mgmt.codfw.wmnet.
+167 1H IN PTR  elastic2029.mgmt.codfw.wmnet.
+167 1H IN PTR  wmf6494.mgmt.codfw.wmnet.
+168 1H IN PTR  elastic2030.mgmt.codfw.wmnet.
+168 1H IN PTR  wmf6495.mgmt.codfw.wmnet.
+169 1H IN PTR  elastic2031.mgmt.codfw.wmnet.
+169 1H IN PTR  wmf6496.mgmt.codfw.wmnet.
+170 1H IN PTR  elastic2032.mgmt.codfw.wmnet.
+170 1H IN PTR  wmf6497.mgmt.codfw.wmnet.
+171 1H IN PTR  elastic2033.mgmt.codfw.wmnet.
+171 1H IN PTR  wmf6498.mgmt.codfw.wmnet.
+172 1H IN PTR  elastic2034.mgmt.codfw.wmnet.
+172 1H IN PTR  wmf6499.mgmt.codfw.wmnet.
+173 1H IN PTR  elastic2035.mgmt.codfw.wmnet.
+173 1H IN PTR  wmf6500.mgmt.codfw.wmnet.
+174 1H IN PTR  elastic2036.mgmt.codfw.wmnet.
+174 1H IN PTR  wmf6501.mgmt.codfw.wmnet.
 175 1H IN PTR  mw2075.mgmt.codfw.wmnet.
 176 1H IN PTR  mw2076.mgmt.codfw.wmnet.
 177 1H IN PTR  mw2077.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 619c207..8673b65 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2369,6 +2369,18 @@
 elastic2022 1H  IN A10.192.48.34
 elastic2023 1H  IN A10.192.48.35
 elastic2024 1H  IN A10.192.48.36
+elastic2025 1H  IN A10.192.0.77
+elastic2026 1H  IN A10.192.0.78
+elastic2027 1H  IN A10.192.0.79
+elastic2028 1H  IN A10.192.16.191
+elastic2029 1H  IN A10.192.16.192
+elastic2030 1H  IN A10.192.16.193
+elastic2031 1H  IN A10.192.32.156
+elastic2032 1H  IN A10.192.32.157
+elastic2033 1H  IN A10.192.32.158
+elastic2034 1H  IN A10.192.48.73
+elastic2035 1H  IN A10.192.48.74
+elastic2036 1H  IN A10.192.48.75
 es2001  1H  IN A10.192.0.25
 es2002  1H  IN A10.192.0.26
 es2003  1H  IN A10.192.16.27
@@ -3048,6 +3060,18 @@
 elastic2022 1H  IN A10.193.2.219
 elastic2023 1H  IN A10.193.2.220
 elastic2024 1H  IN A10.193.2.221
+elastic2025 1H  IN A10.193.1.163
+elastic2026 1H  IN A10.193.1.164
+elastic2027 1H  IN A10.193.1.165
+elastic2028 1H  IN A10.193.1.166
+elastic2029 1H  IN A10.193.1.167
+elastic2030 1H  IN A10.193.1.168
+elastic2031 1H  IN A10.193.1.169
+elastic2032 1H  IN A10.193.1.170
+elastic2033 1H  IN A10.193.1.171
+elastic2034 1H  IN A10.193.1.172
+elastic2035 1H  IN A10.193.1.173
+elastic2036 1H  IN A

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Keystone: Move api service to uwsgi/nginx"

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

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

Change subject: Revert "Keystone:  Move api service to uwsgi/nginx"
..


Revert "Keystone:  Move api service to uwsgi/nginx"

This reverts commit 2e2dd27d6e40886bcd048b675e5b4befc8777cee.

Change-Id: Ia28fa7a6af5a903885de49b1ddb072e594714458
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 15 insertions(+), 53 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 16ea298..93e7062 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,7 +357,6 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
-  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4b9c47f..4f05197 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,7 +145,6 @@
 
 keystoneconfig:
   auth_port: '35357'
-  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f18e091..1e59764 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,7 +455,6 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
-public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 2982a66..08d77e2 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,13 +53,15 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
-# Disable the keystone process itself; this will be handled
-#  by nginx and uwsgi
-'/etc/init/keystone.conf':
-ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
+service { 'keystone':
+ensure=> running,
+subscribe => File['/etc/keystone/keystone.conf'],
+require   => Package['keystone'];
+}
+
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -73,6 +75,10 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
+nrpe::monitor_service { 'check_keystone_process':
+description  => 'keystone process',
+nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
+}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -81,12 +87,10 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-}
-
-# stop the keystone process itself; this will be handled
-#  by nginx and uwsgi
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
+} else {
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
+}
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index 824948b..c8a568c 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,43 +30,4 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
-
-file { '/var/log/uwsgi/keystone':
-ensure => directory,
-owner  => 'www-data',
-group  => 'www-data',
-mode   => '0644',
-}
-
-# Keystone admin API
-service::uwsgi { 'keystone-admin':
-port=> $keystoneconfig['auth_port'],
-healthcheck_url => '/',
-deployment  => None,
-config  => {
-wsgi-file => '/usr/bin/keystone-wsgi-admin',
-name  => 'keystone',
-uid   => 'keystone',
-gid   => 'keystone',
-processes =>

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for b52cd902be38 - added some missing changes

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

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

Change subject: Fix for b52cd902be38 - added some missing changes
..


Fix for b52cd902be38 - added some missing changes

Change-Id: I9e4ba1f9b4e466dccd5de7be60812975b76ff843
---
M Cargo.php
M extension.json
M i18n/en.json
M i18n/qqq.json
4 files changed, 19 insertions(+), 1 deletion(-)

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



diff --git a/Cargo.php b/Cargo.php
index 50f1943..409bfe4 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -73,6 +73,7 @@
 $wgAPIModules['cargoquery'] = 'CargoQueryAPI';
 $wgAPIModules['cargorecreatetables'] = 'CargoRecreateTablesAPI';
 $wgAPIModules['cargorecreatedata'] = 'CargoRecreateDataAPI';
+$wgAPIModules['cargoautocomplete'] = 'CargoAutocompleteAPI';
 
 // Register classes and special pages.
 $wgAutoloadClasses['CargoHooks'] = $dir . '/Cargo.hooks.php';
@@ -108,6 +109,7 @@
 $wgAutoloadClasses['CargoQueryAPI'] = $dir . '/api/CargoQueryAPI.php';
 $wgAutoloadClasses['CargoRecreateTablesAPI'] = $dir . 
'/api/CargoRecreateTablesAPI.php';
 $wgAutoloadClasses['CargoRecreateDataAPI'] = $dir . 
'/api/CargoRecreateDataAPI.php';
+$wgAutoloadClasses['CargoAutocompleteAPI'] = $dir . 
'/api/CargoAutocompleteAPI.php';
 $wgAutoloadClasses['CargoLuaLibrary'] = $dir . '/CargoLua.library.php';
 
 // Display formats
diff --git a/extension.json b/extension.json
index 58994da..3d56e0a 100755
--- a/extension.json
+++ b/extension.json
@@ -28,7 +28,8 @@
"APIModules": {
"cargoquery": "CargoQueryAPI",
"cargorecreatetables": "CargoRecreateTablesAPI",
-   "cargorecreatedata": "CargoRecreateDataAPI"
+   "cargorecreatedata": "CargoRecreateDataAPI",
+   "cargoautocomplete": "CargoAutocompleteAPI"
},
"MessagesDirs": {
"Cargo": [
@@ -68,6 +69,7 @@
"CargoQueryAPI": "api/CargoQueryAPI.php",
"CargoRecreateTablesAPI": "api/CargoRecreateTablesAPI.php",
"CargoRecreateDataAPI": "api/CargoRecreateDataAPI.php",
+   "CargoAutocompleteAPI": "api/CargoAutocompleteAPI.php",
"CargoLuaLibrary": "CargoLua.library.php",
"CargoDisplayFormat": "formats/CargoDisplayFormat.php",
"CargoDeferredFormat": "formats/CargoDeferredFormat.php",
diff --git a/i18n/en.json b/i18n/en.json
index 04269b6..58977a9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -26,6 +26,13 @@
"apihelp-cargorecreatedata-param-table": "The Cargo database table to 
repopulate",
"apihelp-cargorecreatedata-param-offset": "Of the pages that call this 
template, the number at which to start querying",
"apihelp-cargorecreatedata-param-replaceOldRows": "Whether to replace 
old rows for each page while repopulating the table",
+   "apihelp-cargoautocomplete-description": "Autocompletion call used by 
the Cargo extension.",
+   "apihelp-cargoautocomplete-param-limit": "A limit on the number of 
results returned",
+   "apihelp-cargoautocomplete-param-substr": "Search substring",
+   "apihelp-cargoautocomplete-param-table": "Cargo table for which to 
search values",
+   "apihelp-cargoautocomplete-param-field": "Cargo field for which to 
search values",
+   "apihelp-cargoautocomplete-param-field_is_array": "Whether the field 
holds a list of values",
+   "apihelp-cargoautocomplete-param-where": "The \"where\" clause for the 
query, based on the other filters specified",
"cargo-createdatatable": "Create data table",
"cargo-recreatedata-desc": "Recreate Cargo data for this template?",
"cargo-recreatedata-createdata": "Create Cargo data for this template?",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b0704c2..b7b9cee 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -32,6 +32,13 @@
"apihelp-cargorecreatedata-param-table": 
"{{doc-apihelp-param|cargorecreatedata|table}}",
"apihelp-cargorecreatedata-param-offset": 
"{{doc-apihelp-param|cargorecreatedata|offset}}",
"apihelp-cargorecreatedata-param-replaceOldRows": 
"{{doc-apihelp-param|cargorecreatedata|replaceOldRows}}",
+   "apihelp-cargoautocomplete-description": 
"{{doc-apihelp-description|cargoautocomplete}}",
+   "apihelp-cargoautocomplete-param-limit": 
"{{doc-apihelp-param|cargoautocomplete|limit}}",
+   "apihelp-cargoautocomplete-param-substr": 
"{{doc-apihelp-param|cargoautocomplete|substr}}",
+   "apihelp-cargoautocomplete-param-table": 
"{{doc-apihelp-param|cargoautocomplete|table}}",
+   "apihelp-cargoautocomplete-param-field": 
"{{doc-apihelp-param|cargoautocomplete|field}}",
+   "apihelp-cargoautocomplete-param-field_is_array": 
"{{doc-apihelp-param|cargoautocomplete|field_is_array}}",
+   "apihelp-cargoautocomplete-param-where":

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid hardcoding cache and cache key in populateInterwiki.php

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

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

Change subject: Avoid hardcoding cache and cache key in populateInterwiki.php
..


Avoid hardcoding cache and cache key in populateInterwiki.php

Follows-up 0ac10f3790.

Bug: T114577
Change-Id: I1f5fbc40adc66a673428e495be94fc8118d6e14f
---
M maintenance/populateInterwiki.php
1 file changed, 1 insertion(+), 16 deletions(-)

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



diff --git a/maintenance/populateInterwiki.php 
b/maintenance/populateInterwiki.php
index 5d32b99..6c812bf 100644
--- a/maintenance/populateInterwiki.php
+++ b/maintenance/populateInterwiki.php
@@ -33,11 +33,6 @@
 */
private $source;
 
-   /**
-* @var BagOStuff
-*/
-   private $cache;
-
public function __construct() {
parent::__construct();
 
@@ -63,8 +58,6 @@
public function execute() {
$force = $this->getOption( 'force', false );
$this->source = $this->getOption( 'source', 
'https://en.wikipedia.org/w/api.php' );
-
-   $this->cache = wfGetMainCache();
 
$data = $this->fetchLinks();
 
@@ -149,20 +142,12 @@
);
}
 
-   $this->clearCacheEntry( $prefix );
+   Interwiki::invalidateCache( $prefix );
}
 
$this->output( "Interwiki links are populated.\n" );
 
return true;
-   }
-
-   /**
-* @param string $prefix
-*/
-   private function clearCacheEntry( $prefix ) {
-   $key = wfMemcKey( 'interwiki', $prefix );
-   $this->cache->delete( $key );
}
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f5fbc40adc66a673428e495be94fc8118d6e14f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: build: Add phpunit config file, enable phpcs in composer-test

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

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

Change subject: build: Add phpunit config file, enable phpcs in composer-test
..


build: Add phpunit config file, enable phpcs in composer-test

* phpcs wasn't run on CI, add it. Matching other lib repos.

* Move phpunit config to a file. Matching other lib repos.
  Right now the coverage report is broken because it invokes
  'phpunit --coverage-html cover/' but fails due to a missing
  directory argument, and would not disable globals-backup either
  (slowing it down).

Change-Id: Ib6cc8aecbcc8ebd5e574d6d47b9cc5521dd7c99d
---
M composer.json
A phpunit.xml.dist
2 files changed, 17 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 9f56fe4..78a2ca3 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,10 @@
}
},
"scripts": {
-   "test": "phpunit --no-globals-backup tests/phpunit",
-   "phpcs": "phpcs -s src"
+   "test": [
+   "phpunit",
+   "phpcs -p"
+   ],
+   "phpcs": "phpcs -s"
}
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 000..6063fba
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+
+   
+   
+   ./tests/phpunit
+   
+   
+   
+   
+   ./src
+   
+   
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: readme: Fix syntax error in link, add heading

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

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

Change subject: readme: Fix syntax error in link, add heading
..


readme: Fix syntax error in link, add heading

Matching other lib repos.

Change-Id: I7d89e6ab2e86c2ae7c522a7a05d51b52eb488e72
---
M README.md
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index adfe2af..ebc416e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+RemexHtml
+=
+
 RemexHtml is a parser for HTML 5, written in PHP.
 
 RemexHtml aims to be:
@@ -27,7 +30,7 @@
 the latest WHATWG draft because our application needs stability more than
 feature completeness.
 
-RemexHtml passes all [html5lib 
tests](https://github.com/html5lib/html5lib-tests]),
+RemexHtml passes all [html5lib 
tests](https://github.com/html5lib/html5lib-tests),
 except for parse error counts and tests which reference a future version of the
 standard.
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Validate BlockID cookie before use

2017-01-03 Thread Samwilson (Code Review)

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

Change subject: Validate BlockID cookie before use
..

Validate BlockID cookie before use

This change adds a HMAC to the block-cookie to prevent someone
spoofing a cookie and so discovering revdeleted users.

Tests are updated, and a new test added (to demonstrate an
inauthentic HMAC).

Bug: T152951
Change-Id: I6a3ef9e91091408c25eaa2d36d58b365d681e8c6
---
M includes/Block.php
M includes/user/User.php
M tests/phpunit/includes/user/UserTest.php
3 files changed, 72 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/330368/1

diff --git a/includes/Block.php b/includes/Block.php
index 9d3a2f9..117d615 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1467,12 +1467,44 @@
}
 
// Set the cookie. Reformat the MediaWiki datetime as a Unix 
timestamp for the cookie.
-   $cookieValue = $setEmpty ? '' : $this->getId();
+   $cookieValue = $setEmpty ? '' : $this->getCookieValue();
$expiryValue = DateTime::createFromFormat( "YmdHis", 
$expiryTime );
$response->setCookie( 'BlockID', $cookieValue, 
$expiryValue->format( "U" ) );
}
 
/**
+* Get the BlockID cookie's value for this block. This is the block ID 
concatenated with an
+* HMAC in order to avoid spoofing (T152951).
+* @return string The concatenation of the block ID, "!", and the HMAC.
+*/
+   public function getCookieValue() {
+   $config = RequestContext::getMain()->getConfig();
+   $id = $this->getId();
+   $hmac = MWCryptHash::hmac( $id, $config->get( 'SecretKey' ), 
false );
+   $cookieValue =  $id . '!' . $hmac;
+   return $cookieValue;
+   }
+
+   /**
+* Get the stored ID from the 'BlockID' cookie. The cookie's value is a 
combination of the ID
+* and a HMAC (see Block::setCookie), so here we check the authenticity 
of the code and return
+* null if it's invalid.
+* @return integer The block ID.
+*/
+   public static function getIdFromCookieValue( $cookieValue ) {
+   $bangPos = strpos( $cookieValue, '!' );
+   $id = substr( $cookieValue, 0, $bangPos );
+   $storedHmac = substr( $cookieValue, $bangPos + 1 );
+   $config = RequestContext::getMain()->getConfig();
+   $calculatedHmac = MWCryptHash::hmac( $id, $config->get( 
'SecretKey' ), false );
+   if ( $calculatedHmac === $storedHmac ) {
+   return $id;
+   } else {
+   return null;
+   }
+   }
+
+   /**
 * Get the key and parameters for the corresponding error message.
 *
 * @since 1.22
diff --git a/includes/user/User.php b/includes/user/User.php
index 562f0d1..3a2b050 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1615,10 +1615,11 @@
$block = Block::newFromTarget( $this, $ip, !$bFromSlave );
 
// If no block has been found, check for a cookie indicating 
that the user is blocked.
-   $blockCookieVal = (int)$this->getRequest()->getCookie( 
'BlockID' );
-   if ( !$block instanceof Block && $blockCookieVal > 0 ) {
+   $blockCookieVal = $this->getRequest()->getCookie( 'BlockID' );
+   $blockCookieId = Block::getIdFromCookieValue( $blockCookieVal );
+   if ( !$block instanceof Block && $blockCookieId > 0 ) {
// Load the Block from the ID in the cookie.
-   $tmpBlock = Block::newFromID( $blockCookieVal );
+   $tmpBlock = Block::newFromID( $blockCookieId );
if ( $tmpBlock instanceof Block ) {
// Check the validity of the block.
$blockIsValid = $tmpBlock->getType() == 
Block::TYPE_USER
diff --git a/tests/phpunit/includes/user/UserTest.php 
b/tests/phpunit/includes/user/UserTest.php
index 5d9cda7..7090758 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -624,12 +624,13 @@
// Test for the desired cookie name, value, and expiry.
$cookies = $request1->response()->getCookies();
$this->assertArrayHasKey( 'wmsitetitleBlockID', $cookies );
-   $this->assertEquals( $block->getId(), 
$cookies['wmsitetitleBlockID']['value'] );
$this->assertEquals( $expiryFiveHours, 
$cookies['wmsitetitleBlockID']['expire'] );
+   $cookieValue = Block::getIdFromCookieValue( 
$cookies['wmsitetitleBlockID']['value'] );
+   $this->assertEquals( $block->getId(), $cookieValue );

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix status bar translucency in description editing tutorial

2017-01-03 Thread Mholloway (Code Review)

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

Change subject: Fix status bar translucency in description editing tutorial
..

Fix status bar translucency in description editing tutorial

Somewhere along the line, the status bar in the description editing
tutorial lost its translucency.  This puts it back.

Change-Id: Id3b1134416afd19e6f397f4a5fa84cc9b57eb89f
---
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
index 32dfb65..09e1b29 100644
--- 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
+++ 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
@@ -7,6 +7,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.view.WindowManager;
 
 import org.wikipedia.activity.SingleFragmentActivity;
 
@@ -26,6 +27,11 @@
 setRequestedOrientation(Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR2
 ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
 : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+
getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+}
 }
 
 @Override protected DescriptionEditTutorialFragment createFragment() {

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix HttpServerProblemTestCase.test_502 failing

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

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

Change subject: Fix HttpServerProblemTestCase.test_502 failing
..


Fix HttpServerProblemTestCase.test_502 failing

HttpbinTestCase class moved to aspects.py, pytest_httpbin is now used
instead of httpbin.org site only if test case inherits HttpbinTestCase

Bug: T154452
Change-Id: Ica26594a553de2e4555ffba56056141a56c3c6c5
---
M tests/aspects.py
M tests/http_tests.py
2 files changed, 63 insertions(+), 61 deletions(-)

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



diff --git a/tests/aspects.py b/tests/aspects.py
index 305c4be..993f9cd 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -7,7 +7,7 @@
 mixin to show cache usage is included.
 """
 #
-# (C) Pywikibot team, 2014-2015
+# (C) Pywikibot team, 2014-2017
 #
 # Distributed under the terms of the MIT license.
 #
@@ -29,7 +29,6 @@
 UITestCase:
 Not integrated; direct subclass of unittest.TestCase.
 """
-import imp
 import inspect
 import itertools
 import os
@@ -60,6 +59,16 @@
 add_metaclass, execute_pwb, DrySite, DryRequest,
 WarningSourceSkipContextManager, AssertAPIErrorContextManager,
 )
+
+try:
+import pytest_httpbin
+optional_pytest_httpbin_cls_decorator = 
pytest_httpbin.use_class_based_httpbin
+except ImportError:
+pytest_httpbin = None
+
+def optional_pytest_httpbin_cls_decorator(f):
+"""Empty decorator in case pytest_httpbin is not installed."""
+return f
 
 OSWIN32 = (sys.platform == 'win32')
 
@@ -484,13 +493,10 @@
 if not hasattr(cls, 'sites'):
 return
 
-# Check is pytest is used and pytest_httpbin module is installed.
-if hasattr(sys, '_test_runner_pytest'):
-try:
-imp.find_module('pytest_httpbin')
-httpbin_used = True
-except ImportError:
-httpbin_used = False
+if issubclass(cls, HttpbinTestCase):
+# If test uses httpbin, then check is pytest test runner is used
+# and pytest_httpbin module is installed.
+httpbin_used = hasattr(sys, '_test_runner_pytest') and 
pytest_httpbin
 else:
 httpbin_used = False
 
@@ -1658,3 +1664,43 @@
 CapturingTestCase.process_assert,
 CapturingTestCase.patch_assert,
 ]
+
+
+@optional_pytest_httpbin_cls_decorator
+class HttpbinTestCase(TestCase):
+
+"""
+Custom test case class, which allows doing dry httpbin tests using 
pytest-httpbin.
+
+Test cases, which use httpbin, need to inherit this class.
+"""
+
+sites = {
+'httpbin': {
+'hostname': 'httpbin.org',
+},
+}
+
+def get_httpbin_url(self, path=''):
+"""
+Return url of httpbin.
+
+If pytest is used, returns url of local httpbin server.
+Otherwise, returns: http://httpbin.org
+"""
+if hasattr(self, 'httpbin'):
+return self.httpbin.url + path
+else:
+return 'http://httpbin.org' + path
+
+def get_httpbin_hostname(self):
+"""
+Return httpbin hostname.
+
+If pytest is used, returns hostname of local httpbin server.
+Otherwise, returns: httpbin.org
+"""
+if hasattr(self, 'httpbin'):
+return '{0}:{1}'.format(self.httpbin.host, self.httpbin.port)
+else:
+return 'httpbin.org'
diff --git a/tests/http_tests.py b/tests/http_tests.py
index 72db94c..ca90f76 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Tests for http module."""
 #
-# (C) Pywikibot team, 2014-2015
+# (C) Pywikibot team, 2014-2017
 #
 # Distributed under the terms of the MIT license.
 #
@@ -25,57 +25,13 @@
 )
 
 from tests import join_images_path
-from tests.aspects import unittest, TestCase, DeprecationTestCase, 
require_modules
-
-try:
-import pytest_httpbin
-optional_pytest_httpbin_cls_decorator = 
pytest_httpbin.use_class_based_httpbin
-except ImportError:
-pytest_httpbin = None
-
-def optional_pytest_httpbin_cls_decorator(f):
-"""Empty decorator in case pytest_httpbin is not installed."""
-return f
-
-
-@optional_pytest_httpbin_cls_decorator
-class HttpbinTestCase(TestCase):
-
-"""
-Custom test case class, which allows doing dry httpbin tests using 
pytest-httpbin.
-
-Test cases, which use httpbin, need to inherit this class.
-"""
-
-sites = {
-'httpbin': {
-'hostname': 'httpbin.org',
-},
-}
-
-def get_httpbin_url(self, path=''):
-"""
-Return url of httpbin.
-
-If pytest is used, returns url of local httpbin server.
-Otherwise, returns: http://httpbin.org
-"""
-if hasattr(self, 'httpbin'):
-return self.httpbin.url + path
-

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: readme: Fix syntax error in link, add heading

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: readme: Fix syntax error in link, add heading
..

readme: Fix syntax error in link, add heading

Matching other lib repos.

Change-Id: I7d89e6ab2e86c2ae7c522a7a05d51b52eb488e72
---
M README.md
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/65/330365/1

diff --git a/README.md b/README.md
index adfe2af..ebc416e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+RemexHtml
+=
+
 RemexHtml is a parser for HTML 5, written in PHP.
 
 RemexHtml aims to be:
@@ -27,7 +30,7 @@
 the latest WHATWG draft because our application needs stability more than
 feature completeness.
 
-RemexHtml passes all [html5lib 
tests](https://github.com/html5lib/html5lib-tests]),
+RemexHtml passes all [html5lib 
tests](https://github.com/html5lib/html5lib-tests),
 except for parse error counts and tests which reference a future version of the
 standard.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d89e6ab2e86c2ae7c522a7a05d51b52eb488e72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: build: Add phpunit config file, enable phpcs in composer-test

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: build: Add phpunit config file, enable phpcs in composer-test
..

build: Add phpunit config file, enable phpcs in composer-test

* phpcs wasn't run on CI, add it. Matching other lib repos.

* Move phpunit config to a file. Matching other lib repos.
  Right now the coverage report is broken because it invokes
  'phpunit --coverage-html cover/' but fails due to a missing
  directory argument, and would not disable globals-backup either
  (slowing it down).

Change-Id: Ib6cc8aecbcc8ebd5e574d6d47b9cc5521dd7c99d
---
M composer.json
A phpunit.xml.dist
2 files changed, 17 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/66/330366/1

diff --git a/composer.json b/composer.json
index 9f56fe4..78a2ca3 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,10 @@
}
},
"scripts": {
-   "test": "phpunit --no-globals-backup tests/phpunit",
-   "phpcs": "phpcs -s src"
+   "test": [
+   "phpunit",
+   "phpcs -p"
+   ],
+   "phpcs": "phpcs -s"
}
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 000..6063fba
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+
+   
+   
+   ./tests/phpunit
+   
+   
+   
+   
+   ./src
+   
+   
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6cc8aecbcc8ebd5e574d6d47b9cc5521dd7c99d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Keystone: Move api service to uwsgi/nginx"

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

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Keystone:  Move api service to uwsgi/nginx"
..

Revert "Keystone:  Move api service to uwsgi/nginx"

This reverts commit 2e2dd27d6e40886bcd048b675e5b4befc8777cee.

Change-Id: Ia28fa7a6af5a903885de49b1ddb072e594714458
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 15 insertions(+), 53 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 16ea298..93e7062 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,7 +357,6 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
-  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4b9c47f..4f05197 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,7 +145,6 @@
 
 keystoneconfig:
   auth_port: '35357'
-  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f18e091..1e59764 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,7 +455,6 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
-public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 2982a66..08d77e2 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,13 +53,15 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
-# Disable the keystone process itself; this will be handled
-#  by nginx and uwsgi
-'/etc/init/keystone.conf':
-ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
+service { 'keystone':
+ensure=> running,
+subscribe => File['/etc/keystone/keystone.conf'],
+require   => Package['keystone'];
+}
+
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -73,6 +75,10 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
+nrpe::monitor_service { 'check_keystone_process':
+description  => 'keystone process',
+nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
+}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -81,12 +87,10 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-}
-
-# stop the keystone process itself; this will be handled
-#  by nginx and uwsgi
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
+} else {
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
+}
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index 824948b..c8a568c 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,43 +30,4 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
-
-file { '/var/log/uwsgi/keystone':
-ensure => directory,
-owner  => 'www-data',
-group  => 'www-data',
-mode   => '0644',
-}
-
-# Keystone admin API
-service::uwsgi { 'keystone-admin':
-port=> $keystoneconfig['auth_port'],
-healthcheck_url => '/',
-deployment  => None,
-config  => {
-wsgi-file => '/usr/bin/keystone-wsgi-admin',
-name  => 'keystone',
-uid   => 'keystone',
-gid

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Split SearchIndexField creation code from MappingConfigBuilder

2017-01-03 Thread Aude (Code Review)

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

Change subject: Split SearchIndexField creation code from MappingConfigBuilder
..

Split SearchIndexField creation code from MappingConfigBuilder

Make the field creation code more reusable, such as in
other extensions implementing some of the search hooks.

Change-Id: I8c1d84e5d687b8e7234d49e1cfef534e2f62
---
M autoload.php
M includes/Maintenance/MappingConfigBuilder.php
A includes/Search/CirrusSearchIndexFieldFactory.php
M includes/Search/TextIndexField.php
A tests/unit/Search/CirrusSearchIndexFieldFactoryTest.php
5 files changed, 210 insertions(+), 58 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index 33c806c..73ecdd4 100644
--- a/autoload.php
+++ b/autoload.php
@@ -141,6 +141,7 @@
'CirrusSearch\\Search\\BooleanIndexField' => __DIR__ . 
'/includes/Search/BooleanIndexField.php',
'CirrusSearch\\Search\\BoostTemplatesFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\CirrusIndexField' => __DIR__ . 
'/includes/Search/CirrusIndexField.php',
+   'CirrusSearch\\Search\\CirrusSearchIndexFieldFactory' => __DIR__ . 
'/includes/Search/CirrusSearchIndexFieldFactory.php',
'CirrusSearch\\Search\\CustomFieldFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\DatetimeIndexField' => __DIR__ . 
'/includes/Search/DatetimeIndexField.php',
'CirrusSearch\\Search\\EmptyResultSet' => __DIR__ . 
'/includes/Search/EmptyResultSet.php',
diff --git a/includes/Maintenance/MappingConfigBuilder.php 
b/includes/Maintenance/MappingConfigBuilder.php
index 7b8eded..081b20f 100644
--- a/includes/Maintenance/MappingConfigBuilder.php
+++ b/includes/Maintenance/MappingConfigBuilder.php
@@ -3,7 +3,7 @@
 namespace CirrusSearch\Maintenance;
 
 use CirrusSearch\Search\CirrusIndexField;
-use CirrusSearch\Search\IntegerIndexField;
+use CirrusSearch\Search\CirrusSearchIndexFieldFactory;
 use CirrusSearch\Search\KeywordIndexField;
 use CirrusSearch\SearchConfig;
 use CirrusSearch\Search\TextIndexField;
@@ -60,6 +60,11 @@
private $engine;
 
/**
+* @var CirrusSearchIndexFieldFactory
+*/
+   private $searchIndexFieldFactory;
+
+   /**
 * Constructor
 * @param bool $optimizeForExperimentalHighlighter should the index be 
optimized for the experimental highlighter?
 * @param SearchConfig $config
@@ -70,9 +75,11 @@
$config =

MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'CirrusSearch' );
}
+
$this->config = $config;
$this->engine = new \CirrusSearch();
$this->engine->setConfig( $config );
+   $this->searchIndexFieldFactory = new 
CirrusSearchIndexFieldFactory( $config );
}
 
/**
@@ -126,25 +133,21 @@
'type' => 'date',
'format' => 'dateOptionalTime',
],
-   'wiki' => $this->buildKeywordField( 'wiki' 
)->getMapping( $this->engine ),
-   'namespace' => $this->buildLongField( 
'namespace' )->getMapping( $this->engine ),
-   'namespace_text' => $this->buildKeywordField( 
'namespace_text' )
+   'wiki' => $this->searchIndexFieldFactory
+   ->newKeywordField( 'wiki' )
->getMapping( $this->engine ),
-   'title' => $this->buildStringField( 'title',
+   'namespace' => $this->searchIndexFieldFactory
+   ->newLongField( 'namespace' )
+   ->getMapping( $this->engine ),
+   'namespace_text' => 
$this->searchIndexFieldFactory
+   ->newKeywordField( 'namespace_text' )
+   ->getMapping( $this->engine ),
+   'title' => 
$this->searchIndexFieldFactory->newStringField( 'title',
TextIndexField::ENABLE_NORMS | 
TextIndexField::COPY_TO_SUGGEST,
$titleExtraAnalyzers 
)->setMappingFlags( $flags )->getMapping( $this->engine ),
-   'text' => array_merge_recursive( 
$this->buildStringField( 'text', null,
-   ( $flags & 
self::PHRASE_SUGGEST_USE_TEXT ) ? [ 'analyzer' => 'suggest' ] : [ ] )
-   ->setMappingFlags( $flags

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: phpunit: Use assertEquals(, $delta) in UserTest instead of g...

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: phpunit: Use assertEquals(, $delta) in UserTest instead of 
greater/lessThan
..

phpunit: Use assertEquals(, $delta) in UserTest instead of greater/lessThan

Follows-up 9d8358e09.

Documented at
https://phpunit.de/manual/4.8/en/appendixes.assertions.html#appendixes.assertions.assertEquals

Change-Id: Id337626c069663883d6a4bde58432637d33eb8c0
---
M tests/phpunit/includes/user/UserTest.php
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/330363/1

diff --git a/tests/phpunit/includes/user/UserTest.php 
b/tests/phpunit/includes/user/UserTest.php
index 5d9cda7..35f5d6a 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -726,13 +726,10 @@
$this->assertArrayHasKey( 'wm_infinite_blockBlockID', $cookies 
);
$expOneDay = wfTimestamp() + ( 24 * 60 * 60 );
// Check for expiry dates in a 10-second window, to account for 
slow testing.
-   $this->assertGreaterThan(
-   $expOneDay - 5,
-   $cookies['wm_infinite_blockBlockID']['expire']
-   );
-   $this->assertLessThan(
-   $expOneDay + 5,
-   $cookies['wm_infinite_blockBlockID']['expire']
+   $this->assertEquals(
+   $expOneDay,
+   $cookies['wm_infinite_blockBlockID']['expire'],
+   5.0
);
 
// 3. Change the block's expiry (to 2 hours), and the cookie's 
should be changed also.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Improve ContentAction example

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

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

Change subject: Improve ContentAction example
..


Improve ContentAction example

Follows-up 15d56c7.

* Call parent::show() so that headers and page title are set,
  which all core actions do and most custom actions should as well.
* Disable subtitle description (not usually used in core either).
* Move hook to a separate hooks file.
* Fix incorrect comment about "SkinTemplateContentActions" hook.

Change-Id: I2800a6d4b5082f4894e06813c29642341adea021
---
A ContentAction/ContentAction.hooks.php
M ContentAction/ContentAction.php
M ContentAction/extension.json
M ContentAction/i18n/en.json
M examples.php
5 files changed, 45 insertions(+), 22 deletions(-)

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



diff --git a/ContentAction/ContentAction.hooks.php 
b/ContentAction/ContentAction.hooks.php
new file mode 100644
index 000..f43140c
--- /dev/null
+++ b/ContentAction/ContentAction.hooks.php
@@ -0,0 +1,26 @@
+https://www.mediawiki.org/wiki/Manual:Hooks/SkinTemplateNavigation
+*
+* @param SkinTemplate $skin
+* @param array &$content_actions
+*/
+   public static function onSkinTemplateNavigation( SkinTemplate $skin, 
array &$content_actions ) {
+   $action = $skin->getRequest()->getText( 'action' );
+
+   if ( $skin->getTitle()->getNamespace() != NS_SPECIAL ) {
+   $content_actions['actions']['myact'] = array(
+   'class' => $action === 'myact' ? 'selected' : 
false,
+   'text' => wfMessage( 'contentaction-myact' 
)->text(),
+   'href' => $skin->getTitle()->getLocalUrl( 
'action=myact' )
+   );
+   }
+   }
+}
diff --git a/ContentAction/ContentAction.php b/ContentAction/ContentAction.php
index 553c905..f9c87ba 100644
--- a/ContentAction/ContentAction.php
+++ b/ContentAction/ContentAction.php
@@ -1,7 +1,6 @@
 
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
@@ -9,28 +8,24 @@
  */
 
 class ContentAction extends FormlessAction {
-   public static function onSkinTemplateNavigation( $skin, 
&$content_actions ) {
-   $action = $skin->getRequest()->getText( 'action' );
-
-   if ( $skin->getTitle()->getNamespace() != NS_SPECIAL ) {
-   $content_actions['actions']['myact'] = array(
-   'class' => $action === 'myact' ? 'selected' : 
false,
-   'text' => wfMessage( 'contentaction-myact' 
)->text(),
-   'href' => $skin->getTitle()->getLocalUrl( 
'action=myact' )
-   );
-   }
-
-   return true;
-   }
public function getName() {
return 'myact';
}
+
+   protected function getDescription() {
+   // Disable subtitle under page heading
+   return '';
+   }
+
public function onView() {
+   return null;
}
 
public function show() {
+   parent::show();
+
$this->getContext()->getOutput()->addWikiText(
-   'The page name is ' . $this->getTitle()->getText() . ' 
and you are ' . $this->getUser()->getName()
+   'This is a custom action for page [[' . 
$this->getTitle()->getText() . ']].'
);
}
 
diff --git a/ContentAction/extension.json b/ContentAction/extension.json
index 6d6d265..86acefc 100644
--- a/ContentAction/extension.json
+++ b/ContentAction/extension.json
@@ -1,7 +1,8 @@
 {
-   "name": "Content action hook",
+   "name": "Content action example",
"author": "Ævar Arnfjörð Bjarmason",
"descriptionmsg": "contentaction-desc",
+   "url": "https://www.mediawiki.org/wiki/Extension:Example;,
"type": "other",
"MessagesDirs": {
"ContentAction": [
@@ -9,10 +10,11 @@
]
},
"Hooks": {
-   "SkinTemplateNavigation": 
"ContentAction::onSkinTemplateNavigation"
+   "SkinTemplateNavigation": 
"ContentActionHooks::onSkinTemplateNavigation"
},
"AutoloadClasses": {
-   "ContentAction": "ContentAction.php"
+   "ContentAction": "ContentAction.php",
+   "ContentActionHooks": "ContentAction.hooks.php"
},
"Actions": {
"myact": "ContentAction"
diff --git a/ContentAction/i18n/en.json b/ContentAction/i18n/en.json
index cfe8e64..0f82636 100644
--- a/ContentAction/i18n/en.json
+++ b/ContentAction/i18n/en.json
@@ -2,6 +2,6 @@
"@metadata": {
"authors": []
},
-   "contentaction-desc": "Adds a new tab to each page",
+   "contentaction-desc": "Registers a new page

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make some replication logging more structured

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

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

Change subject: Make some replication logging more structured
..


Make some replication logging more structured

Change-Id: I0ec3c615047b666ff5ee430453c1de2a1316ef61
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 10 insertions(+), 4 deletions(-)

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



diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 14d049c..95f55b6 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -241,10 +241,14 @@
 
$host = $this->getServerName( $i );
if ( $lag === false && !is_infinite( 
$maxServerLag ) ) {
-   $this->replLogger->error( "Server $host 
(#$i) is not replicating?" );
+   $this->replLogger->error(
+   "Server {host} (#$i) is not 
replicating?", [ 'host' => $host ] );
unset( $loads[$i] );
} elseif ( $lag > $maxServerLag ) {
-   $this->replLogger->warning( "Server 
$host (#$i) has >= $lag seconds of lag" );
+   $this->replLogger->warning(
+   "Server {host} (#$i) has {lag} 
seconds of lag (>= {maxlag})",
+   [ 'host' => $host, 'lag' => 
$lag, 'maxlag' => $maxServerLag ]
+   );
unset( $loads[$i] );
}
}
@@ -503,8 +507,10 @@
 
if ( $result == -1 || is_null( $result ) ) {
// Timed out waiting for replica DB, use master instead
-   $msg = __METHOD__ . ": Timed out waiting on $server pos 
{$this->mWaitForPos}";
-   $this->replLogger->warning( "$msg" );
+   $this->replLogger->warning(
+   __METHOD__ . ": Timed out waiting on {host} pos 
{$this->mWaitForPos}",
+   [ 'host' => $server ]
+   );
$ok = false;
} else {
$this->replLogger->info( __METHOD__ . ": Done" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ec3c615047b666ff5ee430453c1de2a1316ef61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 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] operations/puppet[production]: Keystone: Move api service to uwsgi/nginx

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

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

Change subject: Keystone:  Move api service to uwsgi/nginx
..


Keystone:  Move api service to uwsgi/nginx

Bug: T150774
Change-Id: Ib78140c637cd286e3686f86fc147a275eca6399d
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 53 insertions(+), 15 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93e7062..16ea298 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,6 +357,7 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
+  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4f05197..4b9c47f 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,6 +145,7 @@
 
 keystoneconfig:
   auth_port: '35357'
+  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1e59764..f18e091 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,6 +455,7 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
+public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 08d77e2..2982a66 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,15 +53,13 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
+# Disable the keystone process itself; this will be handled
+#  by nginx and uwsgi
+'/etc/init/keystone.conf':
+ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
-service { 'keystone':
-ensure=> running,
-subscribe => File['/etc/keystone/keystone.conf'],
-require   => Package['keystone'];
-}
-
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -75,10 +73,6 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
-nrpe::monitor_service { 'check_keystone_process':
-description  => 'keystone process',
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
-}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -87,10 +81,12 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-} else {
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
-}
+}
+
+# stop the keystone process itself; this will be handled
+#  by nginx and uwsgi
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index c8a568c..824948b 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,4 +30,43 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
+
+file { '/var/log/uwsgi/keystone':
+ensure => directory,
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0644',
+}
+
+# Keystone admin API
+service::uwsgi { 'keystone-admin':
+port=> $keystoneconfig['auth_port'],
+healthcheck_url => '/',
+deployment  => None,
+config  => {
+wsgi-file => '/usr/bin/keystone-wsgi-admin',
+name  => 'keystone',
+uid   => 'keystone',
+gid   => 'keystone',
+processes => '10',
+threads   => '2',
+logto =>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove left-over references from comments to removed FSRepo ...

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: Remove left-over references from comments to removed FSRepo 
class
..

Remove left-over references from comments to removed FSRepo class

Follows-up 8b18ae7b5.

Change-Id: I10badb3e4648b2b32168a8aaad35855b2f6ae35e
---
M includes/DefaultSettings.php
M tests/phpunit/includes/filerepo/StoreBatchTest.php
M tests/phpunit/includes/media/MediaWikiMediaTestCase.php
3 files changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/330361/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 449e1c2..b405767 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -443,7 +443,6 @@
  * Properties required for all repos:
  *   - classThe class name for the repository. May come from the 
core or an extension.
  *  The core repository classes are FileRepo, LocalRepo, 
ForeignDBRepo.
- *  FSRepo is also supported for backwards compatibility.
  *
  *   - name A unique name for the repository (but $wgLocalFileRepo 
should be 'local').
  *  The name should consist of alpha-numeric characters.
diff --git a/tests/phpunit/includes/filerepo/StoreBatchTest.php 
b/tests/phpunit/includes/filerepo/StoreBatchTest.php
index baf8687..337c65c 100644
--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
@@ -15,7 +15,7 @@
global $wgFileBackends;
parent::setUp();
 
-   # Forge a FSRepo object to not have to rely on local wiki 
settings
+   # Forge a FileRepo object to not have to rely on local wiki 
settings
$tmpPrefix = $this->getNewTempDirectory();
if ( $this->getCliArg( 'use-filebackend' ) ) {
$name = $this->getCliArg( 'use-filebackend' );
diff --git a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php 
b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
index 43eb299..196f688 100644
--- a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
+++ b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
@@ -19,7 +19,7 @@
if ( $this->createsThumbnails() ) {
// We need a temp directory for the thumbnails
// the container is named 'temp-thumb' because it is the
-   // thumb directory for a FSRepo named "temp".
+   // thumb directory for a repo named "temp".
$containers['temp-thumb'] = 
$this->getNewTempDirectory();
}
 
@@ -33,7 +33,7 @@
}
 
/**
-* @return array Argument for FSRepo constructor
+* @return array Argument for FileRepo constructor
 */
protected function getRepoOptions() {
return [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add throttle rules for January 2017 events in Maharashtra

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

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

Change subject: Add throttle rules for January 2017 events in Maharashtra
..


Add throttle rules for January 2017 events in Maharashtra

New throttle rule:
* Event name  Maharashtra 'Edit Wikipedia…' workshops (Pune)
* Event start ... 2017-01-04 07:00+05:30
* Event end . 2017-01-04 20:00+05:30
* IP  196.1.114.0/24
* Projects .. mrwiki, mrwiktionary, mrwikisource, mrwikibooks, 
mrwikiquote, enwiki, commonswiki
* Attendees . unknown (margin set at 100)

New throttle rule:
* Event name  Maharashtra 'Edit Wikipedia…' workshops (MPKV)
* Event start ... 2017-01-07 07:00+05:30
* Event end . 2017-01-07 20:00+05:30
* IP  14.139.120.144/28
* Projects .. mrwiki, mrwiktionary, mrwikisource, mrwikibooks, 
mrwikiquote, enwiki, commonswiki
* Attendees . unknown (margin set at 100)

Bug: T154312
Change-Id: I2792c9d889a045fdc10b0ba73d7838d7ca0ba840
---
M wmf-config/throttle.php
1 file changed, 38 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 75542d1..528d7d9 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -28,6 +28,44 @@
 # ];
 ## Add throttling definitions below.
 
+///
+/// Maharashtra 'Edit Wikipedia…' workshops — T154312
+///
+
+$wmgMaharashtraEventsWikis = [
+   "mrwiki",
+   "mrwiktionary",
+   "mrwikisource",
+   "mrwikibooks",
+   "mrwikiquote",
+   "enwiki",
+   "commonswiki",
+];
+
+$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia…' 
workshops (Pune)
+   'from'   => '2017-01-04T07:00 +5:30',
+   'to' => '2017-01-04T20:00 +5:30',
+   'range'  => '196.1.114.0/24', // 196.1.114.200
+   'dbname' => $wmgMaharashtraEventsWikis,
+   'value'  => 100 // expected participants are unknown
+];
+
+// TODO: VNGIASS 2017-01-06
+
+$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia…' 
workshops (MPKV)
+   'from'   => '2017-01-07T07:00 +5:30',
+   'to' => '2017-01-07T20:00 +5:30',
+   'range'  => '14.139.120.144/28', // 14.139.120.152
+   'dbname' => $wmgMaharashtraEventsWikis,
+   'value'  => 100 // expected participants are unknown
+];
+
+// TODO: DBF 2017-01-10
+
+///
+/// Other rules
+///
+
 $wmgThrottlingExceptions[] = [ // T154245
'from' => '2017-01-13T00:00 +0:00',
'to' => '2017-01-13T23:59 +0:00',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2792c9d889a045fdc10b0ba73d7838d7ca0ba840
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: BryanDavis 
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]: Avoid hardcoding cache and cache key in populateInterwiki.php

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: Avoid hardcoding cache and cache key in populateInterwiki.php
..

Avoid hardcoding cache and cache key in populateInterwiki.php

Follows-up 0ac10f3790.

Change-Id: I1f5fbc40adc66a673428e495be94fc8118d6e14f
---
M maintenance/populateInterwiki.php
1 file changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/330360/1

diff --git a/maintenance/populateInterwiki.php 
b/maintenance/populateInterwiki.php
index 5d32b99..6c812bf 100644
--- a/maintenance/populateInterwiki.php
+++ b/maintenance/populateInterwiki.php
@@ -33,11 +33,6 @@
 */
private $source;
 
-   /**
-* @var BagOStuff
-*/
-   private $cache;
-
public function __construct() {
parent::__construct();
 
@@ -63,8 +58,6 @@
public function execute() {
$force = $this->getOption( 'force', false );
$this->source = $this->getOption( 'source', 
'https://en.wikipedia.org/w/api.php' );
-
-   $this->cache = wfGetMainCache();
 
$data = $this->fetchLinks();
 
@@ -149,20 +142,12 @@
);
}
 
-   $this->clearCacheEntry( $prefix );
+   Interwiki::invalidateCache( $prefix );
}
 
$this->output( "Interwiki links are populated.\n" );
 
return true;
-   }
-
-   /**
-* @param string $prefix
-*/
-   private function clearCacheEntry( $prefix ) {
-   $key = wfMemcKey( 'interwiki', $prefix );
-   $this->cache->delete( $key );
}
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Brand beta differently

2017-01-03 Thread Jdlrobson (Code Review)

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

Change subject: Brand beta differently
..

Brand beta differently

When in beta the logo copyright-beta/copyright or the site heading will
show with the text "beta" in a box to its right

Bug: T152458
Change-Id: I5f3d3678264fadba792fa239d5a8b84cf5663f5e
---
M includes/MobileFrontend.skin.hooks.php
M includes/skins/MinervaTemplate.php
M resources/skins.minerva.base.styles/ui.less
3 files changed, 25 insertions(+), 8 deletions(-)


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

diff --git a/includes/MobileFrontend.skin.hooks.php 
b/includes/MobileFrontend.skin.hooks.php
index b555978..ce68692 100644
--- a/includes/MobileFrontend.skin.hooks.php
+++ b/includes/MobileFrontend.skin.hooks.php
@@ -274,6 +274,17 @@
 
$tpl->set( 'mobile-switcher', $switcherHtml );
$tpl->set( 'footer-site-heading-html', $sitename );
+   if ( $inBeta ) {
+   $tpl->set( 'site-heading-html',
+   Html::rawElement( 'span', [],
+   self::getSitename( true, 
'copyright-beta' )
+   ) .
+   Html::element( 'div', [ 'class' => 'beta' ],
+   wfMessage( 
'mobile-frontend-settings-beta' ) )
+   );
+   } else {
+   $tpl->set( 'site-heading-html', $sitename );
+   }
$tpl->set( 'desktop-toggle', $desktopToggler );
$tpl->set( 'mobile-license', $licenseText );
$tpl->set( 'privacy', $sk->footerLink( 
'mobile-frontend-privacy-link-text', 'privacypage' ) );
@@ -310,7 +321,7 @@
 * contexts, for example, the footer, but not in others. See bug 
T95007.
 * @return string
 */
-   public static function getSitename( $withPossibleTrademark = false ) {
+   public static function getSitename( $withPossibleTrademark = false, 
$logoName = 'copyright' ) {
$ctx = MobileContext::singleton();
$config = $ctx->getMFConfig();
$customLogos = $config->get( 'MFCustomLogos' );
@@ -330,17 +341,22 @@
}
}
 
+   // If the requested logo doesn't exist revert back to the known 
logo
+   if ( !isset( $customLogos[$logoName] ) ) {
+   $logoName = 'copyright';
+   }
+
// If there's a custom site logo, use that instead of text
-   if ( isset( $customLogos['copyright'] ) ) {
+   if ( isset( $customLogos[$logoName] ) ) {
$attributes =  [
-   'src' => $customLogos['copyright'],
+   'src' => $customLogos[$logoName],
'alt' => $footerSitename,
];
-   if ( isset( $customLogos['copyright-height'] ) ) {
-   $attributes['height'] = 
$customLogos['copyright-height'];
+   if ( isset( $customLogos["$logoName-height"] ) ) {
+   $attributes['height'] = 
$customLogos["$logoName-height"];
}
-   if ( isset( $customLogos['copyright-width'] ) ) {
-   $attributes['width'] = 
$customLogos['copyright-width'];
+   if ( isset( $customLogos["$logoName-width"] ) ) {
+   $attributes['width'] = 
$customLogos["$logoName-width"];
}
$sitename = Html::element( 'img', $attributes );
} else {
diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 2c0dfe1..2f6fb43 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -276,7 +276,7 @@
'banners' => $data['banners'],
'headelement' => $data[ 'headelement' ],
'menuButton' => $data['menuButton'],
-   'headinghtml' => $data['footer-site-heading-html'],
+   'headinghtml' => $data['site-heading-html'],
'searchButton' => Html::element( 'a', [
'href' => SpecialPage::getTitleFor( 'Search' 
)->getLocalURL(),
'id' => 'searchInput',
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 1bb3d5a..c38a2af 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -127,6 +127,7 @@
letter-spacing: 0.1px;

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for b52cd902be38 - added some missing changes

2017-01-03 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330358 )

Change subject: Fix for b52cd902be38 - added some missing changes
..

Fix for b52cd902be38 - added some missing changes

Change-Id: I9e4ba1f9b4e466dccd5de7be60812975b76ff843
---
M Cargo.php
M extension.json
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/58/330358/2

diff --git a/Cargo.php b/Cargo.php
index 50f1943..409bfe4 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -73,6 +73,7 @@
 $wgAPIModules['cargoquery'] = 'CargoQueryAPI';
 $wgAPIModules['cargorecreatetables'] = 'CargoRecreateTablesAPI';
 $wgAPIModules['cargorecreatedata'] = 'CargoRecreateDataAPI';
+$wgAPIModules['cargoautocomplete'] = 'CargoAutocompleteAPI';
 
 // Register classes and special pages.
 $wgAutoloadClasses['CargoHooks'] = $dir . '/Cargo.hooks.php';
@@ -108,6 +109,7 @@
 $wgAutoloadClasses['CargoQueryAPI'] = $dir . '/api/CargoQueryAPI.php';
 $wgAutoloadClasses['CargoRecreateTablesAPI'] = $dir . 
'/api/CargoRecreateTablesAPI.php';
 $wgAutoloadClasses['CargoRecreateDataAPI'] = $dir . 
'/api/CargoRecreateDataAPI.php';
+$wgAutoloadClasses['CargoAutocompleteAPI'] = $dir . 
'/api/CargoAutocompleteAPI.php';
 $wgAutoloadClasses['CargoLuaLibrary'] = $dir . '/CargoLua.library.php';
 
 // Display formats
diff --git a/extension.json b/extension.json
index 58994da..3d56e0a 100755
--- a/extension.json
+++ b/extension.json
@@ -28,7 +28,8 @@
"APIModules": {
"cargoquery": "CargoQueryAPI",
"cargorecreatetables": "CargoRecreateTablesAPI",
-   "cargorecreatedata": "CargoRecreateDataAPI"
+   "cargorecreatedata": "CargoRecreateDataAPI",
+   "cargoautocomplete": "CargoAutocompleteAPI"
},
"MessagesDirs": {
"Cargo": [
@@ -68,6 +69,7 @@
"CargoQueryAPI": "api/CargoQueryAPI.php",
"CargoRecreateTablesAPI": "api/CargoRecreateTablesAPI.php",
"CargoRecreateDataAPI": "api/CargoRecreateDataAPI.php",
+   "CargoAutocompleteAPI": "api/CargoAutocompleteAPI.php",
"CargoLuaLibrary": "CargoLua.library.php",
"CargoDisplayFormat": "formats/CargoDisplayFormat.php",
"CargoDeferredFormat": "formats/CargoDeferredFormat.php",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e4ba1f9b4e466dccd5de7be60812975b76ff843
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Correct ironic typo in search preferences

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

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

Change subject: Correct ironic typo in search preferences
..


Correct ironic typo in search preferences

Turns out the word typo was itself misspelt in the search preferences. Irony!
This patch fixes it.

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

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/i18n/en.json b/i18n/en.json
index 389ba76..5fcee94 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,7 +43,7 @@
"cirrussearch-completion-profile-fuzzy-pref-name": "Default 
(recommended)",
"cirrussearch-completion-profile-fuzzy-pref-desc": "Corrects up to two 
typos. Resolves close redirects.",
"cirrussearch-completion-profile-fuzzy-subphrases-pref-name": 
"Subphrase matching (recommended for longer article titles)",
-   "cirrussearch-completion-profile-fuzzy-subphrases-pref-desc": "Corrects 
up to two types. Resolves close redirects. Matches subphrase in titles.",
+   "cirrussearch-completion-profile-fuzzy-subphrases-pref-desc": "Corrects 
up to two typos. Resolves close redirects. Matches subphrase in titles.",
"cirrussearch-completion-profile-strict-pref-name": "Strict mode 
(advanced)",
"cirrussearch-completion-profile-strict-pref-desc": "No typo 
correction. No accent folding. Strict matching.",
"cirrussearch-completion-profile-normal-pref-name": "Redirect mode 
(advanced)",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8c523598629e9f438dce457a5a0f45c4caeba55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Deskana 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: New chrome header with branding

2017-01-03 Thread Jdlrobson (Code Review)

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

Change subject: New chrome header with branding
..

New chrome header with branding

* Replace search input in header with search icon and heading
* Search button without JS will take user to Special:Search as fallback
* Search form is now visible on Special:Search page
* Search button with JS will load search overlay

Logo can be enabled in header+footer like so:
```
$wgMFCustomLogos = [
'copyright' => 
'https://en.m.wikipedia.org/static/images/mobile/wikipedia-wordmark-en.png'
];
```

additional changes:
* cleaned up multiple uses of magnifying-glass icon

Note: Distinguishing stable from beta will be handled in a follow up commit.

Bug: T152458
Change-Id: I53558f7a69e541eb36ded822e70e4a9602353648
---
M extension.json
M includes/skins/MinervaTemplate.php
M includes/skins/minerva.mustache
D includes/skins/search_form.mustache
D resources/skins.minerva.base.styles/magnifying-glass.png
D resources/skins.minerva.base.styles/magnifying-glass.svg
M resources/skins.minerva.base.styles/ui.less
D resources/skins.minerva.icons.images/magnifying-glass-white.svg
A resources/skins.minerva.icons.images/magnifying-glass.svg
M resources/skins.minerva.special.search.styles/search.less
10 files changed, 46 insertions(+), 70 deletions(-)


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

diff --git a/extension.json b/extension.json
index 3370ac2..de820c8 100644
--- a/extension.json
+++ b/extension.json
@@ -172,7 +172,7 @@
"mainmenu": 
"resources/skins.minerva.icons.images/hamburger.svg",
"edit": 
"resources/skins.minerva.icons.images/editLocked.svg",
"edit-enabled": 
"resources/skins.minerva.icons.images/edit.svg",
-   "magnifying-glass-white": 
"resources/skins.minerva.icons.images/magnifying-glass-white.svg",
+   "magnifying-glass": 
"resources/skins.minerva.icons.images/magnifying-glass.svg",
"language-switcher": 
"resources/skins.minerva.icons.images/languageSwitcher.svg"
}
},
diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 5739257..2c0dfe1 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -17,34 +17,6 @@
protected $isMainPage;
 
/**
-* Gets the header content for the top chrome.
-* @param array $data Data used to build the page
-* @return string
-*/
-   protected function getChromeHeaderContentHtml( $data ) {
-   return $this->getSearchForm( $data );
-   }
-
-   /**
-* Generates the HTML required to render the search form.
-*
-* @param array $data The data used to render the page
-* @return string
-*/
-   protected function getSearchForm( $data ) {
-   $args = [
-   'action' => $data['wgScript'],
-   'searchInput' => $this->makeSearchInput( 
$data['searchInputAttributes'] ),
-   'searchButton' => $this->makeSearchButton( 'fulltext', [
-   'class' => MobileUI::buttonClass( 'progressive',
-   'fulltext-search' ),
-   ] )
-   ];
-   $templateParser = new TemplateParser( __DIR__ );
-   return $templateParser->processTemplate( 'search_form', $args );
-   }
-
-   /**
 * Start render the page in template
 */
public function execute() {
@@ -292,23 +264,6 @@
}
 
/**
-* Get HTML for header elements
-* @param array $data Data used to build the header
-* @return string
-*/
-   protected function getHeaderHtml( $data ) {
-   // Note these should be wrapped in divs
-   // see https://phabricator.wikimedia.org/T98498 for details
-   $html = '' . $data['menuButton'] . ''
-   . $this->getChromeHeaderContentHtml( $data );
-   // Do not show the secondary button container if no secondary 
button is available
-   if ( $data['secondaryButton'] ) {
-   $html .= '' . $data['secondaryButton'] . '';
-   }
-   return $html;
-   }
-
-   /**
 * Render the entire page
 * @param array $data Data used to build the page
 * @todo replace with template engines
@@ -320,7 +275,14 @@
$templateData = [
'banners' => $data['banners'],
'headelement' => $data[ 'headelement' ],
-   'headerhtml' => $this->getHeaderHtml(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid starting transactions in getHeartbeatData()

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

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

Change subject: Avoid starting transactions in getHeartbeatData()
..


Avoid starting transactions in getHeartbeatData()

This can avoid excess round trips in LoadBalancer::getLagTimes()

Change-Id: Ibe9558cc825c5a0dd03ea109926ff15d00c60e31
---
M includes/libs/rdbms/database/DatabaseMysqlBase.php
1 file changed, 14 insertions(+), 8 deletions(-)

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



diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php 
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 668443b..5d680e2 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -756,14 +756,20 @@
 * @see 
https://www.percona.com/doc/percona-toolkit/2.1/pt-heartbeat.html
 */
protected function getHeartbeatData( array $conds ) {
-   $whereSQL = $this->makeList( $conds, self::LIST_AND );
-   // Use ORDER BY for channel based queries since that field 
might not be UNIQUE.
-   // Note: this would use 
"TIMESTAMPDIFF(MICROSECOND,ts,UTC_TIMESTAMP(6))" but the
-   // percision field is not supported in MySQL <= 5.5.
-   $res = $this->query(
-   "SELECT ts FROM heartbeat.heartbeat WHERE $whereSQL 
ORDER BY ts DESC LIMIT 1"
-   );
-   $row = $res ? $res->fetchObject() : false;
+   // Do not bother starting implicit transactions here
+   $this->clearFlag( self::DBO_TRX, self::REMEMBER_PRIOR );
+   try {
+   $whereSQL = $this->makeList( $conds, self::LIST_AND );
+   // Use ORDER BY for channel based queries since that 
field might not be UNIQUE.
+   // Note: this would use 
"TIMESTAMPDIFF(MICROSECOND,ts,UTC_TIMESTAMP(6))" but the
+   // percision field is not supported in MySQL <= 5.5.
+   $res = $this->query(
+   "SELECT ts FROM heartbeat.heartbeat WHERE 
$whereSQL ORDER BY ts DESC LIMIT 1"
+   );
+   $row = $res ? $res->fetchObject() : false;
+   } finally {
+   $this->restoreFlags();
+   }
 
return [ $row ? $row->ts : null, microtime( true ) ];
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Added optional built-in support for displaytitle

2017-01-03 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329015 )

Change subject: Added optional built-in support for displaytitle
..


Added optional built-in support for displaytitle

Change-Id: I51417e091c67d220ce464a7627a3525f42732e92
---
M PageForms.php
M extension.json
M includes/PF_AutocompleteAPI.php
M includes/PF_FormField.php
M includes/PF_FormPrinter.php
M includes/PF_ValuesUtils.php
M libs/ext.pf.select2.combobox.js
M libs/ext.pf.select2.tokens.js
8 files changed, 239 insertions(+), 50 deletions(-)

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



diff --git a/PageForms.php b/PageForms.php
index fa02a12..e612e3a 100644
--- a/PageForms.php
+++ b/PageForms.php
@@ -572,6 +572,11 @@
 require_once 'includes/PF_DatePickerSettings.php';
 
 # ##
+# Display displaytitle page property instead of page title for Page type fields
+# ##
+$GLOBALS['wgPageFormsUseDisplayTitle'] = false;
+
+# ##
 # Global variables for Javascript
 # ##
 $GLOBALS['wgPageFormsShowOnSelect'] = array();
diff --git a/extension.json b/extension.json
index 30b2532..493f408 100644
--- a/extension.json
+++ b/extension.json
@@ -420,6 +420,7 @@
]
},
"config": {
+   "PageFormsUseDisplayTitle": false,
"PageFormsMaxAutocompleteValues": 1000,
"PageFormsMaxLocalAutocompleteValues": 100,
"PageFormsAutocompleteOnAllChars": false,
@@ -458,4 +459,4 @@
}
},
"manifest_version": 1
-}
\ No newline at end of file
+}
diff --git a/includes/PF_AutocompleteAPI.php b/includes/PF_AutocompleteAPI.php
index bd0765e..cb16a3d 100644
--- a/includes/PF_AutocompleteAPI.php
+++ b/includes/PF_AutocompleteAPI.php
@@ -43,6 +43,8 @@
}
}
 
+   global $wgPageFormsUseDisplayTitle;
+   $map = false;
if ( !is_null( $baseprop ) ) {
if ( !is_null( $property ) ) {
$data = self::getAllValuesForProperty( 
$property, null, $baseprop, $basevalue );
@@ -51,12 +53,15 @@
$data = self::getAllValuesForProperty( $property, 
$substr );
} elseif ( !is_null( $category ) ) {
$data = PFValuesUtils::getAllPagesForCategory( 
$category, 3, $substr );
+   $map = $wgPageFormsUseDisplayTitle;
} elseif ( !is_null( $concept ) ) {
$data = PFValuesUtils::getAllPagesForConcept( $concept, 
$substr );
+   $map = $wgPageFormsUseDisplayTitle;
} elseif ( !is_null( $cargo_table ) && !is_null( $cargo_field ) 
) {
$data = self::getAllValuesForCargoField( $cargo_table, 
$cargo_field, $field_is_array, $substr, $base_cargo_table, $base_cargo_field, 
$basevalue );
} elseif ( !is_null( $namespace ) ) {
$data = PFValuesUtils::getAllPagesForNamespace( 
$namespace, $substr );
+   $map = $wgPageFormsUseDisplayTitle;
} elseif ( !is_null( $external_url ) ) {
$data = PFValuesUtils::getValuesFromExternalURL( 
$external_url, $substr );
} else {
@@ -93,8 +98,12 @@
// correctly.
if ( is_null( $external_url ) ) {
$formattedData = array();
-   foreach ( $data as $value ) {
-   $formattedData[] = array( 'title' => $value );
+   foreach ( $data as $index => $value ) {
+   if ( $map ) {
+   $formattedData[] = array( 'title' => 
$index, 'displaytitle' => $value );
+   } else {
+   $formattedData[] = array( 'title' => 
$value );
+   }
}
} else {
$formattedData = $data;
diff --git a/includes/PF_FormField.php b/includes/PF_FormField.php
index c41406e..c006ff8 100644
--- a/includes/PF_FormField.php
+++ b/includes/PF_FormField.php
@@ -341,6 +341,7 @@
}
 
if ( !is_null( $f->mPossibleValues ) ) {
+   global $wgPageFormsUseDisplayTitle;
if ( array_key_exists( 'mapping template', 
$f->mFieldArgs ) ) {
$f->setValuesWithMappingTemplate();
} elseif ( array_key_exists( 'mapping property', 
$f->mFieldArgs ) ) {
@@ -348,6 +349,8 @@
} elseif ( array_key_exists( 'mapping cargo table', 
$f->mFieldArgs ) &&
array_key_exists( 'mapping cargo field', 
$f->mFieldArgs ) ) {
$f->setValuesWithMappingCargoField();
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add throttle rules for January 2017 events in Maharashtra

2017-01-03 Thread Dereckson (Code Review)

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

Change subject: Add throttle rules for January 2017 events in Maharashtra
..

Add throttle rules for January 2017 events in Maharashtra

New throttle rule:
* Event name  Maharashtra 'Edit Wikipedia…' workshops (Pune)
* Event start ... 2017-01-04 07:00+05:30
* Event end . 2017-01-04 20:00+05:30
* IP  196.1.114.0/24
* Projects .. mrwiki, mrwiktionary, mrwikisource, mrwikibooks, 
mrwikiquote, enwiki, commonswiki
* Attendees . unknown (margin set at 100)

New throttle rule:
* Event name  Maharashtra 'Edit Wikipedia…' workshops (MPKV)
* Event start ... 2017-01-07 07:00+05:30
* Event end . 2017-01-07 20:00+05:30
* IP  14.139.120.144/28
* Projects .. mrwiki, mrwiktionary, mrwikisource, mrwikibooks, 
mrwikiquote, enwiki, commonswiki
* Attendees . unknown (margin set at 100)

Bug: T154312
Change-Id: I2792c9d889a045fdc10b0ba73d7838d7ca0ba840
---
M wmf-config/throttle.php
1 file changed, 38 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 75542d1..3efa931 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -28,6 +28,44 @@
 # ];
 ## Add throttling definitions below.
 
+///
+/// Maharashtra 'Edit Wikipedia…' workshops — T154312
+///
+
+$maharashtraEventsWikis = [
+   "mrwiki",
+   "mrwiktionary",
+   "mrwikisource",
+   "mrwikibooks",
+   "mrwikiquote",
+   "enwiki",
+   "commonswiki",
+];
+
+$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia…' 
workshops (Pune)
+   'from'   => '2017-01-04T07:00 +5:30',
+   'to' => '2017-01-04T20:00 +5:30',
+   'range'  => '196.1.114.0/24', // 196.1.114.200
+   'dbname' => $maharashtraEventsWikis,
+   'value'  => 100 // expected participants are unknown
+];
+
+// TODO: VNGIASS 2017-01-06
+
+$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia…' 
workshops (MPKV)
+   'from'   => '2017-01-07T07:00 +5:30',
+   'to' => '2017-01-07T20:00 +5:30',
+   'range'  => '14.139.120.144/28', // 14.139.120.152
+   'dbname' => $maharashtraEventsWikis,
+   'value'  => 100 // expected participants are unknown
+];
+
+// TODO: 2017-01-10DBF
+
+///
+/// Other rules
+///
+
 $wmgThrottlingExceptions[] = [ // T154245
'from' => '2017-01-13T00:00 +0:00',
'to' => '2017-01-13T23:59 +0:00',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: parser: Update outdated comment about ImageGallery

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: parser: Update outdated comment about ImageGallery
..

parser: Update outdated comment about ImageGallery

Follows-up f90634a6.

Change-Id: Ic17dc03cc37b85f222f3bb525e4cb39afc6f22ae
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/330355/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1ca9dac..f279af2 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4990,7 +4990,7 @@
$descQuery = false;
Hooks::run( 'BeforeParserFetchFileAndTitle',
[ $this, $title, &$options, &$descQuery ] );
-   # Don't register it now, as ImageGallery does that 
later.
+   # Don't register it now, as TraditionalImageGallery 
does that later.
$file = $this->fetchFileNoRegister( $title, $options );
$handler = $file ? $file->getHandler() : false;
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: New chrome header with branding

2017-01-03 Thread Jdlrobson (Code Review)

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

Change subject: New chrome header with branding
..

New chrome header with branding

* Replace search input in header with search icon and heading
* Search button without JS will take user to Special:Search as fallback
* Search button with JS will load search overlay

A follow up will replace the heading with an image if available.

Bug: T152458
Change-Id: I53558f7a69e541eb36ded822e70e4a9602353648
---
M extension.json
M includes/skins/MinervaTemplate.php
M includes/skins/minerva.mustache
D includes/skins/search_form.mustache
D resources/skins.minerva.base.styles/magnifying-glass.png
D resources/skins.minerva.base.styles/magnifying-glass.svg
M resources/skins.minerva.base.styles/ui.less
D resources/skins.minerva.icons.images/magnifying-glass-white.svg
A resources/skins.minerva.icons.images/magnifying-glass.svg
M resources/skins.minerva.special.search.styles/search.less
10 files changed, 40 insertions(+), 70 deletions(-)


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

diff --git a/extension.json b/extension.json
index 3370ac2..de820c8 100644
--- a/extension.json
+++ b/extension.json
@@ -172,7 +172,7 @@
"mainmenu": 
"resources/skins.minerva.icons.images/hamburger.svg",
"edit": 
"resources/skins.minerva.icons.images/editLocked.svg",
"edit-enabled": 
"resources/skins.minerva.icons.images/edit.svg",
-   "magnifying-glass-white": 
"resources/skins.minerva.icons.images/magnifying-glass-white.svg",
+   "magnifying-glass": 
"resources/skins.minerva.icons.images/magnifying-glass.svg",
"language-switcher": 
"resources/skins.minerva.icons.images/languageSwitcher.svg"
}
},
diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 5739257..8197a6e 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -17,34 +17,6 @@
protected $isMainPage;
 
/**
-* Gets the header content for the top chrome.
-* @param array $data Data used to build the page
-* @return string
-*/
-   protected function getChromeHeaderContentHtml( $data ) {
-   return $this->getSearchForm( $data );
-   }
-
-   /**
-* Generates the HTML required to render the search form.
-*
-* @param array $data The data used to render the page
-* @return string
-*/
-   protected function getSearchForm( $data ) {
-   $args = [
-   'action' => $data['wgScript'],
-   'searchInput' => $this->makeSearchInput( 
$data['searchInputAttributes'] ),
-   'searchButton' => $this->makeSearchButton( 'fulltext', [
-   'class' => MobileUI::buttonClass( 'progressive',
-   'fulltext-search' ),
-   ] )
-   ];
-   $templateParser = new TemplateParser( __DIR__ );
-   return $templateParser->processTemplate( 'search_form', $args );
-   }
-
-   /**
 * Start render the page in template
 */
public function execute() {
@@ -292,23 +264,6 @@
}
 
/**
-* Get HTML for header elements
-* @param array $data Data used to build the header
-* @return string
-*/
-   protected function getHeaderHtml( $data ) {
-   // Note these should be wrapped in divs
-   // see https://phabricator.wikimedia.org/T98498 for details
-   $html = '' . $data['menuButton'] . ''
-   . $this->getChromeHeaderContentHtml( $data );
-   // Do not show the secondary button container if no secondary 
button is available
-   if ( $data['secondaryButton'] ) {
-   $html .= '' . $data['secondaryButton'] . '';
-   }
-   return $html;
-   }
-
-   /**
 * Render the entire page
 * @param array $data Data used to build the page
 * @todo replace with template engines
@@ -320,7 +275,13 @@
$templateData = [
'banners' => $data['banners'],
'headelement' => $data[ 'headelement' ],
-   'headerhtml' => $this->getHeaderHtml( $data ),
+   'menuButton' => $data['menuButton'],
+   'searchButton' => Html::element( 'a', [
+   'href' => SpecialPage::getTitleFor( 'Search' 
)->getLocalURL(),
+   'id' => 'searchInput',
+

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Improve ContentAction example

2017-01-03 Thread Krinkle (Code Review)

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

Change subject: Improve ContentAction example
..

Improve ContentAction example

Follows-up 15d56c7.

* Call parent::show() so that headers and page title are set,
  which all core actions do and most custom actions should as well.
* Disable subtitle description (not usually used in core either).
* Move hook to a separate hooks file.
* Fix incorrect comment about "SkinTemplateContentActions" hook.

Change-Id: I2800a6d4b5082f4894e06813c29642341adea021
---
A ContentAction/ContentAction.hooks.php
M ContentAction/ContentAction.php
M ContentAction/extension.json
M ContentAction/i18n/en.json
M examples.php
5 files changed, 45 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples 
refs/changes/53/330353/1

diff --git a/ContentAction/ContentAction.hooks.php 
b/ContentAction/ContentAction.hooks.php
new file mode 100644
index 000..f43140c
--- /dev/null
+++ b/ContentAction/ContentAction.hooks.php
@@ -0,0 +1,26 @@
+https://www.mediawiki.org/wiki/Manual:Hooks/SkinTemplateNavigation
+*
+* @param SkinTemplate $skin
+* @param array &$content_actions
+*/
+   public static function onSkinTemplateNavigation( SkinTemplate $skin, 
array &$content_actions ) {
+   $action = $skin->getRequest()->getText( 'action' );
+
+   if ( $skin->getTitle()->getNamespace() != NS_SPECIAL ) {
+   $content_actions['actions']['myact'] = array(
+   'class' => $action === 'myact' ? 'selected' : 
false,
+   'text' => wfMessage( 'contentaction-myact' 
)->text(),
+   'href' => $skin->getTitle()->getLocalUrl( 
'action=myact' )
+   );
+   }
+   }
+}
diff --git a/ContentAction/ContentAction.php b/ContentAction/ContentAction.php
index 553c905..f9c87ba 100644
--- a/ContentAction/ContentAction.php
+++ b/ContentAction/ContentAction.php
@@ -1,7 +1,6 @@
 
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
@@ -9,28 +8,24 @@
  */
 
 class ContentAction extends FormlessAction {
-   public static function onSkinTemplateNavigation( $skin, 
&$content_actions ) {
-   $action = $skin->getRequest()->getText( 'action' );
-
-   if ( $skin->getTitle()->getNamespace() != NS_SPECIAL ) {
-   $content_actions['actions']['myact'] = array(
-   'class' => $action === 'myact' ? 'selected' : 
false,
-   'text' => wfMessage( 'contentaction-myact' 
)->text(),
-   'href' => $skin->getTitle()->getLocalUrl( 
'action=myact' )
-   );
-   }
-
-   return true;
-   }
public function getName() {
return 'myact';
}
+
+   protected function getDescription() {
+   // Disable subtitle under page heading
+   return '';
+   }
+
public function onView() {
+   return null;
}
 
public function show() {
+   parent::show();
+
$this->getContext()->getOutput()->addWikiText(
-   'The page name is ' . $this->getTitle()->getText() . ' 
and you are ' . $this->getUser()->getName()
+   'This is a custom action for page [[' . 
$this->getTitle()->getText() . ']].'
);
}
 
diff --git a/ContentAction/extension.json b/ContentAction/extension.json
index 6d6d265..86acefc 100644
--- a/ContentAction/extension.json
+++ b/ContentAction/extension.json
@@ -1,7 +1,8 @@
 {
-   "name": "Content action hook",
+   "name": "Content action example",
"author": "Ævar Arnfjörð Bjarmason",
"descriptionmsg": "contentaction-desc",
+   "url": "https://www.mediawiki.org/wiki/Extension:Example;,
"type": "other",
"MessagesDirs": {
"ContentAction": [
@@ -9,10 +10,11 @@
]
},
"Hooks": {
-   "SkinTemplateNavigation": 
"ContentAction::onSkinTemplateNavigation"
+   "SkinTemplateNavigation": 
"ContentActionHooks::onSkinTemplateNavigation"
},
"AutoloadClasses": {
-   "ContentAction": "ContentAction.php"
+   "ContentAction": "ContentAction.php",
+   "ContentActionHooks": "ContentAction.hooks.php"
},
"Actions": {
"myact": "ContentAction"
diff --git a/ContentAction/i18n/en.json b/ContentAction/i18n/en.json
index cfe8e64..0f82636 100644
--- a/ContentAction/i18n/en.json
+++ b/ContentAction/i18n/en.json
@@ -2,6 +2,6 @@
"@metadata": {
"authors": []
},
-   "contentaction-desc": "Adds a new tab to each page",
+   "contentaction-desc":

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Convert sentry to systemd

2017-01-03 Thread Code Review

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

Change subject: Convert sentry to systemd
..

Convert sentry to systemd

Bug: T154268
Change-Id: I2f1d0866bc97c21fce749ecf9b5f3b8168841878
---
M puppet/modules/sentry/manifests/init.pp
A puppet/modules/sentry/templates/systemd-server.erb
A puppet/modules/sentry/templates/systemd-worker.erb
D puppet/modules/sentry/templates/upstart-server.erb
D puppet/modules/sentry/templates/upstart-worker.erb
5 files changed, 54 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/52/330352/1

diff --git a/puppet/modules/sentry/manifests/init.pp 
b/puppet/modules/sentry/manifests/init.pp
index 245df38..d75e922 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -154,22 +154,28 @@
 ],
 }
 
-file { '/etc/init/sentry-server.conf':
+file { '/lib/systemd/system/sentry-server.service':
 ensure  => present,
-content => template('sentry/upstart-server.erb'),
+content => template('sentry/systemd-server.erb'),
 mode=> '0444',
 }
 
-file { '/etc/init/sentry-worker.conf':
+file { '/lib/systemd/system/sentry-worker.service':
 ensure  => present,
-content => template('sentry/upstart-worker.erb'),
+content => template('sentry/systemd-worker.erb'),
 mode=> '0444',
+}
+
+exec { 'systemd reload for sentry':
+refreshonly => true,
+command => '/bin/systemctl daemon-reload',
+subscribe   => File['/lib/systemd/system/sentry-server.service', 
'/lib/systemd/system/sentry-worker.service'],
 }
 
 service { 'sentry-server':
 ensure=> running,
 enable=> true,
-provider  => 'upstart',
+provider  => 'systemd',
 require   => [
 Virtualenv::Environment[$deploy_dir],
 Mysql::User[$db_user],
@@ -183,7 +189,7 @@
 service { 'sentry-worker':
 ensure=> running,
 enable=> true,
-provider  => 'upstart',
+provider  => 'systemd',
 require   => [
 Virtualenv::Environment[$deploy_dir],
 Mysql::User[$db_user],
diff --git a/puppet/modules/sentry/templates/systemd-server.erb 
b/puppet/modules/sentry/templates/systemd-server.erb
new file mode 100644
index 000..ac5285d
--- /dev/null
+++ b/puppet/modules/sentry/templates/systemd-server.erb
@@ -0,0 +1,21 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+#
+
+[Unit]
+Description=Sentry error log tracker (web interface)
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+Environment="SENTRY_CONF=<%= @cfg_file %>"
+User=www-data
+Group=www-data
+SyslogIdentifier=sentry-server
+WorkingDirectory=<%= @deploy_dir %>
+ExecStart=<%= @deploy_dir %>/bin/sentry start
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/puppet/modules/sentry/templates/systemd-worker.erb 
b/puppet/modules/sentry/templates/systemd-worker.erb
new file mode 100644
index 000..0469196
--- /dev/null
+++ b/puppet/modules/sentry/templates/systemd-worker.erb
@@ -0,0 +1,21 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+#
+
+[Unit]
+Description=Sentry error log tracker (worker)
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+Environment="SENTRY_CONF=<%= @cfg_file %>"
+User=www-data
+Group=www-data
+SyslogIdentifier=sentry-server
+WorkingDirectory=<%= @deploy_dir %>
+ExecStart=<%= @deploy_dir %>/bin/sentry celery worker -B
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/puppet/modules/sentry/templates/upstart-server.erb 
b/puppet/modules/sentry/templates/upstart-server.erb
deleted file mode 100644
index 494861c..000
--- a/puppet/modules/sentry/templates/upstart-server.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-#
-
-description "Sentry error log tracker (web interface)"
-
-start on mediawiki-ready
-respawn
-
-env SENTRY_CONF="<%= @cfg_file %>"
-export SENTRY_CONF
-
-setuid www-data
-setgid www-data
-
-exec <%= @deploy_dir %>/bin/sentry start
diff --git a/puppet/modules/sentry/templates/upstart-worker.erb 
b/puppet/modules/sentry/templates/upstart-worker.erb
deleted file mode 100644
index f5786cf..000
--- a/puppet/modules/sentry/templates/upstart-worker.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-### THIS FILE IS

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Release notes for un-deprecation of WikiRevision::getText

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

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

Change subject: Release notes for un-deprecation of WikiRevision::getText
..


Release notes for un-deprecation of WikiRevision::getText

This function was un-deprecated in
I3f0e0f7fe38bd4e2001efbe17cdba6bcc90b036f, mainly to stop Google
Code-In students from continually trying to remove the function before
we have decided what to do with it (see T152282).

Change-Id: I460c76f2dea89646545a969c3637433070059b1c
---
M RELEASE-NOTES-1.29
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index c26a8be..72c82de 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -156,6 +156,7 @@
 * Title::moveNoAuth() (deprecated in 1.25) was removed. Use MovePage class 
instead.
 * Hook UnknownAction (deprecated in 1.19) was actually deprecated (it will now 
emit warnings).
   Create a subclass of Action, and add it to $wgActions instead.
+* WikiRevision:getText() (deprecated since 1.21) is no longer marked 
deprecated.
 
 == Compatibility ==
 

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: ClippableElement: Add `min-height` for usability in edge cases

2017-01-03 Thread VolkerE (Code Review)

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

Change subject: ClippableElement: Add `min-height` for usability in edge cases
..

ClippableElement: Add `min-height` for usability in edge cases

Bug: T146531
Change-Id: Ib7effc496fdfff36cc2808a5d22de132509d8dc5
---
M src/styles/elements/ClippableElement.less
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/51/330351/1

diff --git a/src/styles/elements/ClippableElement.less 
b/src/styles/elements/ClippableElement.less
index 5b8cd84..ac61092 100644
--- a/src/styles/elements/ClippableElement.less
+++ b/src/styles/elements/ClippableElement.less
@@ -2,6 +2,7 @@
 
 .oo-ui-clippableElement-clippable {
.oo-ui-box-sizing( border-box );
+   min-height: 2.5em; // equals `32px` at base `font-size: 12.8px`
 
.theme-oo-ui-clippableElement();
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystone: Move api service to uwsgi/nginx

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

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

Change subject: Keystone:  Move api service to uwsgi/nginx
..

Keystone:  Move api service to uwsgi/nginx

Bug: T150774
Change-Id: Ib78140c637cd286e3686f86fc147a275eca6399d
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 53 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/330350/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93e7062..16ea298 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,6 +357,7 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
+  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4f05197..4b9c47f 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,6 +145,7 @@
 
 keystoneconfig:
   auth_port: '35357'
+  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1e59764..f18e091 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,6 +455,7 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
+public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 08d77e2..2982a66 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,15 +53,13 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
+# Disable the keystone process itself; this will be handled
+#  by nginx and uwsgi
+'/etc/init/keystone.conf':
+ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
-service { 'keystone':
-ensure=> running,
-subscribe => File['/etc/keystone/keystone.conf'],
-require   => Package['keystone'];
-}
-
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -75,10 +73,6 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
-nrpe::monitor_service { 'check_keystone_process':
-description  => 'keystone process',
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
-}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -87,10 +81,12 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-} else {
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
-}
+}
+
+# stop the keystone process itself; this will be handled
+#  by nginx and uwsgi
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index c8a568c..824948b 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,4 +30,43 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
+
+file { '/var/log/uwsgi/keystone':
+ensure => directory,
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0644',
+}
+
+# Keystone admin API
+service::uwsgi { 'keystone-admin':
+port=> $keystoneconfig['auth_port'],
+healthcheck_url => '/',
+deployment  => None,
+config  => {
+wsgi-file => '/usr/bin/keystone-wsgi-admin',
+name  => 'keystone',
+uid   => 'keystone',
+gid   => 'keystone',
+processes => '10',
+threads   => '2',
+logto =>

[MediaWiki-commits] [Gerrit] operations/dns[master]: park викиданные.рф (wikidata) & викиверситет.рф (wikiversity)

2017-01-03 Thread Dzahn (Code Review)

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

Change subject: park викиданные.рф (wikidata) & викиверситет.рф (wikiversity)
..

park викиданные.рф (wikidata) & викиверситет.рф (wikiversity)

These 2 IDNs pointed to our servers but only showed
"Domain not configured" since they were added.

So instead linking them to the parking template, so
they don't get traffic anymore.

Bug: T137105
Change-Id: I63415b5ce3cc90aac70769bfee9875717d2e8876
---
M templates/xn--80adgfman1aa4l.xn--p1ai
M templates/xn--b1aajamacm1dkmb.xn--p1ai
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/49/330349/1

diff --git a/templates/xn--80adgfman1aa4l.xn--p1ai 
b/templates/xn--80adgfman1aa4l.xn--p1ai
index ecc3123..ff68d1c 12
--- a/templates/xn--80adgfman1aa4l.xn--p1ai
+++ b/templates/xn--80adgfman1aa4l.xn--p1ai
@@ -1 +1 @@
-wikidata.org
\ No newline at end of file
+parking
\ No newline at end of file
diff --git a/templates/xn--b1aajamacm1dkmb.xn--p1ai 
b/templates/xn--b1aajamacm1dkmb.xn--p1ai
index 159251e..ff68d1c 12
--- a/templates/xn--b1aajamacm1dkmb.xn--p1ai
+++ b/templates/xn--b1aajamacm1dkmb.xn--p1ai
@@ -1 +1 @@
-wikiversity.org
\ No newline at end of file
+parking
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63415b5ce3cc90aac70769bfee9875717d2e8876
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
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]: prometheus: temporary rsync server for metrics migration

2017-01-03 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330348 )

Change subject: prometheus: temporary rsync server for metrics migration
..

prometheus: temporary rsync server for metrics migration

Serve Prometheus metrics over rsync while migrating to baremetal
hardware.

Bug: T148408
Change-Id: Ifb727adc42012a5f32a99053c1d71831531105eb
---
M modules/role/manifests/prometheus/global.pp
M modules/role/manifests/prometheus/ops.pp
2 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/330348/1

diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index 49c73ea..328642f 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -59,4 +59,15 @@
 port   => '80',
 srange => '$DOMAIN_NETWORKS',
 }
+
+# Move Prometheus metrics to new HW - T148408
+include rsync::server
+
+$prometheus_nodes = hiera('prometheus_nodes')
+rsync::server::module { 'prometheus-global':
+path=> '/srv/prometheus/global/metrics'
+uid => 'prometheus',
+gid => 'prometheus',
+hosts_allow => $prometheus_nodes,
+}
 }
diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index 1282e96..1452913 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -310,4 +310,21 @@
 targets_path => $targets_path,
 cache_name   => 'upload',
 }
+
+# Move Prometheus metrics to new HW - T148408
+include rsync::server
+
+$prometheus_nodes = hiera('prometheus_nodes')
+rsync::server::module { 'prometheus-ops':
+path=> '/srv/prometheus/ops/metrics'
+uid => 'prometheus',
+gid => 'prometheus',
+hosts_allow => $prometheus_nodes,
+}
+
+ferm::service { 'rsync-prometheus':
+proto  => 'tcp',
+port   => '873',
+srange => "@resolve((${prometheus_nodes}))",
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb727adc42012a5f32a99053c1d71831531105eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove Russian IDNs that are not registered by us anymore

2017-01-03 Thread Dzahn (Code Review)

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

Change subject: remove Russian IDNs that are not registered by us anymore
..


remove Russian IDNs that are not registered by us anymore

These 6 IDNs are not registered by WMF anymore.
The 3 remaining ones still point to our NS and are
remaining.

Bug: T137105
Change-Id: Iab383092c1e7fcb4ba317a566941d898b909d707
---
D templates/xn--80adaxaliyuf0k.xn--p1ai
D templates/xn--80adhoalbi6c.xn--p1ai
D templates/xn--80adjlalc6d.xn--p1ai
D templates/xn--80adsaabkez2cb8b.xn--p1ai
D templates/xn--90abjlackez1d3b.xn--p1ai
D templates/xn--b1aarabjwib4al.xn--p1ai
6 files changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/templates/xn--80adaxaliyuf0k.xn--p1ai 
b/templates/xn--80adaxaliyuf0k.xn--p1ai
deleted file mode 12
index 3e19b61..000
--- a/templates/xn--80adaxaliyuf0k.xn--p1ai
+++ /dev/null
@@ -1 +0,0 @@
-wiktionary.org
\ No newline at end of file
diff --git a/templates/xn--80adhoalbi6c.xn--p1ai 
b/templates/xn--80adhoalbi6c.xn--p1ai
deleted file mode 12
index 5023eed..000
--- a/templates/xn--80adhoalbi6c.xn--p1ai
+++ /dev/null
@@ -1 +0,0 @@
-wikimediacommons.org
\ No newline at end of file
diff --git a/templates/xn--80adjlalc6d.xn--p1ai 
b/templates/xn--80adjlalc6d.xn--p1ai
deleted file mode 12
index 220a2d8..000
--- a/templates/xn--80adjlalc6d.xn--p1ai
+++ /dev/null
@@ -1 +0,0 @@
-wikisource.org
\ No newline at end of file
diff --git a/templates/xn--80adsaabkez2cb8b.xn--p1ai 
b/templates/xn--80adsaabkez2cb8b.xn--p1ai
deleted file mode 12
index baa6db7..000
--- a/templates/xn--80adsaabkez2cb8b.xn--p1ai
+++ /dev/null
@@ -1 +0,0 @@
-wikiquote.org
\ No newline at end of file
diff --git a/templates/xn--90abjlackez1d3b.xn--p1ai 
b/templates/xn--90abjlackez1d3b.xn--p1ai
deleted file mode 12
index 162c262..000
--- a/templates/xn--90abjlackez1d3b.xn--p1ai
+++ /dev/null
@@ -1 +0,0 @@
-wikibooks.org
\ No newline at end of file
diff --git a/templates/xn--b1aarabjwib4al.xn--p1ai 
b/templates/xn--b1aarabjwib4al.xn--p1ai
deleted file mode 12
index ab096bd..000
--- a/templates/xn--b1aarabjwib4al.xn--p1ai
+++ /dev/null
@@ -1 +0,0 @@
-wikinews.org
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab383092c1e7fcb4ba317a566941d898b909d707
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UserMerge[master]: Replaced Linker::link() with LinkRenderer

2017-01-03 Thread Awu42 (Code Review)

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

Change subject: Replaced Linker::link() with LinkRenderer
..

Replaced Linker::link() with LinkRenderer

Replaced usages of Linker::link() in usermerge extension.

Bug: T149346
Change-Id: Ifb807f2a8cbdcf4e600a9f8f00f3dc71afe37cf0
---
M SpecialUserMerge.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge 
refs/changes/47/330347/1

diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index bdf7d5b..bf9b441 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -14,7 +14,7 @@
  * @author Matthew April 
  *
  */
-
+use MediaWiki\MediaWikiServices;
 class SpecialUserMerge extends FormSpecialPage {
public function __construct() {
parent::__construct( 'UserMerge', 'usermerge' );
@@ -152,13 +152,15 @@
if ( $failed ) {
// Output an error message for failed moves
$out->addHTML( Html::openElement( 'ul' ) );
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( $failed as $oldTitleText => $newTitle 
) {
$oldTitle = Title::newFromText( 
$oldTitleText );
$out->addHTML(
Html::rawElement( 'li', [],
$this->msg( 
'usermerge-page-unmoved' )->rawParams(
-   Linker::link( 
$oldTitle ),
-   Linker::link( 
$newTitle )
+   
+   
$linkRenderer->makeLink( $oldTitle ),
+   
$linkRenderer->makeLink( $newTitle )
)->escaped()
)
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb807f2a8cbdcf4e600a9f8f00f3dc71afe37cf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Awu42 <9922y...@gmail.com>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Release notes for un-deprecation of WikiRevision::getText

2017-01-03 Thread TTO (Code Review)

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

Change subject: Release notes for un-deprecation of WikiRevision::getText
..

Release notes for un-deprecation of WikiRevision::getText

This function was un-deprecated in
I3f0e0f7fe38bd4e2001efbe17cdba6bcc90b036f, mainly to stop Google
Code-In students from continually trying to remove the function before
we have decided what to do with it (see T152282).

Change-Id: I460c76f2dea89646545a969c3637433070059b1c
---
M RELEASE-NOTES-1.29
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/330346/2

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index c26a8be..72c82de 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -156,6 +156,7 @@
 * Title::moveNoAuth() (deprecated in 1.25) was removed. Use MovePage class 
instead.
 * Hook UnknownAction (deprecated in 1.19) was actually deprecated (it will now 
emit warnings).
   Create a subclass of Action, and add it to $wgActions instead.
+* WikiRevision:getText() (deprecated since 1.21) is no longer marked 
deprecated.
 
 == Compatibility ==
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I460c76f2dea89646545a969c3637433070059b1c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[wmf/1.29.0-wmf.6]: Handle invalid names in CentralAuthGroupMembershipProxy::new...

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

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

Change subject: Handle invalid names in 
CentralAuthGroupMembershipProxy::newFromName
..


Handle invalid names in CentralAuthGroupMembershipProxy::newFromName

Bug: T153578
Change-Id: I9d3b7a4e6e73e0d120f4ee8347ec4fe57bbc5e1a
(cherry picked from commit 100dde97ce5194e6b410f73ee36ec3724e9508be)
---
M includes/CentralAuthGroupMembershipProxy.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/CentralAuthGroupMembershipProxy.php 
b/includes/CentralAuthGroupMembershipProxy.php
index d19fe73..61d4f61 100644
--- a/includes/CentralAuthGroupMembershipProxy.php
+++ b/includes/CentralAuthGroupMembershipProxy.php
@@ -37,6 +37,9 @@
 */
public static function newFromName( $name ) {
$name = User::getCanonicalName( $name );
+   if ( $name === false ) {
+   return null;
+   }
$globalUser = CentralAuthUser::getInstanceByName( $name );
return $globalUser->exists() ? new 
CentralAuthGroupMembershipProxy( $globalUser ) : null;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d3b7a4e6e73e0d120f4ee8347ec4fe57bbc5e1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[wmf/1.29.0-wmf.6]: Handle invalid names in CentralAuthGroupMembershipProxy::new...

2017-01-03 Thread MaxSem (Code Review)

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

Change subject: Handle invalid names in 
CentralAuthGroupMembershipProxy::newFromName
..

Handle invalid names in CentralAuthGroupMembershipProxy::newFromName

Bug: T153578
Change-Id: I9d3b7a4e6e73e0d120f4ee8347ec4fe57bbc5e1a
(cherry picked from commit 100dde97ce5194e6b410f73ee36ec3724e9508be)
---
M includes/CentralAuthGroupMembershipProxy.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/45/330345/1

diff --git a/includes/CentralAuthGroupMembershipProxy.php 
b/includes/CentralAuthGroupMembershipProxy.php
index d19fe73..61d4f61 100644
--- a/includes/CentralAuthGroupMembershipProxy.php
+++ b/includes/CentralAuthGroupMembershipProxy.php
@@ -37,6 +37,9 @@
 */
public static function newFromName( $name ) {
$name = User::getCanonicalName( $name );
+   if ( $name === false ) {
+   return null;
+   }
$globalUser = CentralAuthUser::getInstanceByName( $name );
return $globalUser->exists() ? new 
CentralAuthGroupMembershipProxy( $globalUser ) : null;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d3b7a4e6e73e0d120f4ee8347ec4fe57bbc5e1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Improve and clarify GPU composite layer mixin

2017-01-03 Thread VolkerE (Code Review)

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

Change subject: Improve and clarify GPU composite layer mixin
..

Improve and clarify GPU composite layer mixin

Improving and clarifying mixin to switch hardware
compositing mode in Webkit/Blink on. Using `translateZ()`
instead of `translate3d()` because it's shorter and has the same
effect.

Bug: T154460
Change-Id: I16a39a68f8234eb28eb1fe8327861d71938b6ecd
---
M src/styles/common.less
M src/styles/layouts/PanelLayout.less
M src/styles/widgets/ToggleSwitchWidget.less
M src/themes/apex/elements.less
M src/themes/apex/widgets.less
5 files changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/44/330344/1

diff --git a/src/styles/common.less b/src/styles/common.less
index ddc26eb..e65a34a 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -34,8 +34,13 @@
.oo-ui-background-image-svg-internal( @svg, @fallback );
 }
 
-.oo-ui-force-webkit-gpu() {
-   -webkit-transform: translate3d( 0, 0, 0 );
+// Only Webkit/Blink: Force element on own GPU composite layer
+// Can be used in order to help establish smooth, jank-free scrolling
+// in connection with CSS animations. Use sparely & wisely!
+// See T154460
+.oo-ui-force-gpu-composite-layer() {
+   -webkit-transform: translateZ( 0 );
+   transform: translateZ( 0 );
 }
 
 .oo-ui-animation( @value1, @value2: X, ... ) {
diff --git a/src/styles/layouts/PanelLayout.less 
b/src/styles/layouts/PanelLayout.less
index 193b783..a843f91 100644
--- a/src/styles/layouts/PanelLayout.less
+++ b/src/styles/layouts/PanelLayout.less
@@ -5,8 +5,7 @@
 
&-scrollable {
overflow-y: auto;
-   /* Make scrolling smooth */
-   .oo-ui-force-webkit-gpu();
+   .oo-ui-force-gpu-composite-layer();
}
 
&-expanded {
diff --git a/src/styles/widgets/ToggleSwitchWidget.less 
b/src/styles/widgets/ToggleSwitchWidget.less
index 985ddb9..6c8a36d 100644
--- a/src/styles/widgets/ToggleSwitchWidget.less
+++ b/src/styles/widgets/ToggleSwitchWidget.less
@@ -6,7 +6,7 @@
vertical-align: middle;
overflow: hidden;
.oo-ui-box-sizing( border-box );
-   .oo-ui-force-webkit-gpu();
+   .oo-ui-force-gpu-composite-layer();
 
&.oo-ui-widget-enabled {
cursor: pointer;
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index 4f10a59..fb724de 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -191,7 +191,7 @@
&.oo-ui-buttonElement-pressed > 
.oo-ui-buttonElement-button {
opacity: 0.5;
// Opacity causes 1px measurement errors in 
Chrome, so force GPU rendering
-   .oo-ui-force-webkit-gpu();
+   .oo-ui-force-gpu-composite-layer();
box-shadow: none;
color: #333;
background: #eee;
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 66a2817..afa6f30 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -599,7 +599,7 @@
&.oo-ui-widget-disabled {
opacity: 0.5;
// Opacity causes 1px measurement errors in Chrome, so force 
GPU rendering
-   .oo-ui-force-webkit-gpu();
+   .oo-ui-force-gpu-composite-layer();
box-shadow: none;
color: #333;
background: #eee;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated Parser::replaceUnusualEscapes()

2017-01-03 Thread MaxSem (Code Review)

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

Change subject: Remove deprecated Parser::replaceUnusualEscapes()
..

Remove deprecated Parser::replaceUnusualEscapes()

Deprecated since 1.24, no callers.

Change-Id: Ib780f1a7b77d3ce624112f59c8e57820fecb6bf2
---
M includes/parser/Parser.php
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/330343/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1ca9dac..dfe0238 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1936,18 +1936,6 @@
/**
 * Replace unusual escape codes in a URL with their equivalent 
characters
 *
-* @deprecated since 1.24, use normalizeLinkUrl
-* @param string $url
-* @return string
-*/
-   public static function replaceUnusualEscapes( $url ) {
-   wfDeprecated( __METHOD__, '1.24' );
-   return self::normalizeLinkUrl( $url );
-   }
-
-   /**
-* Replace unusual escape codes in a URL with their equivalent 
characters
-*
 * This generally follows the syntax defined in RFC 3986, with special
 * consideration for HTTP query strings.
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib780f1a7b77d3ce624112f59c8e57820fecb6bf2
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] mediawiki/core[master]: Remove deprecated WikiRevision::getText()

2017-01-03 Thread MaxSem (Code Review)

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

Change subject: Remove deprecated WikiRevision::getText()
..

Remove deprecated WikiRevision::getText()

Deprecated since 1.21, no usages.

Change-Id: I8c51d6d81ea551f00fca76ab7203dfdf1ec95033
---
M includes/import/WikiRevision.php
1 file changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 1e866f3..0384c2f 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -314,17 +314,6 @@
}
 
/**
-* @return string
-*
-* @deprecated Since 1.21, use getContent() instead.
-*/
-   function getText() {
-   wfDeprecated( __METHOD__, '1.21' );
-
-   return $this->text;
-   }
-
-   /**
 * @return ContentHandler
 */
function getContentHandler() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c51d6d81ea551f00fca76ab7203dfdf1ec95033
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] operations/puppet[production]: Revert "Keystone: Move api service to uwsgi/nginx"

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

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

Change subject: Revert "Keystone:  Move api service to uwsgi/nginx"
..


Revert "Keystone:  Move api service to uwsgi/nginx"

This works but I can't get the old keystone process to quit and relinquish the 
port


This reverts commit 7122564873c55b8cb819c49786fc70f9c10de3df.

Change-Id: Idb4143fb9cb57771a43aa2e3f9c85d5a4ac08bee
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 15 insertions(+), 53 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 16ea298..93e7062 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,7 +357,6 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
-  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4b9c47f..4f05197 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,7 +145,6 @@
 
 keystoneconfig:
   auth_port: '35357'
-  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f18e091..1e59764 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,7 +455,6 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
-public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 2982a66..08d77e2 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,13 +53,15 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
-# Disable the keystone process itself; this will be handled
-#  by nginx and uwsgi
-'/etc/init/keystone.conf':
-ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
+service { 'keystone':
+ensure=> running,
+subscribe => File['/etc/keystone/keystone.conf'],
+require   => Package['keystone'];
+}
+
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -73,6 +75,10 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
+nrpe::monitor_service { 'check_keystone_process':
+description  => 'keystone process',
+nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
+}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -81,12 +87,10 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-}
-
-# stop the keystone process itself; this will be handled
-#  by nginx and uwsgi
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
+} else {
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
+}
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index 824948b..c8a568c 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,43 +30,4 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
-
-file { '/var/log/uwsgi/keystone':
-ensure => directory,
-owner  => 'www-data',
-group  => 'www-data',
-mode   => '0644',
-}
-
-# Keystone admin API
-service::uwsgi { 'keystone-admin':
-port=> $keystoneconfig['auth_port'],
-healthcheck_url => '/',
-deployment  => None,
-config  => {
-wsgi-file => '/usr/bin/keystone-wsgi-admin',
-name  => 'keystone',
-uid

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Keystone: Move api service to uwsgi/nginx"

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

Hello Alex Monk, BryanDavis, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Keystone:  Move api service to uwsgi/nginx"
..

Revert "Keystone:  Move api service to uwsgi/nginx"

This works but I can't get the old keystone process to quit and relinquish the 
port


This reverts commit 7122564873c55b8cb819c49786fc70f9c10de3df.

Change-Id: Idb4143fb9cb57771a43aa2e3f9c85d5a4ac08bee
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 15 insertions(+), 53 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 16ea298..93e7062 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,7 +357,6 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
-  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4b9c47f..4f05197 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,7 +145,6 @@
 
 keystoneconfig:
   auth_port: '35357'
-  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f18e091..1e59764 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,7 +455,6 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
-public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 2982a66..08d77e2 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,13 +53,15 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
-# Disable the keystone process itself; this will be handled
-#  by nginx and uwsgi
-'/etc/init/keystone.conf':
-ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
+service { 'keystone':
+ensure=> running,
+subscribe => File['/etc/keystone/keystone.conf'],
+require   => Package['keystone'];
+}
+
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -73,6 +75,10 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
+nrpe::monitor_service { 'check_keystone_process':
+description  => 'keystone process',
+nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
+}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -81,12 +87,10 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-}
-
-# stop the keystone process itself; this will be handled
-#  by nginx and uwsgi
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
+} else {
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
+}
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index 824948b..c8a568c 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,43 +30,4 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
-
-file { '/var/log/uwsgi/keystone':
-ensure => directory,
-owner  => 'www-data',
-group  => 'www-data',
-mode   => '0644',
-}
-
-# Keystone admin API
-service::uwsgi { 'keystone-admin':
-port=> $keystoneconfig['auth_port'],
-healthcheck_url => '/',
-deployment  => None,
-config  => {
-wsgi-file =>

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.29.0-wmf.7]: TemplateHelper: Adjust for c67539341 in MW core

2017-01-03 Thread MaxSem (Code Review)

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

Change subject: TemplateHelper: Adjust for c67539341 in MW core
..


TemplateHelper: Adjust for c67539341 in MW core

You're no longer allowed to pass associative parameter arrays to wfMessage(),
so use array_values() to turn the parameter array into a normal array.
Also add a comment explaning the Rube Goldberg-esque way in which the
array ends up being ordered correctly.

Bug: T154548
Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
(cherry picked from commit 1d1097bd9e4522879f6fdb4dd182b74af13aae45)
---
M includes/TemplateHelper.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index 9217741..23fd09c 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -436,8 +436,12 @@
$i18nKey = $revision['properties']['_key'];
unset( $revision['properties']['_key'] );
 
-   // a variety of the i18n history messages contain wikitext and 
require ->parse()
-   return self::html( wfMessage( $i18nKey, $revision['properties'] 
)->parse() );
+   // $revision['properties'] contains the params for the i18n 
message, which are named,
+   // so we need array_values() to strip the names. They are in 
the correct order because
+   // RevisionFormatter::getDescriptionParams() uses a foreach 
loop to build this array
+   // from the i18n-params definition in FlowActions.php.
+   // A variety of the i18n history messages contain wikitext and 
require ->parse().
+   return self::html( wfMessage( $i18nKey, array_values( 
$revision['properties'] ) )->parse() );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.29.0-wmf.7
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add api 'setPageLanguage' action for Special:PageLanguage

2017-01-03 Thread MtDu (Code Review)

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

Change subject: Add api 'setPageLanguage' action for Special:PageLanguage
..

Add api 'setPageLanguage' action for Special:PageLanguage

Currently, a user who wants to set a page's language must use the 
Special:PageLanguage interface. However, this is not easy for bots and scripts 
to use. The addition of this API makes this process easier for everyone.

Bug: T74958
Change-Id: I42e74ed3bcd0bfa9ec0c344ba67668210450c975
---
M autoload.php
M includes/api/ApiMain.php
A includes/api/ApiSetPageLanguage.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
M includes/specials/SpecialPageLanguage.php
M languages/i18n/en.json
M languages/i18n/qqq.json
8 files changed, 195 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/330340/1

diff --git a/autoload.php b/autoload.php
index cdbdf1f..a38fca2 100644
--- a/autoload.php
+++ b/autoload.php
@@ -139,6 +139,7 @@
'ApiRsd' => __DIR__ . '/includes/api/ApiRsd.php',
'ApiSerializable' => __DIR__ . '/includes/api/ApiSerializable.php',
'ApiSetNotificationTimestamp' => __DIR__ . 
'/includes/api/ApiSetNotificationTimestamp.php',
+   'ApiSetPageLanguage' => __DIR__ . 
'/includes/api/ApiSetPageLanguage.php',
'ApiStashEdit' => __DIR__ . '/includes/api/ApiStashEdit.php',
'ApiTag' => __DIR__ . '/includes/api/ApiTag.php',
'ApiTokens' => __DIR__ . '/includes/api/ApiTokens.php',
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 4220fb8..52f1d95 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -106,6 +106,7 @@
'managetags' => 'ApiManageTags',
'tag' => 'ApiTag',
'mergehistory' => 'ApiMergeHistory',
+   'setpagelanguage' => 'ApiSetPageLanguage',
];
 
/**
diff --git a/includes/api/ApiSetPageLanguage.php 
b/includes/api/ApiSetPageLanguage.php
new file mode 100755
index 000..0d2def1
--- /dev/null
+++ b/includes/api/ApiSetPageLanguage.php
@@ -0,0 +1,141 @@
+"
+ *
+ * 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
+ */
+
+/**
+ * API module that facilitates changing the language of a page. The API 
equivalent of SpecialPageLanguage.
+ * Requires API write mode to be enabled.
+ *
+ * @ingroup API
+ */
+class ApiSetPageLanguage extends ApiBase {
+   /**
+* Extracts the title and language from the request parameters and 
invokes
+* the static SpecialPageLanguage::changePageLanguage() function with 
these as arguments.
+* If the language change succeeds, the details of the article changed
+* and the reason for the language change are added to the result 
object.
+*/
+   public function execute() {
+   // Check if change language feature is enabled
+   global $wgPageLanguageuseDB;
+   if ( !$wgPageLanguageuseDB ) {
+   $this->dieWithError( 'apierror-pagelang-disabled' );
+   }
+
+   // Check if the user has permissions
+   $this->checkUserRightsAny( 'pagelang' );
+
+   $this->useTransactionalTimeLimit();
+
+   $params = $this->extractRequestParams();
+
+   $pageObj = $this->getTitleOrPageId( $params, 'fromdbmaster' );
+   if ( !$pageObj->exists() ) {
+   $this->dieWithError( 'apierror-missingtitle' );
+   }
+
+   $titleObj = $pageObj->getTitle();
+   $reason = $params['reason'];
+   $user = $this->getUser();
+
+   // Check that the user is allowed to edit the page
+   $this->checkTitleUserPermissions( $titleObj, 'edit' );
+
+   // If change tagging was requested, check that the user is 
allowed to tag,
+   // and the tags are valid
+   if ( count( $params['tags'] ) ) {
+   $tagStatus = ChangeTags::canAddTagsAccompanyingChange( 
$params['tags'], $user );
+   if ( !$tagStatus->isOK() ) {
+   $this->dieStatus(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.18.3

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

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

Change subject: Update OOjs UI to v0.18.3
..


Update OOjs UI to v0.18.3

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3

Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e
---
M composer.json
M resources/lib/oojs-ui/i18n/be.json
A resources/lib/oojs-ui/i18n/hif-latn.json
M resources/lib/oojs-ui/i18n/tr.json
M resources/lib/oojs-ui/i18n/tt-cyrl.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-moderation.json
R 
resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png
R 
resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg
R resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png
R resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.png
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.png
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.png
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.png
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.png
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.png
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.svg
M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json
M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json
M resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-invert.png
R

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.18.3

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

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

Change subject: Update OOjs UI to v0.18.3
..


Update OOjs UI to v0.18.3

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3

Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/LICENSE-MIT
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/i18n/be.json
A oojs/oojs-ui/i18n/hif-latn.json
M oojs/oojs-ui/i18n/tr.json
M oojs/oojs-ui/i18n/tt-cyrl.json
M oojs/oojs-ui/package.json
14 files changed, 210 insertions(+), 83 deletions(-)

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



diff --git a/composer.json b/composer.json
index 6b4d69a..82a2a0d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.18.2",
+   "oojs/oojs-ui": "0.18.3",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index b878558..70f75df 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "397be71e6ee5f14bae4e3ffcd8912b6a",
-"content-hash": "847ea388961ccf4a15f5d546d302bc97",
+"hash": "f25cafdd248952593b4b86d219fea2b4",
+"content-hash": "ba8d9669db068ed289f92e66405adae1",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.18.2",
+"version": "v0.18.3",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9"
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/82a7a321a17b8a910d6056d64d1f324450d93ee7;,
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2016-12-06 23:05:36"
+"time": "2017-01-03 22:46:48"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 205f360..1aa29c5 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2007,17 +2007,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.18.2",
-"version_normalized": "0.18.2.0",
+"version": "v0.18.3",
+"version_normalized": "0.18.3.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9"
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/82a7a321a17b8a910d6056d64d1f324450d93ee7;,
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7",
 "shasum": ""
 },
 "require": {
@@ -2029,7 +2029,7 @@
 "mediawiki/mediawiki-codesniffer": "0.6.0",
 "phpunit/phpunit": "4.8.21"
 },
-"time": "2016-12-06 23:05:36",
+"time": "2017-01-03 22:46:48",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index bd9dbe5..075da13 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,4 +1,45 @@
 # OOjs UI Release History
+## v0.18.3 / 2017-01-03
+### Deprecations
+* [DEPRECATING CHANGE] icons:

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.18.3

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

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

Change subject: Update OOjs UI to v0.18.3
..


Update OOjs UI to v0.18.3

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3

Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M lib/oojs-ui/i18n/be.json
A lib/oojs-ui/i18n/hif-latn.json
M lib/oojs-ui/i18n/tr.json
M lib/oojs-ui/i18n/tt-cyrl.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-mediawiki.css
M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg
A lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png
A lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg
A lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png
A

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.29.0-wmf.7]: TemplateHelper: Adjust for c67539341 in MW core

2017-01-03 Thread Catrope (Code Review)

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

Change subject: TemplateHelper: Adjust for c67539341 in MW core
..

TemplateHelper: Adjust for c67539341 in MW core

You're no longer allowed to pass associative parameter arrays to wfMessage(),
so use array_values() to turn the parameter array into a normal array.
Also add a comment explaning the Rube Goldberg-esque way in which the
array ends up being ordered correctly.

Bug: T154548
Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
(cherry picked from commit 1d1097bd9e4522879f6fdb4dd182b74af13aae45)
---
M includes/TemplateHelper.php
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index 9217741..23fd09c 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -436,8 +436,12 @@
$i18nKey = $revision['properties']['_key'];
unset( $revision['properties']['_key'] );
 
-   // a variety of the i18n history messages contain wikitext and 
require ->parse()
-   return self::html( wfMessage( $i18nKey, $revision['properties'] 
)->parse() );
+   // $revision['properties'] contains the params for the i18n 
message, which are named,
+   // so we need array_values() to strip the names. They are in 
the correct order because
+   // RevisionFormatter::getDescriptionParams() uses a foreach 
loop to build this array
+   // from the i18n-params definition in FlowActions.php.
+   // A variety of the i18n history messages contain wikitext and 
require ->parse().
+   return self::html( wfMessage( $i18nKey, array_values( 
$revision['properties'] ) )->parse() );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.29.0-wmf.7
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: TemplateHelper: Adjust for c67539341 in MW core

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

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

Change subject: TemplateHelper: Adjust for c67539341 in MW core
..


TemplateHelper: Adjust for c67539341 in MW core

You're no longer allowed to pass associative parameter arrays to wfMessage(),
so use array_values() to turn the parameter array into a normal array.
Also add a comment explaning the Rube Goldberg-esque way in which the
array ends up being ordered correctly.

Bug: T154548
Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
---
M includes/TemplateHelper.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index 9217741..23fd09c 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -436,8 +436,12 @@
$i18nKey = $revision['properties']['_key'];
unset( $revision['properties']['_key'] );
 
-   // a variety of the i18n history messages contain wikitext and 
require ->parse()
-   return self::html( wfMessage( $i18nKey, $revision['properties'] 
)->parse() );
+   // $revision['properties'] contains the params for the i18n 
message, which are named,
+   // so we need array_values() to strip the names. They are in 
the correct order because
+   // RevisionFormatter::getDescriptionParams() uses a foreach 
loop to build this array
+   // from the i18n-params definition in FlowActions.php.
+   // A variety of the i18n history messages contain wikitext and 
require ->parse().
+   return self::html( wfMessage( $i18nKey, array_values( 
$revision['properties'] ) )->parse() );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystone: Move api service to uwsgi/nginx

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

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

Change subject: Keystone:  Move api service to uwsgi/nginx
..


Keystone:  Move api service to uwsgi/nginx

WIP

Bug: T150774
Change-Id: I89e9076cd2c830f43b6fabe8ed545d84c425f178
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/keystone/service.pp
M modules/role/manifests/labs/openstack/keystone.pp
5 files changed, 53 insertions(+), 15 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93e7062..16ea298 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -357,6 +357,7 @@
   ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
   auth_protocol: 'http'
   auth_port: '35357'
+  public_port: '5000'
   db_host: 'm5-master.eqiad.wmnet'
   ldap_host: 'ldap-labs.eqiad.wikimedia.org'
   token_driver: 'normal'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 4f05197..4b9c47f 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -145,6 +145,7 @@
 
 keystoneconfig:
   auth_port: '35357'
+  public_port: '5000'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
   admin_project_id: 'admin'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1e59764..f18e091 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -455,6 +455,7 @@
 ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
 auth_protocol: 'http'
 auth_port: '35357'
+public_port: '5000'
 db_host: 'labtestcontrol2001.wikimedia.org'
 ldap_host: 'labtestservices2001.wikimedia.org'
 token_driver: 'normal'
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 08d77e2..2982a66 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -53,15 +53,13 @@
 mode=> '0644',
 notify  => Service['keystone'],
 recurse => true;
+# Disable the keystone process itself; this will be handled
+#  by nginx and uwsgi
+'/etc/init/keystone.conf':
+ensure  => 'absent';
 }
 
 if $::fqdn == hiera('labs_nova_controller') {
-service { 'keystone':
-ensure=> running,
-subscribe => File['/etc/keystone/keystone.conf'],
-require   => Package['keystone'];
-}
-
 # Clean up expired keystone tokens, because keystone seems to leak them
 $keystone_db_name = $keystoneconfig['db_name']
 $keystone_db_user = $keystoneconfig['db_user']
@@ -75,10 +73,6 @@
 command => "/usr/bin/mysql ${keystone_db_name} 
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE 
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 1;'",
 }
 
-nrpe::monitor_service { 'check_keystone_process':
-description  => 'keystone process',
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
-}
 monitoring::service { 'keystone-http-35357':
 description   => 'keystone http',
 check_command => 'check_http_on_port!35357',
@@ -87,10 +81,12 @@
 description   => 'keystone http',
 check_command => 'check_http_on_port!5000',
 }
-} else {
-service { 'keystone':
-ensure  => stopped,
-require => Package['keystone'];
-}
+}
+
+# stop the keystone process itself; this will be handled
+#  by nginx and uwsgi
+service { 'keystone':
+ensure  => stopped,
+require => Package['keystone'];
 }
 }
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone.pp
index c8a568c..824948b 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -30,4 +30,43 @@
 description   => 'Keystone admin and observer projects exist',
 check_command => 'check_keystone_projects',
 }
+
+file { '/var/log/uwsgi/keystone':
+ensure => directory,
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0644',
+}
+
+# Keystone admin API
+service::uwsgi { 'keystone-admin':
+port=> $keystoneconfig['auth_port'],
+healthcheck_url => '/',
+deployment  => None,
+config  => {
+wsgi-file => '/usr/bin/keystone-wsgi-admin',
+name  => 'keystone',
+uid   => 'keystone',
+gid   => 'keystone',
+processes => '10',
+threads   => '2',
+logto =>

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: TemplateHelper: Adjust for c67539341 in MW core

2017-01-03 Thread Catrope (Code Review)

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

Change subject: TemplateHelper: Adjust for c67539341 in MW core
..

TemplateHelper: Adjust for c67539341 in MW core

You're no longer allowed to pass associative parameter arrays to wfMessage(),
so use array_values() to turn the parameter array into a normal array.
Also add a comment explaning the Rube Goldberg-esque way in which the
array ends up being ordered correctly.

Bug: T154548
Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
---
M includes/TemplateHelper.php
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index 9217741..23fd09c 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -436,8 +436,12 @@
$i18nKey = $revision['properties']['_key'];
unset( $revision['properties']['_key'] );
 
-   // a variety of the i18n history messages contain wikitext and 
require ->parse()
-   return self::html( wfMessage( $i18nKey, $revision['properties'] 
)->parse() );
+   // $revision['properties'] contains the params for the i18n 
message, which are named,
+   // so we need array_values() to strip the names. They are in 
the correct order because
+   // RevisionFormatter::getDescriptionParams() uses a foreach 
loop to build this array
+   // from the i18n-params definition in FlowActions.php.
+   // A variety of the i18n history messages contain wikitext and 
require ->parse().
+   return self::html( wfMessage( $i18nKey, array_values( 
$revision['properties'] ) )->parse() );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4cbbb76bc5f2ff947b01218ff88e5b08e13b6e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add mirantis backports repo for Openstack classes on Jessie

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

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

Change subject: Add mirantis backports repo for Openstack classes on Jessie
..


Add mirantis backports repo for Openstack classes on Jessie

This won't be used in production for a good long while,
but should help with testing.

Change-Id: I16fabeaf49d6897a1772b540fccc83297b1ea850
---
A modules/openstack/files/mirantis-liberty.key
A modules/openstack/files/mirantis-mitaka.key
M modules/openstack/manifests/repo.pp
3 files changed, 75 insertions(+), 0 deletions(-)

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



diff --git a/modules/openstack/files/mirantis-liberty.key 
b/modules/openstack/files/mirantis-liberty.key
new file mode 100644
index 000..050c4c6
--- /dev/null
+++ b/modules/openstack/files/mirantis-liberty.key
@@ -0,0 +1,31 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFWUFyUBEADl+6HGQCIWwPG7t5y7PmkNNlGo16w1v9uAtqMtNzWleckdAK7T
+4AVMfKo3HfNfRk556uXubIsmY0amI5zgQuT6ToQU+lMYLUb3M/ToSQdpVFX7BolC
+r2AoUniuC6ldhLZ2nXk81Q8VXjkAAu4iWV4tuy3ndZlq9rtXBtKZ+fTGwiXNTeXv
+d3B7386Z2mR1igcCwzrozTpdGgyPW+s41v0TPWsb8fingWGJ2ddmsB41YacYioGW
+KccMRRJQ9Y+x8fYJ1BfUYKAQs9Irio02bpDTuWiCNVPk7VIMoTH1bguERrojhELw
+kenp9zVGtjgyGXCPfchGOD/LzbEp1S8QppIK7Oo3YS/tNuOoKsOy7LrM1A277vj8
+c+9kNdyBtnrTJy6D8MsVp54No1qUr0FvCvP/irOE61gRhg0vf9QKWwOOeOy91iNx
+98OfYTB0vmdcRgGKrCvHUNOIs+hck5mJbPKKE8eOX+H+OCC1bgtZ2/wk1HvJ07/g
+DGkigANTcHnVvdwNiKdCZ8ShsdsBdVTfSRxvy4jNON0STq6A9NtjZRCFKIndclPL
+3Z4PCtbGWnWc7Crv1oEhFAhlj46Js8BvMsnSJUqQBWS8ZrnAQqx6Vp7Fq7bfxJDp
+1lGQ2Vic618KwID/RBVM2lekDR59dB6HqzF8ZpeBrABz1lqQX0iKyCRxKQARAQAB
+tDxBdXRvZ2VuZXJhdGVkIGtleSA8amVua2luc0BsaWJlcnR5LWplc3NpZS5wa2dz
+Lm1pcmFudGlzLmNvbT6JAjcEEwEIACEFAlWUFyUCGy8FCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQthUac7xDqUe14w//SrMcvbKpKXKsPZFzBURe7QZfTeWvadrx
+m/5r3z/Si0cvFnSjtup8pWvH7qDnCYjRV6mFfePlf/J43xfHDqwOaJbLLc3eQS3Z
+b8UUr1YFDA8wWfd2/dfKdLof/nsYpsswLWStHt4keIA9oeaeWchEPc/rr90x5tkz
+SY8Q5Bo/DzzF8L4k7HYkNP774dqXttZyLA5e4EmgE/TjVtOJxKpjc0a+sRRm9AYH
+Ro4u17gBFuPyHZOYyXnxvzlGfYdxkoRkMB4ZJnHeWdn68dUM2rRrG9lIMB3Xo/aM
+2z06928NhUoTjp8WWzvjsWHgb08NGmzzE3DRcS4E2pK0N50vX0E/GctwNg5MQ6aK
+OtyWXo5UyYBlxTg1q1BS5zziSDEBD4cn71Dy3nKK74Dkvp6SwFzfkjMEQM9dUVLM
+6bSwuduBLqBRn0uoPexVmnxqF7iBLU1UsoXCvgr1gi/RsqRKXi0SLqqne8Sn9+OR
+TaLOzWXX8zVShX0CNNAL0lLZOnDsgv2RQtU5X1cYXXSAjfpotixl8PICBHpWydj4
+xy4wj6uRWybR73FCCUJESkztjHoxYrl5faZsDS3dB55g1mlfoNChmRjCGoPBqg46
+bBhJS67N7s3NxlYfDnvXyCUbKSXi0fOokl1sDBIfdwNDS2BH2PEwdpLIUyisF2VD
+fQvdKE10BE0=
+=X8u/
+-END PGP PUBLIC KEY BLOCK-
+
diff --git a/modules/openstack/files/mirantis-mitaka.key 
b/modules/openstack/files/mirantis-mitaka.key
new file mode 100644
index 000..7460036
--- /dev/null
+++ b/modules/openstack/files/mirantis-mitaka.key
@@ -0,0 +1,31 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFZS4wcBEADYlpvHBFt4ViqjKeFPqCId/1pp1uzG7bERCoZn1KA1uTgzrTl8
+EsKjrpE01gIanWfHCiyPZG5OmQcNHvXElQB5qjS9SawwyR62c4pDNOLXaVZc3yIw
+OfuayZSOx7Ai1HE3DMPznc5pWyBHvP0POIkN7sJPkE1I1Hxhmh4Swl9OCfAxtWzN
+mN2Df55wOW4pC1jMMtSmOYJopUGl2akxvTr4i/FU2fknrd+Fsode9Nyrkd422lwA
+OYJemzTCoOj61ujPqE5+2785MiZAxkf8m1U7/28AgZYOiYZIyK9U8gMEybj1Xeuu
+ga1wzhfA7ZR8tVqNkErNP99Q7SE+jv/fyGBlOKb5fYKmb8EgIxAAA9JgCc61f45A
+MC0IjVH736MCWuLmjHUITek/OIDpjDMTUX86Z5FzCWCPp8qbdYnWkepFguwoXcBw
+YuSkaRMeA0XaGzTKrhLZns96b/vx92BnplYQezuoUBgXD3t+fxdEnITh6cdx1+Yz
+RVmRtH3DycIanSwXBHuc5mmbFnYXAkxck67OHNcbmH24y2MbcrA2SyIZmz4C63v/
+UgXczU1ziTnHjceyD7rEFn5ku2n7zlO6AiCfet7+SoSumCIkZzmv5ojqwAW4mUl8
+TTqUQOJTh6lSvww/BLBey9IhPNBD69wOu6JYNgYU4+BUl8024rhGyE4CnQARAQAB
+tDtBdXRvZ2VuZXJhdGVkIGtleSA8amVua2luc0BtaXRha2EtamVzc2llLnBrZ3Mu
+bWlyYW50aXMuY29tPokCNwQTAQgAIQUCVlLjBwIbLwULCQgHAwUVCgkICwUWAgMB
+AAIeAQIXgAAKCRBJDKWXjGM8Qz9KEACGFmHnNkyg8Zw4dzv+++NHiL6Ysfkgx7cF
+flOh5lD5XZbOHm20O8vUxP88p9BGzGzRm04G389X2Avk642wdidJ3y2CZ3xPHzD3
+/5BLBezGf2yHr6kISuObJ77ao1xwATkd5adq54T8ADB9dcusuO3UKwi2MNQwIW9W
+PcXqmaiIZQ6zayqnxmDw8U44GvzS8peqB3ZaMWOygoFS6dTFE5fPiS7geBagIBIH
+A+xXzTgdtQwTCVoliYlLLnbedXHRmY7nvPqmIbNFJUFwPYeYKmBjHlkxl93Hc6Vf
+OG4defkYgwbD2CkkIAhpqSwvTXyXuUBNgp1cxZUhsXIk3lrbWQiBr2NAdUPzHWEM
+M7emsl2tc0bTl3xGo4vz+9FXyWRV8yA4qAIngjAb+KPbr2fpVHMO8MkWpBXs6ftJ
+Y8cVkGtz0z8+4KULhN33z6h38IXRr4fvYNl9zur62N0QznpGwaOgHuNVe+/xe139
+xoXmvi5/O55++Ym/pkP8fhu+DwW9QvWFZA+ZHI5u6e/ZaBsMblC2dUuKYXM1LWWf
+grroEL6PgshcX2DEaY0KkVPAaSAXTrLkXmvYaMEb0VyceVvpgtf1pUEN1nhHv7Qx
+DfthQkZlA7gdTZPwFaUKsvQa16mI+FRGcJGoC7yHnExk1jMopfR3pRPTTroImNms
+M3Nf4NjkVw==
+=UsOp
+-END PGP PUBLIC KEY BLOCK-
+
diff --git a/modules/openstack/manifests/repo.pp 
b/modules/openstack/manifests/repo.pp
index e9d0d1b..ad22338 100644
--- a/modules/openstack/manifests/repo.pp
+++ b/modules/openstack/manifests/repo.pp
@@ -12,5 +12,18 @@
 components => 'main',
 keyfile=> 'puppet:///modules/openstack/ubuntu-cloud.key';
 }
+} elsif os_version('debian jessie') {
+apt::repository {

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.18.3

2017-01-03 Thread Jforrester (Code Review)

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

Change subject: Update OOjs UI to v0.18.3
..

Update OOjs UI to v0.18.3

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3

Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M lib/oojs-ui/i18n/be.json
A lib/oojs-ui/i18n/hif-latn.json
M lib/oojs-ui/i18n/tr.json
M lib/oojs-ui/i18n/tt-cyrl.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-mediawiki.css
M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png
R lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg
A lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png
A lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg
A lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png
A

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.18.3

2017-01-03 Thread Jforrester (Code Review)

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

Change subject: Update OOjs UI to v0.18.3
..

Update OOjs UI to v0.18.3

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3

Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e
---
M composer.json
M resources/lib/oojs-ui/i18n/be.json
A resources/lib/oojs-ui/i18n/hif-latn.json
M resources/lib/oojs-ui/i18n/tr.json
M resources/lib/oojs-ui/i18n/tt-cyrl.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-moderation.json
R 
resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png
R 
resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg
R resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png
R resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.png
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.png
R resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.png
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.png
R resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.png
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.svg
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.png
R resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.svg
M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json
M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json
M resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.svg
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.png
R 
resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.png
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.svg
R resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-invert.png
R

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add new units for the following:

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

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

Change subject: Add new units for the following:
..


Add new units for the following:

mass/weight
area
speed
volume
duration

Bug: T150881
Change-Id: Ife6342b81b3656d73d797a1bda4b74998bd12474
---
M wmf-config/unitConversionConfig.json
1 file changed, 205 insertions(+), 1 deletion(-)

Approvals:
  Daniel Kinzler: Looks good to me, but someone else must approve
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/unitConversionConfig.json 
b/wmf-config/unitConversionConfig.json
index 57d84b2..25f84a9 100644
--- a/wmf-config/unitConversionConfig.json
+++ b/wmf-config/unitConversionConfig.json
@@ -76,5 +76,209 @@
 "unit": "Q11573",
 "label": "dactylos",
 "siLabel": "metre"
+},
+"Q613726": {
+"factor": "10",
+"unit": "Q11570",
+"label": "yottagram",
+"siLabel": "kilogram"
+},
+"Q100995": {
+"factor": "0.45359237",
+"unit": "Q11570",
+"label": "pound",
+"siLabel": "kilogram"
+},
+"Q483261": {
+"factor": "0.00166053904",
+"unit": "Q11570",
+"label": "atomic mass unit",
+"siLabel": "kilogram"
+},
+"Q191118": {
+"factor": "1000",
+"unit": "Q11570",
+"label": "tonne",
+"siLabel": "kilogram"
+},
+"Q180892": {
+"factor": "1988550",
+"unit": "Q11570",
+"label": "solar mass",
+"siLabel": "kilogram"
+},
+"Q11570": {
+"factor": "1",
+"unit": "Q11570",
+"label": "kilogram",
+"siLabel": "kilogram"
+},
+"Q41803": {
+"factor": "0.001",
+"unit": "Q11570",
+"label": "gram",
+"siLabel": "kilogram"
+},
+"Q857027": {
+"factor": "0.09290304",
+"unit": "Q25343",
+"label": "square foot",
+"siLabel": "square metre"
+},
+"Q81292": {
+"factor": "4046.8564224",
+"unit": "Q25343",
+"label": "acre",
+"siLabel": "square metre"
+},
+"Q25343": {
+"factor": "1",
+"unit": "Q25343",
+"label": "square metre",
+"siLabel": "square metre"
+},
+"Q21074767": {
+"factor": "1138100",
+"unit": "Q25343",
+"label": "square versta",
+"siLabel": "square metre"
+},
+"Q232291": {
+"factor": "2589988.110336",
+"unit": "Q25343",
+"label": "square mile",
+"siLabel": "square metre"
+},
+"Q35852": {
+"factor": "1",
+"unit": "Q25343",
+"label": "hectare",
+"siLabel": "square metre"
+},
+"Q712226": {
+"factor": "100",
+"unit": "Q25343",
+"label": "square kilometre",
+"siLabel": "square metre"
+},
+"Q935614": {
+"factor": "1600",
+"unit": "Q25343",
+"label": "rai",
+"siLabel": "square metre"
+},
+"Q211256": {
+"factor": "0.44704",
+"unit": "Q182429",
+"label": "miles per hour",
+"siLabel": "metre per second"
+},
+"Q180154": {
+"factor": "0.278",
+"unit": "Q182429",
+"label": "kilometre per hour",
+"siLabel": "metre per second"
+},
+"Q4220561": {
+"factor": "1000",
+"unit": "Q182429",
+"label": "kilometer per second",
+"siLabel": "metre per second"
+},
+"Q182429": {
+"factor": "1",
+"unit": "Q182429",
+"label": "metre per second",
+"siLabel": "metre per second"
+},
+"Q128822": {
+"factor": "0.51",
+"unit": "Q182429",
+"label": "knot",
+"siLabel": "metre per second"
+},
+"Q1022113": {
+"factor": "0.01",
+"unit": "Q25517",
+"label": "cubic centimetre",
+"siLabel": "cubic metre"
+},
+"Q1815100": {
+"factor": "0.1",
+"unit": "Q25517",
+"label": "centiliter",
+"siLabel": "cubic metre"
+},
+"Q11582": {
+"factor": "0.001",
+"unit": "Q25517",
+"label": "liter",
+"siLabel": "cubic metre"
+},
+"Q4243638": {
+"factor": "10",
+"unit": "Q25517",
+"label": "cubic kilometre",
+"siLabel": "cubic metre"
+},
+"Q25517": {
+"factor": "1",
+"unit": "Q25517",
+"label": "cubic metre",
+"siLabel": "cubic metre"
+},
+"Q7727": {
+"factor": "60",
+"unit": "Q11574",
+"label": "minute",
+"siLabel": "second"
+},
+"Q11574": {
+"factor": "1",
+"unit": "Q11574",
+"label": "second",
+"siLabel": "second"
+

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.18.3

2017-01-03 Thread Jforrester (Code Review)

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

Change subject: Update OOjs UI to v0.18.3
..

Update OOjs UI to v0.18.3

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3

Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/LICENSE-MIT
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/i18n/be.json
A oojs/oojs-ui/i18n/hif-latn.json
M oojs/oojs-ui/i18n/tr.json
M oojs/oojs-ui/i18n/tt-cyrl.json
M oojs/oojs-ui/package.json
14 files changed, 210 insertions(+), 83 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/34/330334/1

diff --git a/composer.json b/composer.json
index 6b4d69a..82a2a0d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.18.2",
+   "oojs/oojs-ui": "0.18.3",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index b878558..70f75df 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "397be71e6ee5f14bae4e3ffcd8912b6a",
-"content-hash": "847ea388961ccf4a15f5d546d302bc97",
+"hash": "f25cafdd248952593b4b86d219fea2b4",
+"content-hash": "ba8d9669db068ed289f92e66405adae1",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.18.2",
+"version": "v0.18.3",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9"
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/82a7a321a17b8a910d6056d64d1f324450d93ee7;,
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2016-12-06 23:05:36"
+"time": "2017-01-03 22:46:48"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 205f360..1aa29c5 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2007,17 +2007,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.18.2",
-"version_normalized": "0.18.2.0",
+"version": "v0.18.3",
+"version_normalized": "0.18.3.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9"
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9;,
-"reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/82a7a321a17b8a910d6056d64d1f324450d93ee7;,
+"reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7",
 "shasum": ""
 },
 "require": {
@@ -2029,7 +2029,7 @@
 "mediawiki/mediawiki-codesniffer": "0.6.0",
 "phpunit/phpunit": "4.8.21"
 },
-"time": "2016-12-06 23:05:36",
+"time": "2017-01-03 22:46:48",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index bd9dbe5..075da13 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,4 +1,45 @@
 # OOjs UI Release History
+## v0.18.3 / 2017-01-03
+### Deprecations
+* [DEPRECATING CHANGE]

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_graphite: Fix some KeyError exceptions in SeriesThresh...

2017-01-03 Thread Dzahn (Code Review)

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

Change subject: check_graphite: Fix some KeyError exceptions in 
SeriesThreshold.format_message
..


check_graphite: Fix some KeyError exceptions in SeriesThreshold.format_message

'UNKNOWN' key will only be set if self.allow_undefined

Bug: T154533
Change-Id: If6bba197d39877befb5833e91c5ac23bbc8b3002
---
M modules/nagios_common/files/check_commands/check_graphite
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/nagios_common/files/check_commands/check_graphite 
b/modules/nagios_common/files/check_commands/check_graphite
index 87184af..d35c3ce 100755
--- a/modules/nagios_common/files/check_commands/check_graphite
+++ b/modules/nagios_common/files/check_commands/check_graphite
@@ -387,11 +387,11 @@
 return message
 
 def format_message(self, messages):
-if not (messages['CRITICAL'] or messages['WARNING'] or 
messages['UNKNOWN']):
+if not (messages['CRITICAL'] or messages['WARNING'] or ('UNKNOWN' in 
messages and messages['UNKNOWN'])):
 return 'All targets OK'
 sign = '<' if self.under else '>'
 message = ''
-if messages['UNKNOWN']:
+if 'UNKNOWN' in messages and messages['UNKNOWN']:
 message += ' '.join(['%s (%s)' % (k, v) for k, v in 
messages['UNKNOWN']])
 if messages['CRITICAL']:
 message += ' '.join(['%s (%s%3.2f%%)' % (k, sign, v) for k, v in 
messages['CRITICAL']])

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_graphite: Fix some IndexError exceptions in Threshold....

2017-01-03 Thread Dzahn (Code Review)

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

Change subject: check_graphite: Fix some IndexError exceptions in 
Threshold.parse_result
..


check_graphite: Fix some IndexError exceptions in Threshold.parse_result

The server can return an empty list, so the 'No valid datapoints found' warning 
should now appear from check_data

Bug: T154533
Change-Id: I4161b059eff4ea579387884add734129bea78777
---
M modules/nagios_common/files/check_commands/check_graphite
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/nagios_common/files/check_commands/check_graphite 
b/modules/nagios_common/files/check_commands/check_graphite
index d35c3ce..b5b2a5b 100755
--- a/modules/nagios_common/files/check_commands/check_graphite
+++ b/modules/nagios_common/files/check_commands/check_graphite
@@ -251,6 +251,8 @@
 '''
 datapoints = defaultdict(list)
 datapoints['_total'] = 0
+if len(result) == 0:
+return datapoints
 for (data, time) in result[0]['datapoints']:
 if not isinstance(data, Real):
 datapoints['UNKNOWN'].append((time, data))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4161b059eff4ea579387884add734129bea78777
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
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...Refreshed[master]: v3.1.5 - Remove unused scripts

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

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

Change subject: v3.1.5 - Remove unused scripts
..


v3.1.5 - Remove unused scripts

Change-Id: I19349d4072aa207b1067f4cea63609cb3f21db0e
---
M Refreshed.skin.php
D refreshed/jquery.mobile.custom.min.js
D refreshed/jquery.mobile.custom.src.js
D refreshed/respond.min.js
M skin.json
5 files changed, 1 insertion(+), 15,474 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19349d4072aa207b1067f4cea63609cb3f21db0e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: MtMNC 
Gerrit-Reviewer: UltrasonicNXT 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Revert "Add class `mwe-math-element` to math elements"

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

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

Change subject: Revert "Add class `mwe-math-element` to math elements"
..


Revert "Add class `mwe-math-element` to math elements"

This reverts commit e674d7e73bf6816f4dcbee5bee35f09cb53b88e9.
That commit does not help to solve T134281.
It adds a CSS class name which is configurable
by a global variable to various math elements, which is confusing.

Change-Id: Iea5f231e0cea1221dc717b3409b36c0baf11bb24
---
M MathMathML.php
M MathSource.php
M MathTexvc.php
M extension.json
M modules/ext.math.css
5 files changed, 2 insertions(+), 12 deletions(-)

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



diff --git a/MathMathML.php b/MathMathML.php
index 681b90b..40bc77c 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -418,7 +418,6 @@
 * @return string the class name
 */
private function getClassName( $fallback = false ) {
-   global $wgMathElementClassName;
$class = 'mwe-math-';
if ( $fallback ) {
$class .= 'fallback-image-';
@@ -435,7 +434,7 @@
$class .= ' mwe-math-mathml-a11y';
// @codingStandardsIgnoreEnd
}
-   return $class . " $wgMathElementClassName";
+   return $class;
}
 
/**
diff --git a/MathSource.php b/MathSource.php
index 792e755..93d403d 100644
--- a/MathSource.php
+++ b/MathSource.php
@@ -35,13 +35,11 @@
function getHtmlOutput() {
# No need to render or parse anything more!
# New lines are replaced with spaces, which avoids confusing 
our parser (bugs 23190, 22818)
-   global $wgMathElementClassName;
if ( $this->getMathStyle() == 'display' ) {
$class = 'mwe-math-fallback-source-display';
} else {
$class = 'mwe-math-fallback-source-inline';
}
-   $class .= " $wgMathElementClassName";
return Xml::element( 'span',
$this->getAttributes(
'span',
diff --git a/MathTexvc.php b/MathTexvc.php
index aa64ea0..6c61d86 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -137,7 +137,6 @@
 * @return string img HTML
 */
public function getMathImageHTML() {
-   global $wgMathElementClassName;
$url = $this->getMathImageUrl();
$attributes = [
// the former class name was 'tex'
@@ -149,7 +148,6 @@
// if DisplayStyle is true, the equation will be 
centered in a new line
$attributes[ 'class' ] = 
'mwe-math-fallback-image-display tex';
}
-   $attributes[ 'class' ] .= " $wgMathElementClassName";
return Xml::element( 'img',
$this->getAttributes(
'img',
diff --git a/extension.json b/extension.json
index c9ce093..a059655 100644
--- a/extension.json
+++ b/extension.json
@@ -115,8 +115,7 @@
],
"MathEnableWikibaseDataType": true,
"Texvc": false,
-   "TexvcBackgroundColor": "transparent",
-   "MathElementClassName": "mw-math-element"
+   "TexvcBackgroundColor": "transparent"
},
"VisualEditorPluginModules": [
"ext.math.visualEditor"
diff --git a/modules/ext.math.css b/modules/ext.math.css
index 9892ce2..69ea129 100644
--- a/modules/ext.math.css
+++ b/modules/ext.math.css
@@ -57,7 +57,3 @@
 img.tex {
vertical-align: middle;
 }
-.mwe-math-element {
-   overflow-x: auto;
-   max-width: 100%;
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea5f231e0cea1221dc717b3409b36c0baf11bb24
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TameeshB 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch nowiki to uca-nb-u-kn collation

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

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

Change subject: Switch nowiki to uca-nb-u-kn collation
..


Switch nowiki to uca-nb-u-kn collation

'nb' is supported in libicu, but 'no' is not. (Either are allowed by
IcuCollation, but 'no' probably has no effect.)

'no' is a collective code for both forms of Norwegian. Norwegian
Wikipedia actually uses Norwegian Bokmål, which is 'nb'.

Change-Id: Ia71c847c27bf57f6bae7abf0608651522b1aa89a
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ea73764..d390a97 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14273,7 +14273,7 @@
'lvwiki' => 'uca-lv', // T67003
'mkwiki' => 'uca-mk-u-kn', // T26953
'nlwiki' => 'uca-nl', // T125774
-   'nowiki' => 'uca-no-u-kn', // T146675, T148488
+   'nowiki' => 'uca-nb-u-kn', // T146675, T148488
'plwiki' => 'uca-pl-u-kn', // T44413, T146675
'plwikisource' => 'uca-pl', // T86821
'plwikivoyage' => 'uca-pl', // T47968

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia71c847c27bf57f6bae7abf0608651522b1aa89a
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/extra[master]: Add token_count_router

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

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

Change subject: Add token_count_router
..


Add token_count_router

A simple query wrapper that counts the number of tokens and decides
which sub-query to run by evaluating a set of conditions.

Bug: T152094
Change-Id: I582bf27e77f87f1e1d0f86d81371a46afb4ffcab
---
M README.md
A docs/token_count_router.md
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
A 
src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
A 
src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryParser.java
A 
src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryTest.java
6 files changed, 462 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index cf444ea..792f53a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 score functions, and anything else we think we end up creating to make search
 nice for Wikimedia. At this point it only contains:
 
-Filters:
+Queries:
 * [source_regex](docs/source_regex.md) - An nGram accelerated regular
 expression filter that is generally much much faster than sequentially checking
 all documents.
@@ -13,6 +13,8 @@
 independantly. For example, it can be used by multiple processes to reindex
 all documents without any interprocess communication. Added in 1.5.0, 1.4.1,
 and 1.3.0.
+* [token_count_router](docs/token_count_router.md) - Simple query wrapper that
+evaluates some conditions based on the number of tokens of the input query.
 
 Native Scripts:
 * [super_detect_noop](docs/super_detect_noop.md) - Like ```detect_noop``` but
diff --git a/docs/token_count_router.md b/docs/token_count_router.md
new file mode 100644
index 000..bc3a058
--- /dev/null
+++ b/docs/token_count_router.md
@@ -0,0 +1,54 @@
+token_count_router
+==
+
+The ```token_count_router``` is a simple query wrapper that counts the number
+of tokens in the provided text. It then evaluates a set of conditions to decide
+which subquery to run.
+It's useful in case the client would like to activate some proximity rescoring
+features based on the number of tokens and the analyzers available.
+
+Example
+---
+
+```
+GET /_search
+{
+"token_count_router": {
+"field": "text",
+"text": "input query",
+"conditions" : [
+{
+"gte": 2,
+"query": {
+"match_phrase": {
+"text": "input query",
+}
+}
+}
+],
+"fallback": {
+"match_none": {}
+}
+}
+}
+```
+
+A phrase query will be executed if the number of tokens emitted by the
+search analyzer of the `text` field is greater or equal to `2`.
+A `match_none` query is executed otherwise.
+This allows to move some decision logic based on token count to the
+backend allowing to use query templates and analyzer behaviors.
+
+Options
+---
+
+* `field` Use the search analyzer difined for this field.
+* `analyzer` Use this analyzer (`field` or `analyzer` must be defined)
+* `discount_overlaps` Set to true to ignore tokens emitted at the same 
position (defaults to `true`).
+* `conditions` Array of conditions (the first that matches wins):
+* `predicate` : can be `eq`, `gt`, `gte`, `lt` or `lte`, the value is the 
number of tokens to evaluate.
+`"lt": 10` is true when the number of tokens is lower than 
10.
+* `query` The query to apply if the condition is met.
+* `fallback` The query to apply if none of the conditions applies.
+
+Note that the query parser does not check the conditions coherence.
\ No newline at end of file
diff --git a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java 
b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
index 8fa20a6..8f73054 100644
--- a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
+++ b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
@@ -22,6 +22,7 @@
 import org.wikimedia.search.extra.superdetectnoop.VersionedDocumentHandler;
 import org.wikimedia.search.extra.superdetectnoop.WithinAbsoluteHandler;
 import org.wikimedia.search.extra.superdetectnoop.WithinPercentageHandler;
+import org.wikimedia.search.extra.tokencount.TokenCountRouterQueryParser;
 
 /**
  * Setup the Elasticsearch plugin.
@@ -44,6 +45,7 @@
 module.registerQueryParser(SourceRegexQueryParser.class);
 module.registerQueryParser(IdHashModQueryParser.class);
 module.registerQueryParser(FuzzyLikeThisQueryParser.class);
+module.registerQueryParser(TokenCountRouterQueryParser.class);
 }
 
 /**
diff --git 
a/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.18.3

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

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

Change subject: Tag v0.18.3
..


Tag v0.18.3

Change-Id: I19faa13874f45964c49b82e95056d5cef7219512
---
M History.md
M package.json
2 files changed, 42 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index bd9dbe5..075da13 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,45 @@
 # OOjs UI Release History
+## v0.18.3 / 2017-01-03
+### Deprecations
+* [DEPRECATING CHANGE] icons: Deprecate the 'beta' and 'ribbonPrize' icons 
(James D. Forrester)
+* [DEPRECATING CHANGE] icons: Rename '*Undo' to 'un*' (James D. Forrester)
+* [DEPRECATING CHANGE] icons: Rename 'betaLaunch' to 'logoWikimediaDiscovery', 
move pack (James D. Forrester)
+
+### Features
+* ComboBoxInputWidget: Make it impossible to set `multiline` to true (Prateek 
Saxena)
+* Introduce `OO.ui.isMobile()` (Ed Sanders)
+* Provide `OO.ui.prompt()` method to complement `confirm()`/`alert()` (Ed 
Sanders)
+
+### Styles
+* FloatableElement: Replace superfluous class with general one (Volker E)
+* MediaWiki theme: Change custom error border color to `destructive` (Volker E)
+* MediaWiki theme: Change error/invalid color to alias of `destructive` 
(Volker E)
+* MediaWiki theme: Fix PHP 
CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing (Bartosz 
Dziewoński)
+* MediaWiki theme: Indicate normal, flagged ButtonWidgets' `:hover` clearer 
(Volker E)
+* MediaWiki theme: Set `line-height` explicitly on legends and labels (Volker 
E)
+
+### Code
+* BarToolGroup: Remove obsolete CSS selectors (Volker E)
+* ClippableElement: Compatibility with jQuery 3 (Bartosz Dziewoński)
+* Element: Do not try to scroll invisible/unattached elements into view 
(Bartosz Dziewoński)
+* LabelWidget: Properly hide labels if they are set to null (Ed Sanders)
+* NumberInputWidget: Avoid bitwise tricks when checking for integers (Bartosz 
Dziewoński)
+* PopupButtonWidget: Remove unnecessary CSS property (Volker E)
+* ProgressBarWidget: Use CSS transforms for indeterminate widget (Bartosz 
Dziewoński)
+* TextInputWidget: Do nothing in `#adjustSize`/`#positionLabel` if not 
attached (Bartosz Dziewoński)
+* TextInputWidget: Only call `#onElementAttach` on focus if it wasn't called 
(Bartosz Dziewoński)
+* TextInputWidget: Use `Element#isElementAttached` (Bartosz Dziewoński)
+* styles: Replace `transform` with dedicated mixin (Volker E)
+* MediaWiki theme: Make `box-shadow` LESS vars follow naming scheme (Volker E)
+* MediaWiki theme: Simplify frameless ButtonWidget selectors (Volker E)
+* performance: Apply webkit GPU hack to scrollable panels (Ed Sanders)
+* demos: Add disabled Progress bar (Volker E)
+* demos: Add examples for `OO.ui.alert()`/`confirm()`/`prompt()` (Bartosz 
Dziewoński)
+* demos: Avoid using 'required' as a test indicator (Ed Sanders)
+* build: Bump file copyright notices for 2017 (James D. Forrester)
+* docs: Fix small typo (Amir Sarabadani)
+
+
 ## v0.18.2 / 2016-12-06
 ### Styles
 * MediaWiki theme: Address sub-pixel rendering issues of RadioInputWidgets 
(Volker E)
diff --git a/package.json b/package.json
index 0a67425..088317b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: remove host aliases for tools-exec-121[2-6]

2017-01-03 Thread BryanDavis (Code Review)

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

Change subject: toollabs: remove host aliases for tools-exec-121[2-6]
..

toollabs: remove host aliases for tools-exec-121[2-6]

Bug: T154539
Change-Id: Id21bcca58b321f8a41bae27244bec4d22d079838
---
M modules/toollabs/files/host_aliases
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/330333/1

diff --git a/modules/toollabs/files/host_aliases 
b/modules/toollabs/files/host_aliases
index 941139a..630685f 100644
--- a/modules/toollabs/files/host_aliases
+++ b/modules/toollabs/files/host_aliases
@@ -1,10 +1,5 @@
 tools-bastion-01.eqiad.wmflabs tools-bastion-01.tools.eqiad.wmflabs
 tools-checker-02.eqiad.wmflabs tools-checker-02.tools.eqiad.wmflabs
-tools-exec-1212.eqiad.wmflabs tools-exec-1212.tools.eqiad.wmflabs
-tools-exec-1213.eqiad.wmflabs tools-exec-1213.tools.eqiad.wmflabs
-tools-exec-1214.eqiad.wmflabs tools-exec-1214.tools.eqiad.wmflabs
-tools-exec-1215.eqiad.wmflabs tools-exec-1215.tools.eqiad.wmflabs
-tools-exec-1216.eqiad.wmflabs tools-exec-1216.tools.eqiad.wmflabs
 tools-exec-1217.eqiad.wmflabs tools-exec-1217.tools.eqiad.wmflabs
 tools-exec-1218.eqiad.wmflabs tools-exec-1218.tools.eqiad.wmflabs
 tools-exec-1219.eqiad.wmflabs tools-exec-1219.tools.eqiad.wmflabs

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

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

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

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

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

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

+ 03c978647c5fc7f2fe45d19ed63013010c199665 Quick fix for drush dpm
+ 2466cf393e8ff95420869106e5b1afdd268d4e28 Create & use location update 
function in the scenarios where we are updating.
+ 46e8202346be8113b7e4ee03c5f0e11d6f1957f3 Update PHPmailer for CVE-2016-10045 
and CVE-2016-10033
+ 2ecaa2ace1bcd4b504fd79584ff784f1eb3b4084 Alter test to accomodate minor 
format change in master.
+ 9dd75bc1b3c8c926bc1d539e8c46d93f6a6ebb72 Do not write address to the database 
if all data is empty.
+ 286db02dab0dcc354e650296efb8f62f34ee6968 Consolidate test data into one 
directory.
+ fe041629f5dc815c9de17c6b5088e99fc28acff8 Consolidate test cleanup routine 
into parent class
+ e4893eaed91af8aa31e3ddf30d163fb2a88bcb55 Add preliminary CoinBase Test.
+ 021ec65077abf0cc0fb749508a4d017847968829 Remove duplicate field in import 
fields array.
+ 40b8bd0a9cbef85b37d6620651fe9f4ad64b32ad Fix test that was not running to run.
+ ac586fe3cb7051272ae32bb8cee3d1754d657a10 Revert "Update PHPmailer for 
CVE-2016-10045 and CVE-2016-10033"
+ 4e5852563d51613a8c33a46d6215c7832f26e0b4 Add support for importing campaign 
source, medium for CoinBase.
+ 768b0e9f9d859e37eb51e8eab4170ccbc4858ee8 Pull composer changes from deployment

Change-Id: Id3f03cc25c78be8a0c3efbb13ea8dba8d5ce5015
---
D sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
D sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/data/coinbase.csv
D sites/all/modules/offline2civicrm/tests/data/engage.csv
D sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
D sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
11 files changed, 0 insertions(+), 1,163 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php 
b/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
deleted file mode 100644
index e7f9f78..000
--- a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 
3));
-$this->gateway = 'coinbase';
-}
-
-function testImport() {
-civicrm_initialize();
-$this->trxn_id = 'Pluto';
-$this->doCleanUp();
-
-$importer = new CoinbaseFile( __DIR__ . "/data/coinbase.csv" );
-$importer->import();
-
-$contribution = 
wmf_civicrm_get_contributions_from_gateway_id($this->gateway, $this->trxn_id);
-$this->assertEquals(1, count($contribution));
-$this->assertEquals('COINBASE PLUTO', $contribution[0]['trxn_id']);
-$this->assertEquals('online', db_query("SELECT {utm_medium} from 
{contribution_tracking} WHERE contribution_id = 
{$contribution[0]['id']}")->fetchField());
-}
-
-}
diff --git 
a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php 
b/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
deleted file mode 100644
index da00108..000
--- a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-callAPISuccess('Contact', 'create', array(
-'contact_type' => 'Individual',
-'email' => 'f...@example.com',
-));
-$this->contact_id = $result['id'];
-
-$this->gateway_txn_id = "NaN-" . mt_rand();
-$this->transaction = WmfTransaction::from_unique_id( "GLOBALCOLLECT 
{$this->gateway_txn_id}" );
-
-$contributionResult = $this->callAPISuccess('Contribution', 'create', 
array(
-'contact_id' => $this->contact_id,
-'trxn_id' => $this->transaction->get_unique_id(),
-'contribution_type' => 'Cash',
-'total_amount' => '20.01',
-'receive_date' => wmf_common_date_unix_to_sql( time() ),
-));
-$this->contribution_id = $contributionResult['id'];
-
-wmf_civicrm_set_custom_field_values($this->contribution_id, array(
-'original_amount' => '20.01',
-'original_currency' => 'USD',
-));
-}
-
-public function tearDown() {
-parent::tearDown();
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_graphite: Fix some IndexError exceptions in Threshold....

2017-01-03 Thread Alex Monk (Code Review)

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

Change subject: check_graphite: Fix some IndexError exceptions in 
Threshold.parse_result
..

check_graphite: Fix some IndexError exceptions in Threshold.parse_result

The server can return an empty list, so the 'No valid datapoints found' warning 
should now appear from check_data

Bug: T154533
Change-Id: I4161b059eff4ea579387884add734129bea78777
---
M modules/nagios_common/files/check_commands/check_graphite
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_graphite 
b/modules/nagios_common/files/check_commands/check_graphite
index d35c3ce..b5b2a5b 100755
--- a/modules/nagios_common/files/check_commands/check_graphite
+++ b/modules/nagios_common/files/check_commands/check_graphite
@@ -251,6 +251,8 @@
 '''
 datapoints = defaultdict(list)
 datapoints['_total'] = 0
+if len(result) == 0:
+return datapoints
 for (data, time) in result[0]['datapoints']:
 if not isinstance(data, Real):
 datapoints['UNKNOWN'].append((time, data))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4161b059eff4ea579387884add734129bea78777
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: use key/value for gdnsd rcodes

2017-01-03 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327282 )

Change subject: prometheus: use key/value for gdnsd rcodes
..


prometheus: use key/value for gdnsd rcodes

Bug: T147426
Change-Id: Ibe55d5a40359b43c253cccfac4cb89bbd51ee6fd
---
M modules/prometheus/files/usr/local/bin/prometheus-gdnsd-stats
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/modules/prometheus/files/usr/local/bin/prometheus-gdnsd-stats 
b/modules/prometheus/files/usr/local/bin/prometheus-gdnsd-stats
index ad08d43..e94f220 100755
--- a/modules/prometheus/files/usr/local/bin/prometheus-gdnsd-stats
+++ b/modules/prometheus/files/usr/local/bin/prometheus-gdnsd-stats
@@ -26,17 +26,14 @@
 
 
 # TODO(filippo) collect 'services' metrics
-# TODO(filippo) use rcode as key=value instead?
 def collect_gdnsd_stats(stats, registry):
 dns_stats = {}
 udp_stats = {}
 tcp_stats = {}
 
-for rcode in ('noerror', 'refused', 'nxdomain', 'notimp',
-  'badvers', 'formerr', 'dropped'):
-dns_stats[rcode] = Gauge(
-'rcode_{}'.format(rcode), 'RCODE {} sent'.format(rcode),
-namespace='gdnsd', registry=registry)
+dns_stats['requests'] = Gauge(
+'request', 'Requests processed', ['status'],
+namespace='gdnsd', registry=registry)
 dns_stats['edns'] = Gauge(
 'request_edns', 'EDNS requests', namespace='gdnsd', registry=registry)
 dns_stats['edns_client_subnet'] = Gauge(
@@ -50,7 +47,10 @@
 
 try:
 for name, value in stats['stats'].items():
-if name in dns_stats:
+if name in ('noerror', 'refused', 'nxdomain', 'notimp',
+'badvers', 'formerr', 'dropped'):
+dns_stats['requests'].labels(status=name).set(value)
+elif name in dns_stats:
 dns_stats[name].set(value)
 for name, value in stats['udp'].items():
 udp_stats[name] = Gauge(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe55d5a40359b43c253cccfac4cb89bbd51ee6fd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Filippo Giunchedi 
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]: Group0 to 1.29.0-wmf.7

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

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

Change subject: Group0 to 1.29.0-wmf.7
..


Group0 to 1.29.0-wmf.7

Change-Id: I9a6465deb17c428b02ca8e85ebd011fb81bd9fcd
---
M php
M wikiversions.json
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/php b/php
index be08918..a76b8e9 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.6
\ No newline at end of file
+php-1.29.0-wmf.7
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index f8badaa..5240747 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -481,7 +481,7 @@
 "maiwiki": "php-1.29.0-wmf.6",
 "map_bmswiki": "php-1.29.0-wmf.6",
 "mdfwiki": "php-1.29.0-wmf.6",
-"mediawikiwiki": "php-1.29.0-wmf.6",
+"mediawikiwiki": "php-1.29.0-wmf.7",
 "metawiki": "php-1.29.0-wmf.6",
 "mgwiki": "php-1.29.0-wmf.6",
 "mgwikibooks": "php-1.29.0-wmf.6",
@@ -751,9 +751,9 @@
 "tawiktionary": "php-1.29.0-wmf.6",
 "tcywiki": "php-1.29.0-wmf.6",
 "tenwiki": "php-1.29.0-wmf.6",
-"test2wiki": "php-1.29.0-wmf.6",
-"testwiki": "php-1.29.0-wmf.6",
-"testwikidatawiki": "php-1.29.0-wmf.6",
+"test2wiki": "php-1.29.0-wmf.7",
+"testwiki": "php-1.29.0-wmf.7",
+"testwikidatawiki": "php-1.29.0-wmf.7",
 "tetwiki": "php-1.29.0-wmf.6",
 "tewiki": "php-1.29.0-wmf.6",
 "tewikibooks": "php-1.29.0-wmf.6",
@@ -883,7 +883,7 @@
 "zawikiquote": "php-1.29.0-wmf.6",
 "zawiktionary": "php-1.29.0-wmf.6",
 "zeawiki": "php-1.29.0-wmf.6",
-"zerowiki": "php-1.29.0-wmf.6",
+"zerowiki": "php-1.29.0-wmf.7",
 "zh_classicalwiki": "php-1.29.0-wmf.6",
 "zh_min_nanwiki": "php-1.29.0-wmf.6",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.6",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalContribs[master]: Remove duplicate i18n messages, use semantic HTML element

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

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

Change subject: Remove duplicate i18n messages, use semantic HTML element
..


Remove duplicate i18n messages, use semantic HTML element

Change-Id: Ib227cfdccce9ae113a18b206e54b31d325618742
---
M SpecialGlobalContributions.php
M extension.json
M i18n/en.json
M i18n/ka.json
M i18n/qqq.json
5 files changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/SpecialGlobalContributions.php b/SpecialGlobalContributions.php
index 0efe993..58139b3 100644
--- a/SpecialGlobalContributions.php
+++ b/SpecialGlobalContributions.php
@@ -29,6 +29,10 @@
  */
 class SpecialGlobalContributions extends SpecialContributions {
 
+   public function getDescription() {
+   return $this->msg( 'globalcontribs' )->escaped();
+   }
+
public function __construct() {
SpecialPage::__construct( 'GlobalContributions' );
}
@@ -207,7 +211,7 @@
if ( $message ) {
if ( !$this->msg( $message, $target 
)->isDisabled() ) {
$out->wrapWikiMsg(
-   "\n$1\n",
+   "\n$1\n",
array( $message, $target )
);
}
diff --git a/extension.json b/extension.json
index fa75a8a..0436f71 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "GlobalContribs",
-   "version": "1.1.0",
+   "version": "1.1.1",
"author": [
"Adam Carter",
"George Barnick",
diff --git a/i18n/en.json b/i18n/en.json
index fc55499..b24b315 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,8 +3,6 @@
"authors": []
},
"globalcontribs": "Global contributions",
-   "globalcontributions": "Global contributions",
"globaleditcount": "Global edit count",
-   "globalcontribs-desc": "Shows contributions from all projects in a 
wikifarm",
-   "globalcontributions-desc": "Shows contributions from all projects in a 
wikifarm"
+   "globalcontribs-desc": "Shows contributions from all projects in a 
wikifarm"
 }
diff --git a/i18n/ka.json b/i18n/ka.json
index ec677b2..d1605e4 100644
--- a/i18n/ka.json
+++ b/i18n/ka.json
@@ -3,8 +3,6 @@
"authors": []
},
"globalcontribs": "გლობალ წვლილი",
-   "globalcontributions": "გლობალ წვლილი",
"globaleditcount": "გლობალ სრული რედაქტირებათა მთვლელი",
-   "globalcontribs-desc": "გადაცემები შემოწირულობების ყველა პროექტი ვიკი 
ფერმაში",
-   "globalcontributions-desc": "გადაცემები შემოწირულობების ყველა პროექტი 
ვიკი ფერმაში"
+   "globalcontribs-desc": "გადაცემები შემოწირულობების ყველა პროექტი ვიკი 
ფერმაში"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e36aa16..87eb04b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,6 +2,7 @@
"@metadata": {
"authors": []
},
-   "globalcontribs": "The name of the extension's entry in 
Special:SpecialPage",
+   "globalcontribs": "The name of the extension's entry in 
Special:SpecialPages",
+   "globaleditcount": "The name of the global editcount special page in 
Special:SpecialPages",
"globalcontribs-desc": "{{desc}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib227cfdccce9ae113a18b206e54b31d325618742
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GlobalContribs
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: UltrasonicNXT 
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]: Group0 to 1.29.0-wmf.7

2017-01-03 Thread Thcipriani (Code Review)

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

Change subject: Group0 to 1.29.0-wmf.7
..

Group0 to 1.29.0-wmf.7

Change-Id: I9a6465deb17c428b02ca8e85ebd011fb81bd9fcd
---
M php
M wikiversions.json
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/php b/php
index be08918..a76b8e9 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.6
\ No newline at end of file
+php-1.29.0-wmf.7
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index f8badaa..5240747 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -481,7 +481,7 @@
 "maiwiki": "php-1.29.0-wmf.6",
 "map_bmswiki": "php-1.29.0-wmf.6",
 "mdfwiki": "php-1.29.0-wmf.6",
-"mediawikiwiki": "php-1.29.0-wmf.6",
+"mediawikiwiki": "php-1.29.0-wmf.7",
 "metawiki": "php-1.29.0-wmf.6",
 "mgwiki": "php-1.29.0-wmf.6",
 "mgwikibooks": "php-1.29.0-wmf.6",
@@ -751,9 +751,9 @@
 "tawiktionary": "php-1.29.0-wmf.6",
 "tcywiki": "php-1.29.0-wmf.6",
 "tenwiki": "php-1.29.0-wmf.6",
-"test2wiki": "php-1.29.0-wmf.6",
-"testwiki": "php-1.29.0-wmf.6",
-"testwikidatawiki": "php-1.29.0-wmf.6",
+"test2wiki": "php-1.29.0-wmf.7",
+"testwiki": "php-1.29.0-wmf.7",
+"testwikidatawiki": "php-1.29.0-wmf.7",
 "tetwiki": "php-1.29.0-wmf.6",
 "tewiki": "php-1.29.0-wmf.6",
 "tewikibooks": "php-1.29.0-wmf.6",
@@ -883,7 +883,7 @@
 "zawikiquote": "php-1.29.0-wmf.6",
 "zawiktionary": "php-1.29.0-wmf.6",
 "zeawiki": "php-1.29.0-wmf.6",
-"zerowiki": "php-1.29.0-wmf.6",
+"zerowiki": "php-1.29.0-wmf.7",
 "zh_classicalwiki": "php-1.29.0-wmf.6",
 "zh_min_nanwiki": "php-1.29.0-wmf.6",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.6",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: ApiPageTriageList: Better document parameter weirdness

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

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

Change subject: ApiPageTriageList: Better document parameter weirdness
..


ApiPageTriageList: Better document parameter weirdness

The provided example doesn't work because apparently you need
at least one of showreviewed=1 and showunreviewed=1 to get
any results at all.

It is not best-practice api.php module design to have
action=foo without any further parameters return nothing,
but it's 5 years too late to fix it now.

Bug: T154115
Change-Id: I29b0c600dc49384967491aa7d9a208c987a09725
---
M api/ApiPageTriageList.php
M i18n/en.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/api/ApiPageTriageList.php b/api/ApiPageTriageList.php
index 90a4607..87b4b52 100644
--- a/api/ApiPageTriageList.php
+++ b/api/ApiPageTriageList.php
@@ -313,7 +313,7 @@
 */
protected function getExamplesMessages() {
return [
-   'action=pagetriagelist=1000=0'
+   
'action=pagetriagelist=100=0=1'
=> 'apihelp-pagetriagelist-example-1',
];
}
diff --git a/i18n/en.json b/i18n/en.json
index ea7014a..c8c5592 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -393,7 +393,7 @@
"apihelp-pagetriagelist-param-non_autoconfirmed_users": "Whether to 
show only pages created by non auto confirmed users.",
"apihelp-pagetriagelist-param-blocked_users": "Whether to show only 
pages created by blocked users.",
"apihelp-pagetriagelist-param-username": "Show only pages created by 
username.",
-   "apihelp-pagetriagelist-example-1": "List 1000 pages in namespace 0",
+   "apihelp-pagetriagelist-example-1": "List 100 unreviewed pages in 
namespace 0",
"apihelp-pagetriagestats-description": "Get the stats for page triage.",
"apihelp-pagetriagestats-param-namespace": "What namespace to pull 
stats from.",
"apihelp-pagetriagestats-param-showredirs": "Whether to include 
redirects.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29b0c600dc49384967491aa7d9a208c987a09725
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-01-03 Thread Eileen (Code Review)

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

+ 03c978647c5fc7f2fe45d19ed63013010c199665 Quick fix for drush dpm
+ 2466cf393e8ff95420869106e5b1afdd268d4e28 Create & use location update 
function in the scenarios where we are updating.
+ 46e8202346be8113b7e4ee03c5f0e11d6f1957f3 Update PHPmailer for CVE-2016-10045 
and CVE-2016-10033
+ 2ecaa2ace1bcd4b504fd79584ff784f1eb3b4084 Alter test to accomodate minor 
format change in master.
+ 9dd75bc1b3c8c926bc1d539e8c46d93f6a6ebb72 Do not write address to the database 
if all data is empty.
+ 286db02dab0dcc354e650296efb8f62f34ee6968 Consolidate test data into one 
directory.
+ fe041629f5dc815c9de17c6b5088e99fc28acff8 Consolidate test cleanup routine 
into parent class
+ e4893eaed91af8aa31e3ddf30d163fb2a88bcb55 Add preliminary CoinBase Test.
+ 021ec65077abf0cc0fb749508a4d017847968829 Remove duplicate field in import 
fields array.
+ 40b8bd0a9cbef85b37d6620651fe9f4ad64b32ad Fix test that was not running to run.
+ ac586fe3cb7051272ae32bb8cee3d1754d657a10 Revert "Update PHPmailer for 
CVE-2016-10045 and CVE-2016-10033"
+ 4e5852563d51613a8c33a46d6215c7832f26e0b4 Add support for importing campaign 
source, medium for CoinBase.
+ 768b0e9f9d859e37eb51e8eab4170ccbc4858ee8 Pull composer changes from deployment

Change-Id: Id3f03cc25c78be8a0c3efbb13ea8dba8d5ce5015
---
D sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
D sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/data/coinbase.csv
D sites/all/modules/offline2civicrm/tests/data/engage.csv
D sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
D sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
11 files changed, 0 insertions(+), 1,163 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/30/330330/1

diff --git a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php 
b/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
deleted file mode 100644
index e7f9f78..000
--- a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 
3));
-$this->gateway = 'coinbase';
-}
-
-function testImport() {
-civicrm_initialize();
-$this->trxn_id = 'Pluto';
-$this->doCleanUp();
-
-$importer = new CoinbaseFile( __DIR__ . "/data/coinbase.csv" );
-$importer->import();
-
-$contribution = 
wmf_civicrm_get_contributions_from_gateway_id($this->gateway, $this->trxn_id);
-$this->assertEquals(1, count($contribution));
-$this->assertEquals('COINBASE PLUTO', $contribution[0]['trxn_id']);
-$this->assertEquals('online', db_query("SELECT {utm_medium} from 
{contribution_tracking} WHERE contribution_id = 
{$contribution[0]['id']}")->fetchField());
-}
-
-}
diff --git 
a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php 
b/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
deleted file mode 100644
index da00108..000
--- a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-callAPISuccess('Contact', 'create', array(
-'contact_type' => 'Individual',
-'email' => 'f...@example.com',
-));
-$this->contact_id = $result['id'];
-
-$this->gateway_txn_id = "NaN-" . mt_rand();
-$this->transaction = WmfTransaction::from_unique_id( "GLOBALCOLLECT 
{$this->gateway_txn_id}" );
-
-$contributionResult = $this->callAPISuccess('Contribution', 'create', 
array(
-'contact_id' => $this->contact_id,
-'trxn_id' => $this->transaction->get_unique_id(),
-'contribution_type' => 'Cash',
-'total_amount' => '20.01',
-'receive_date' => wmf_common_date_unix_to_sql( time() ),
-));
-$this->contribution_id = $contributionResult['id'];
-
-wmf_civicrm_set_custom_field_values($this->contribution_id, array(
-'original_amount' => '20.01',
-'original_currency' => 'USD',
-));
-}
-
-public function tearDown() {
-parent::tearDown();
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_graphite: Fix some KeyError exceptions in SeriesThresh...

2017-01-03 Thread Alex Monk (Code Review)

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

Change subject: check_graphite: Fix some KeyError exceptions in 
SeriesThreshold.format_message
..

check_graphite: Fix some KeyError exceptions in SeriesThreshold.format_message

'UNKNOWN' key will only be set if self.allow_undefined

Bug: T154533
Change-Id: If6bba197d39877befb5833e91c5ac23bbc8b3002
---
M modules/nagios_common/files/check_commands/check_graphite
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_graphite 
b/modules/nagios_common/files/check_commands/check_graphite
index 87184af..d35c3ce 100755
--- a/modules/nagios_common/files/check_commands/check_graphite
+++ b/modules/nagios_common/files/check_commands/check_graphite
@@ -387,11 +387,11 @@
 return message
 
 def format_message(self, messages):
-if not (messages['CRITICAL'] or messages['WARNING'] or 
messages['UNKNOWN']):
+if not (messages['CRITICAL'] or messages['WARNING'] or ('UNKNOWN' in 
messages and messages['UNKNOWN'])):
 return 'All targets OK'
 sign = '<' if self.under else '>'
 message = ''
-if messages['UNKNOWN']:
+if 'UNKNOWN' in messages and messages['UNKNOWN']:
 message += ' '.join(['%s (%s)' % (k, v) for k, v in 
messages['UNKNOWN']])
 if messages['CRITICAL']:
 message += ' '.join(['%s (%s%3.2f%%)' % (k, sign, v) for k, v in 
messages['CRITICAL']])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6bba197d39877befb5833e91c5ac23bbc8b3002
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Protect language converter markup in the preprocessor."

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

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

Change subject: Revert "Protect language converter markup in the preprocessor."
..


Revert "Protect language converter markup in the preprocessor."

This effectively reverts commit 28774022769d2273be16c6c6e1cca710a1fd97ef in
order to unblock the deploy train.  The underlying behavior might not be
incorrect, but it was unexpected.

Bug: T153761
Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
3 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 950d66d..661318b 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -223,7 +223,8 @@
 
$searchBase = "[{<\n"; # }
if ( !$wgDisableLangConversion ) {
-   $searchBase .= '-';
+   // FIXME: disabled due to T153761
+   // $searchBase .= '-';
}
 
// For fast reverse searches
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 1317e60..2666c93 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -155,7 +155,8 @@
 
$searchBase = "[{<\n";
if ( !$wgDisableLangConversion ) {
-   $searchBase .= '-';
+   // FIXME: disabled due to T153761
+   // $searchBase .= '-';
}
 
// For fast reverse searches
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b6f2830..f6b6bce 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -20633,10 +20633,12 @@
 
 !! end
 
+# FIXME: This test is currently broken in the PHP parser T153761
 !! test
 T146304: Don't break template parsing if language converter markup is in the 
parameter.
 !! options
 language=sr variant=sr-ec
+disabled
 !! wikitext
 {{echo|-{R|foo}-}}
 !! html/php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Use Title_blacklist as a local page on meta

2017-01-03 Thread Code Review

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

Change subject: Use Title_blacklist as a local page on meta
..

Use Title_blacklist as a local page on meta

Together with I80ee829a this will enable syntax validation.

Bug: T154112
Change-Id: I759f50680d43e6398d99c867760ef9724f010846
---
M wmf-config/CommonSettings.php
1 file changed, 15 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 702259e..c0a014f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -809,12 +809,21 @@
 $wgTitleBlacklistBlockAutoAccountCreation = false;
 
 if ( $wmgUseGlobalTitleBlacklist ) {
-   $wgTitleBlacklistSources = [
-   'meta' => [
-   'type' => 'url',
-   'src'  => 
"https://meta.wikimedia.org/w/index.php?title=Title_blacklist=raw_ver=1;,
-   ],
-   ];
+   if ( $wmfRealm === 'production' && $wgDBname === 'metawiki' ) {
+   $wgTitleBlacklistSources = [
+   'meta' => [
+   'type' => 'localpage',
+   'src' => 'Title_blacklist',
+   ],
+   ];
+   } else {
+   $wgTitleBlacklistSources = [
+   'meta' => [
+   'type' => 'url',
+   'src'  => 
"https://meta.wikimedia.org/w/index.php?title=Title_blacklist=raw_ver=1;,
+   ],
+   ];
+   }
 }
 
 if ( $wmgUseQuiz ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I759f50680d43e6398d99c867760ef9724f010846
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...Loops[master]: Fix a typo for escaped method, remove deprecated i18n file

2017-01-03 Thread SamanthaNguyen (Code Review)

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

Change subject: Fix a typo for escaped method, remove deprecated i18n file
..

Fix a typo for escaped method, remove deprecated i18n file

Bug: T154487
Change-Id: I771e7f88f5ac27b0ed036fe28eaa8cab67592864
---
D Loops.i18n.php
M Loops.php
2 files changed, 16 insertions(+), 50 deletions(-)


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

diff --git a/Loops.i18n.php b/Loops.i18n.php
deleted file mode 100644
index d346f64..000
--- a/Loops.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimeb827136401c6f57' ) ) {
-   function wfJsonI18nShimeb827136401c6f57( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimeb827136401c6f57';
-}
diff --git a/Loops.php b/Loops.php
index c988501..8c9e3a6 100644
--- a/Loops.php
+++ b/Loops.php
@@ -46,7 +46,7 @@
  * extension logic stuff.
  */
 class ExtLoops {
-   const VERSION = '0.5.0';
+   const VERSION = '0.5.1';
 
/**
 * Configuration variable defining maximum allowed number of loops 
('-1' => no limit).
@@ -117,10 +117,9 @@
}
 
 
-   
-   # Parser Functions #
-   
-
+   /**
+* Parser functions
+*/
public static function pfObj_while( Parser &$parser, $frame, $args ) {
return self::perform_while( $parser, $frame, $args, false );
}
@@ -214,7 +213,7 @@
 * #fornumargs: | keyVarName | valVarName | code
 */
public static function pfObj_fornumargs( Parser &$parser, $frame, $args 
) {
-   /*
+   /**
 * get numeric arguments, don't use 
PPFrame::getNumberedArguments because it would
 * return explicitely numbered arguments only.
 */
@@ -228,8 +227,10 @@
ksort( $tNumArgs ); // sort from lowest to highest
 
if( count( $args ) > 3 ) {
-   // compatbility to pre 0.4 but consistency with other 
Loop functions.
-   // this way the first argument can be ommitted like 
'#fornumargs: |varKey |varVal |code'
+   /**
+*compatbility to pre 0.4 but consistency with other 
Loop functions.
+* this way the first argument can be ommitted like 
'#fornumargs: |varKey |varVal |code'
+*/
array_shift( $args );
}
 
@@ -308,9 +309,9 @@
}
 
 
-   ###
-   # Loops Count #
-   ###
+   /**
+* Loops count
+*/
 
/**
 * Returns how many loops have been performed for a given Parser 
instance.
@@ -357,13 +358,13 @@
if( trim( $output ) !== '' ) {
$output .= "\n";
}
-   return $output .= '' . wfMessage( 
'loops_max' )->inContentLanguage()->escape() . '';
+   return $output .= '' . wfMessage( 
'loops_max' )->inContentLanguage()->escaped() . '';
}
 
 
-   ##
-   # Hooks handling #
-   ##
+   /**
+* Hooks handling
+*/
 
public static function onParserClearState( Parser &$parser ) {
// reset loops

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: extend ops recording rules

2017-01-03 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328842 )

Change subject: prometheus: extend ops recording rules
..


prometheus: extend ops recording rules

Add network-related derived metrics, plus misc additions and fixes.

Change-Id: Ie1cc9baff4fcce13ce84c5d70d09aaf88cd9663f
---
M modules/role/files/prometheus/rules_ops.conf
1 file changed, 88 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/files/prometheus/rules_ops.conf 
b/modules/role/files/prometheus/rules_ops.conf
index aa44b5e..24beec1 100644
--- a/modules/role/files/prometheus/rules_ops.conf
+++ b/modules/role/files/prometheus/rules_ops.conf
@@ -1,7 +1,82 @@
 # https://prometheus.io/docs/practices/rules/
 
+# Network interface utilization and errors
 cluster_device:network_transmit_bytes:rate5m = 
sum(rate(node_network_transmit_bytes{job="node"}[5m])) by (cluster,device)
 cluster_device:network_receive_bytes:rate5m = 
sum(rate(node_network_receive_bytes{job="node"}[5m])) by (cluster,device)
+cluster_device:network_transmit_packets:rate5m = 
sum(rate(node_network_transmit_packets{job="node"}[5m])) by (cluster,device)
+cluster_device:network_receive_packets:rate5m = 
sum(rate(node_network_receive_packets{job="node"}[5m])) by (cluster,device)
+
+cluster_device:network_transmit_drop:rate5m = 
sum(rate(node_network_transmit_drop{job="node"}[5m])) by (cluster,device)
+cluster_device:network_receive_drop:rate5m = 
sum(rate(node_network_receive_drop{job="node"}[5m])) by (cluster,device)
+cluster_device:network_transmit_errs:rate5m = 
sum(rate(node_network_transmit_errs{job="node"}[5m])) by (cluster,device)
+cluster_device:network_receive_errs:rate5m = 
sum(rate(node_network_receive_errs{job="node"}[5m])) by (cluster,device)
+
+# Network protocols utilization and errors
+cluster:netstat_IpExt_InCsumErrors:rate5m = sum by (cluster) 
(rate(node_netstat_IpExt_InCsumErrors{job="node"}[5m]))
+cluster:netstat_Ip_FragFails:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_FragFails{job="node"}[5m]))
+cluster:netstat_Ip_InAddrErrors:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_InAddrErrors{job="node"}[5m]))
+cluster:netstat_Ip_InDiscards:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_InDiscards{job="node"}[5m]))
+cluster:netstat_Ip_InHdrErrors:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_InHdrErrors{job="node"}[5m]))
+cluster:netstat_Ip_OutDiscards:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_OutDiscards{job="node"}[5m]))
+cluster:netstat_Ip_OutNoRoutes:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_OutNoRoutes{job="node"}[5m]))
+cluster:netstat_Ip_ReasmFails:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_ReasmFails{job="node"}[5m]))
+cluster:netstat_Ip_ReasmTimeout:rate5m = sum by (cluster) 
(rate(node_netstat_Ip_ReasmTimeout{job="node"}[5m]))
+
+cluster:netstat_Icmp_InCsumErrors:rate5m = sum by (cluster) 
(rate(node_netstat_Icmp_InCsumErrors{job="node"}[5m]))
+cluster:netstat_Icmp_InDestUnreachs:rate5m = sum by (cluster) 
(rate(node_netstat_Icmp_InDestUnreachs{job="node"}[5m]))
+cluster:netstat_Icmp_InErrors:rate5m = sum by (cluster) 
(rate(node_netstat_Icmp_InErrors{job="node"}[5m]))
+cluster:netstat_Icmp_InTimeExcds:rate5m = sum by (cluster) 
(rate(node_netstat_Icmp_InTimeExcds{job="node"}[5m]))
+cluster:netstat_Icmp_OutDestUnreachs:rate5m = sum by (cluster) 
(rate(node_netstat_Icmp_OutDestUnreachs{job="node"}[5m]))
+cluster:netstat_Icmp_OutErrors:rate5m = sum by (cluster) 
(rate(node_netstat_Icmp_OutErrors{job="node"}[5m]))
+
+cluster:netstat_Tcp_ActiveOpens:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_ActiveOpens{job="node"}[5m]))
+cluster:netstat_Tcp_AttemptFails:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_AttemptFails{job="node"}[5m]))
+cluster:netstat_Tcp_CurrEstab:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_CurrEstab{job="node"}[5m]))
+cluster:netstat_Tcp_EstabResets:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_EstabResets{job="node"}[5m]))
+cluster:netstat_Tcp_InCsumErrors:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_InCsumErrors{job="node"}[5m]))
+cluster:netstat_Tcp_InErrs:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_InErrs{job="node"}[5m]))
+cluster:netstat_Tcp_InSegs:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_InSegs{job="node"}[5m]))
+cluster:netstat_Tcp_OutRsts:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_OutRsts{job="node"}[5m]))
+cluster:netstat_Tcp_OutSegs:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_OutSegs{job="node"}[5m]))
+cluster:netstat_Tcp_PassiveOpens:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_PassiveOpens{job="node"}[5m]))
+cluster:netstat_Tcp_RetransSegs:rate5m = sum by (cluster) 
(rate(node_netstat_Tcp_RetransSegs{job="node"}[5m]))
+
+cluster:netstat_TcpExt_ListenDrops:rate5m = sum by (cluster) 
(rate(node_netstat_TcpExt_ListenDrops{job="node"}[5m]))

[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[master]: Validate all pages which are blacklist sources

2017-01-03 Thread Code Review

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

Change subject: Validate all pages which are blacklist sources
..

Validate all pages which are blacklist sources

Previously only MediaWiki:Titleblacklist was validated.

Also makes MediaWiki:Titleblacklist handle disabled
message syntax the same way other MediaWiki pages do.

Bug: T154112
Change-Id: I80ee829aa59e59d481faeeab08e0bfa862164ad2
---
M TitleBlacklist.hooks.php
M TitleBlacklist.list.php
2 files changed, 30 insertions(+), 11 deletions(-)


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

diff --git a/TitleBlacklist.hooks.php b/TitleBlacklist.hooks.php
index 31fc457..9f13e2d 100644
--- a/TitleBlacklist.hooks.php
+++ b/TitleBlacklist.hooks.php
@@ -242,12 +242,15 @@
 * @param $editor EditPage
 */
public static function validateBlacklist( $editor, $text, $section, 
&$error ) {
-   global $wgUser;
$title = $editor->mTitle;
+   $blackList = TitleBlacklist::singleton();
 
-   if ( $title->getNamespace() == NS_MEDIAWIKI && 
$title->getDBkey() == 'Titleblacklist' ) {
+   if ( $blackList->isBlacklistSource( $title ) ) {
+   if ( $title->getNamespace() === NS_MEDIAWIKI && $text 
=== '-' ) {
+   // disabled message, not a real blacklist
+   return true;
+   }
 
-   $blackList = TitleBlacklist::singleton();
$bl = $blackList->parseBlacklist( $text, 'page' );
$ok = $blackList->validate( $bl );
if ( count( $ok ) == 0 ) {
diff --git a/TitleBlacklist.list.php b/TitleBlacklist.list.php
index efa41e3..8277ca4 100644
--- a/TitleBlacklist.list.php
+++ b/TitleBlacklist.list.php
@@ -17,7 +17,12 @@
  */
 class TitleBlacklist {
private $mBlacklist = null, $mWhitelist = null;
-   const VERSION = 3;  // Blacklist format
+
+   /** @var array Flipped array holding the titles of local pages which 
contain a blacklist */
+   private $blacklistPages = [];
+
+   /** Blacklist format */
+   const VERSION = 3;
 
/**
 * Get an instance of this class
@@ -42,8 +47,10 @@
$cache = ObjectCache::getMainWANInstance();
// Try to find something in the cache
$cachedBlacklist = $cache->get( wfMemcKey( 
"title_blacklist_entries" ) );
+   $cachedBlacklistPages = $cache->get( wfMemcKey( 
"title_blacklist_pages" ) );
if ( is_array( $cachedBlacklist ) && count( $cachedBlacklist ) 
> 0 && ( $cachedBlacklist[0]->getFormatVersion() == self::VERSION ) ) {
$this->mBlacklist = $cachedBlacklist;
+   $this->blacklistPages = $cachedBlacklistPages;
return;
}
 
@@ -54,6 +61,7 @@
$this->mBlacklist = array_merge( $this->mBlacklist, 
$this->parseBlacklist( $this->getBlacklistText( $source ), $sourceName ) );
}
$cache->set( wfMemcKey( "title_blacklist_entries" ), 
$this->mBlacklist, $wgTitleBlacklistCaching['expiry'] );
+   $cache->set( wfMemcKey( "title_blacklist_pages" ), 
$this->blacklistPages, $wgTitleBlacklistCaching['expiry'] );
wfDebugLog( 'TitleBlacklist-cache', 'Updated ' . wfMemcKey( 
"title_blacklist_entries" )
. ' with ' . count( $this->mBlacklist ) . ' entries.' );
}
@@ -81,25 +89,24 @@
 * @param string $source A blacklist source from 
$wgTitleBlacklistSources
 * @return string The content of the blacklist source as a string
 */
-   private static function getBlacklistText( $source ) {
+   private function getBlacklistText( $source ) {
if ( !is_array( $source ) || count( $source ) <= 0 ) {
return '';  // Return empty string in error case
}
 
if ( $source['type'] == 'message' ) {
-   return wfMessage( 'titleblacklist' 
)->inContentLanguage()->text();
+   $this->blacklistPages['MediaWiki:Titleblacklist'] = 
true;
+   $msg = wfMessage( 'titleblacklist' 
)->inContentLanguage();
+   return $msg->isDisabled() ? '' : $msg->text();
} elseif ( $source['type'] == 'localpage' && count( $source ) 
>= 2 ) {
$title = Title::newFromText( $source['src'] );
if ( is_null( $title ) ) {
return '';
}
+   $this->blacklistPages[$title->getPrefixedDBkey()] = 
true;
if ( $title->getNamespace() == NS_MEDIAWIKI ) {

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Correct ironic typo in search preferences

2017-01-03 Thread Deskana (Code Review)

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

Change subject: Correct ironic typo in search preferences
..

Correct ironic typo in search preferences

Turns out the word typo was itself misspelt in the search preferences. Irony!
This patch fixes it.

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


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

diff --git a/i18n/en.json b/i18n/en.json
index 389ba76..5fcee94 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,7 +43,7 @@
"cirrussearch-completion-profile-fuzzy-pref-name": "Default 
(recommended)",
"cirrussearch-completion-profile-fuzzy-pref-desc": "Corrects up to two 
typos. Resolves close redirects.",
"cirrussearch-completion-profile-fuzzy-subphrases-pref-name": 
"Subphrase matching (recommended for longer article titles)",
-   "cirrussearch-completion-profile-fuzzy-subphrases-pref-desc": "Corrects 
up to two types. Resolves close redirects. Matches subphrase in titles.",
+   "cirrussearch-completion-profile-fuzzy-subphrases-pref-desc": "Corrects 
up to two typos. Resolves close redirects. Matches subphrase in titles.",
"cirrussearch-completion-profile-strict-pref-name": "Strict mode 
(advanced)",
"cirrussearch-completion-profile-strict-pref-desc": "No typo 
correction. No accent folding. Strict matching.",
"cirrussearch-completion-profile-normal-pref-name": "Redirect mode 
(advanced)",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.7]: Revert "Protect language converter markup in the preprocessor."

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

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

Change subject: Revert "Protect language converter markup in the preprocessor."
..


Revert "Protect language converter markup in the preprocessor."

This effectively reverts commit 28774022769d2273be16c6c6e1cca710a1fd97ef in
order to unblock the deploy train.  The underlying behavior might not be
incorrect, but it was unexpected.

Bug: T153761
Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
3 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  C. Scott Ananian: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 950d66d..661318b 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -223,7 +223,8 @@
 
$searchBase = "[{<\n"; # }
if ( !$wgDisableLangConversion ) {
-   $searchBase .= '-';
+   // FIXME: disabled due to T153761
+   // $searchBase .= '-';
}
 
// For fast reverse searches
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 1317e60..2666c93 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -155,7 +155,8 @@
 
$searchBase = "[{<\n";
if ( !$wgDisableLangConversion ) {
-   $searchBase .= '-';
+   // FIXME: disabled due to T153761
+   // $searchBase .= '-';
}
 
// For fast reverse searches
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b6f2830..f6b6bce 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -20633,10 +20633,12 @@
 
 !! end
 
+# FIXME: This test is currently broken in the PHP parser T153761
 !! test
 T146304: Don't break template parsing if language converter markup is in the 
parameter.
 !! options
 language=sr variant=sr-ec
+disabled
 !! wikitext
 {{echo|-{R|foo}-}}
 !! html/php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.7
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.18.3

2017-01-03 Thread Jforrester (Code Review)

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

Change subject: Tag v0.18.3
..

Tag v0.18.3

Change-Id: I19faa13874f45964c49b82e95056d5cef7219512
---
M History.md
M package.json
2 files changed, 42 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/24/330324/1

diff --git a/History.md b/History.md
index bd9dbe5..075da13 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,45 @@
 # OOjs UI Release History
+## v0.18.3 / 2017-01-03
+### Deprecations
+* [DEPRECATING CHANGE] icons: Deprecate the 'beta' and 'ribbonPrize' icons 
(James D. Forrester)
+* [DEPRECATING CHANGE] icons: Rename '*Undo' to 'un*' (James D. Forrester)
+* [DEPRECATING CHANGE] icons: Rename 'betaLaunch' to 'logoWikimediaDiscovery', 
move pack (James D. Forrester)
+
+### Features
+* ComboBoxInputWidget: Make it impossible to set `multiline` to true (Prateek 
Saxena)
+* Introduce `OO.ui.isMobile()` (Ed Sanders)
+* Provide `OO.ui.prompt()` method to complement `confirm()`/`alert()` (Ed 
Sanders)
+
+### Styles
+* FloatableElement: Replace superfluous class with general one (Volker E)
+* MediaWiki theme: Change custom error border color to `destructive` (Volker E)
+* MediaWiki theme: Change error/invalid color to alias of `destructive` 
(Volker E)
+* MediaWiki theme: Fix PHP 
CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing (Bartosz 
Dziewoński)
+* MediaWiki theme: Indicate normal, flagged ButtonWidgets' `:hover` clearer 
(Volker E)
+* MediaWiki theme: Set `line-height` explicitly on legends and labels (Volker 
E)
+
+### Code
+* BarToolGroup: Remove obsolete CSS selectors (Volker E)
+* ClippableElement: Compatibility with jQuery 3 (Bartosz Dziewoński)
+* Element: Do not try to scroll invisible/unattached elements into view 
(Bartosz Dziewoński)
+* LabelWidget: Properly hide labels if they are set to null (Ed Sanders)
+* NumberInputWidget: Avoid bitwise tricks when checking for integers (Bartosz 
Dziewoński)
+* PopupButtonWidget: Remove unnecessary CSS property (Volker E)
+* ProgressBarWidget: Use CSS transforms for indeterminate widget (Bartosz 
Dziewoński)
+* TextInputWidget: Do nothing in `#adjustSize`/`#positionLabel` if not 
attached (Bartosz Dziewoński)
+* TextInputWidget: Only call `#onElementAttach` on focus if it wasn't called 
(Bartosz Dziewoński)
+* TextInputWidget: Use `Element#isElementAttached` (Bartosz Dziewoński)
+* styles: Replace `transform` with dedicated mixin (Volker E)
+* MediaWiki theme: Make `box-shadow` LESS vars follow naming scheme (Volker E)
+* MediaWiki theme: Simplify frameless ButtonWidget selectors (Volker E)
+* performance: Apply webkit GPU hack to scrollable panels (Ed Sanders)
+* demos: Add disabled Progress bar (Volker E)
+* demos: Add examples for `OO.ui.alert()`/`confirm()`/`prompt()` (Bartosz 
Dziewoński)
+* demos: Avoid using 'required' as a test indicator (Ed Sanders)
+* build: Bump file copyright notices for 2017 (James D. Forrester)
+* docs: Fix small typo (Amir Sarabadani)
+
+
 ## v0.18.2 / 2016-12-06
 ### Styles
 * MediaWiki theme: Address sub-pixel rendering issues of RadioInputWidgets 
(Volker E)
diff --git a/package.json b/package.json
index 0a67425..088317b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.7]: Revert "Protect language converter markup in the preprocessor."

2017-01-03 Thread Thcipriani (Code Review)

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

Change subject: Revert "Protect language converter markup in the preprocessor."
..

Revert "Protect language converter markup in the preprocessor."

This effectively reverts commit 28774022769d2273be16c6c6e1cca710a1fd97ef in
order to unblock the deploy train.  The underlying behavior might not be
incorrect, but it was unexpected.

Bug: T153761
Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
3 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/330323/1

diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 950d66d..661318b 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -223,7 +223,8 @@
 
$searchBase = "[{<\n"; # }
if ( !$wgDisableLangConversion ) {
-   $searchBase .= '-';
+   // FIXME: disabled due to T153761
+   // $searchBase .= '-';
}
 
// For fast reverse searches
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 1317e60..2666c93 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -155,7 +155,8 @@
 
$searchBase = "[{<\n";
if ( !$wgDisableLangConversion ) {
-   $searchBase .= '-';
+   // FIXME: disabled due to T153761
+   // $searchBase .= '-';
}
 
// For fast reverse searches
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b6f2830..f6b6bce 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -20633,10 +20633,12 @@
 
 !! end
 
+# FIXME: This test is currently broken in the PHP parser T153761
 !! test
 T146304: Don't break template parsing if language converter markup is in the 
parameter.
 !! options
 language=sr variant=sr-ec
+disabled
 !! wikitext
 {{echo|-{R|foo}-}}
 !! html/php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.7
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.6]: Upgrade mapdata lib to fix a bug on rowiki

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

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

Change subject: Upgrade mapdata lib to fix a bug on rowiki
..


Upgrade mapdata lib to fix a bug on rowiki

Bug: T154117
Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
(cherry picked from commit 676956f7b472dbcf030eb3ee17df9d457d28fe39)
---
M lib/wikimedia-mapdata.js
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index 43c72e9..c18ef07 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -401,11 +401,11 @@
   HybridGroup.prototype.fetchExternalGroups = function () {
 var promises = [],
 group = this,
-key,
+i,
 externals = group.externals;
 
-for ( key in externals ) {
-  promises.push( externals[ key ].fetch() );
+for ( i = 0; i < externals.length; i++ ) {
+  promises.push( externals[ i ].fetch() );
 }
 
 return whenAllPromises( promises ).then( function () {
diff --git a/package.json b/package.json
index 4cc7213..fb83ed9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "leaflet": "^0.7.7",
 "leaflet-sleep": "juliengirault/Leaflet.Sleep",
 "maki": "^0.5.0",
-"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#ee3a9e5dcfb89cffc28acb24e2cc281931ceaf08;,
+"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#dcd526f619c69c0297bf5ba486c26c2a9a91ee02;,
 "wmui-base": 
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1;
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: Yurik 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.7]: Upgrade mapdata lib to fix a bug on rowiki

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

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

Change subject: Upgrade mapdata lib to fix a bug on rowiki
..


Upgrade mapdata lib to fix a bug on rowiki

Bug: T154117
Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
(cherry picked from commit 676956f7b472dbcf030eb3ee17df9d457d28fe39)
---
M lib/wikimedia-mapdata.js
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index 43c72e9..c18ef07 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -401,11 +401,11 @@
   HybridGroup.prototype.fetchExternalGroups = function () {
 var promises = [],
 group = this,
-key,
+i,
 externals = group.externals;
 
-for ( key in externals ) {
-  promises.push( externals[ key ].fetch() );
+for ( i = 0; i < externals.length; i++ ) {
+  promises.push( externals[ i ].fetch() );
 }
 
 return whenAllPromises( promises ).then( function () {
diff --git a/package.json b/package.json
index 4cc7213..fb83ed9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "leaflet": "^0.7.7",
 "leaflet-sleep": "juliengirault/Leaflet.Sleep",
 "maki": "^0.5.0",
-"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#ee3a9e5dcfb89cffc28acb24e2cc281931ceaf08;,
+"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#dcd526f619c69c0297bf5ba486c26c2a9a91ee02;,
 "wmui-base": 
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1;
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.7
Gerrit-Owner: Yurik 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.6]: Upgrade mapdata lib to fix a bug on rowiki

2017-01-03 Thread Yurik (Code Review)

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

Change subject: Upgrade mapdata lib to fix a bug on rowiki
..

Upgrade mapdata lib to fix a bug on rowiki

Bug: T154117
Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
(cherry picked from commit 676956f7b472dbcf030eb3ee17df9d457d28fe39)
---
M lib/wikimedia-mapdata.js
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/22/330322/1

diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index 43c72e9..c18ef07 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -401,11 +401,11 @@
   HybridGroup.prototype.fetchExternalGroups = function () {
 var promises = [],
 group = this,
-key,
+i,
 externals = group.externals;
 
-for ( key in externals ) {
-  promises.push( externals[ key ].fetch() );
+for ( i = 0; i < externals.length; i++ ) {
+  promises.push( externals[ i ].fetch() );
 }
 
 return whenAllPromises( promises ).then( function () {
diff --git a/package.json b/package.json
index 4cc7213..fb83ed9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "leaflet": "^0.7.7",
 "leaflet-sleep": "juliengirault/Leaflet.Sleep",
 "maki": "^0.5.0",
-"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#ee3a9e5dcfb89cffc28acb24e2cc281931ceaf08;,
+"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#dcd526f619c69c0297bf5ba486c26c2a9a91ee02;,
 "wmui-base": 
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1;
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: Yurik 
Gerrit-Reviewer: JGirault 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.7]: Upgrade mapdata lib to fix a bug on rowiki

2017-01-03 Thread Yurik (Code Review)

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

Change subject: Upgrade mapdata lib to fix a bug on rowiki
..

Upgrade mapdata lib to fix a bug on rowiki

Bug: T154117
Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
(cherry picked from commit 676956f7b472dbcf030eb3ee17df9d457d28fe39)
---
M lib/wikimedia-mapdata.js
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index 43c72e9..c18ef07 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -401,11 +401,11 @@
   HybridGroup.prototype.fetchExternalGroups = function () {
 var promises = [],
 group = this,
-key,
+i,
 externals = group.externals;
 
-for ( key in externals ) {
-  promises.push( externals[ key ].fetch() );
+for ( i = 0; i < externals.length; i++ ) {
+  promises.push( externals[ i ].fetch() );
 }
 
 return whenAllPromises( promises ).then( function () {
diff --git a/package.json b/package.json
index 4cc7213..fb83ed9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "leaflet": "^0.7.7",
 "leaflet-sleep": "juliengirault/Leaflet.Sleep",
 "maki": "^0.5.0",
-"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#ee3a9e5dcfb89cffc28acb24e2cc281931ceaf08;,
+"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#dcd526f619c69c0297bf5ba486c26c2a9a91ee02;,
 "wmui-base": 
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1;
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.7
Gerrit-Owner: Yurik 
Gerrit-Reviewer: JGirault 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Upgrade mapdata lib to fix a bug on rowiki

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

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

Change subject: Upgrade mapdata lib to fix a bug on rowiki
..


Upgrade mapdata lib to fix a bug on rowiki

Bug: T154117
Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
---
M lib/wikimedia-mapdata.js
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index 43c72e9..c18ef07 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -401,11 +401,11 @@
   HybridGroup.prototype.fetchExternalGroups = function () {
 var promises = [],
 group = this,
-key,
+i,
 externals = group.externals;
 
-for ( key in externals ) {
-  promises.push( externals[ key ].fetch() );
+for ( i = 0; i < externals.length; i++ ) {
+  promises.push( externals[ i ].fetch() );
 }
 
 return whenAllPromises( promises ).then( function () {
diff --git a/package.json b/package.json
index 4cc7213..fb83ed9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "leaflet": "^0.7.7",
 "leaflet-sleep": "juliengirault/Leaflet.Sleep",
 "maki": "^0.5.0",
-"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#ee3a9e5dcfb89cffc28acb24e2cc281931ceaf08;,
+"wikimedia-mapdata": 
"git+https://gerrit.wikimedia.org/r/mapdata#dcd526f619c69c0297bf5ba486c26c2a9a91ee02;,
 "wmui-base": 
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1;
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a277fe5defd1aaa16c3fed1290358ec264c99c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Replace deprecated mediawiki.UI Less variables with current ...

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

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

Change subject: Replace deprecated mediawiki.UI Less variables with current ones
..


Replace deprecated mediawiki.UI Less variables with current ones

Replacing mediawiki.UI Less variables, which have been deprecated
since MW 1.24, with current ones. This is an intermediate step
in preparing to move towards WMUI Base variables and to cleanly
finish the deprecation process.
Also replacing fixed values with other current variables, like
`border-radius`, align values with OOjs UI values and clean-up
Less code in respect of CSS coding guidelines.

Bug: T154362
Change-Id: If94b4b334680e43f0a3552067b63f52139cfaf3a
---
M styles/common.less
1 file changed, 30 insertions(+), 36 deletions(-)

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



diff --git a/styles/common.less b/styles/common.less
index d90748a..329fb86 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -2,8 +2,7 @@
 @import 'mediawiki.mixins';
 @import 'mediawiki.mixins.animation';
 
-@darkColor:  #2b333f;
-@darkColorOpac: rgba( 43, 51, 63, 0.7 );
+@colorWhite: #fff;
 @colorWhiteOpac: rgba( 255, 255, 255, 0.7 );
 
 /* TODO: This file has a lot of descending specificity and needs a cleanup */
@@ -23,7 +22,6 @@
}
 
&.mw-graph-interactable {
-
&:hover {
cursor: pointer;
 
@@ -82,10 +80,9 @@
/* common button style */
.mw-graph-switch {
font: inherit;
-   margin: 0.1em 0;
min-height: 1.2em;
min-width: 1em;
-   .transition( ~'background .1s ease,color .1s ease,border-color 
.1s ease,box-shadow .1s ease' );
+   .transition( ~'background-color 100ms, color 100ms, 
border-color 100ms, box-shadow 100ms' );
font-weight: bold;
text-decoration: none;
display: inline-block;
@@ -96,28 +93,27 @@
line-height: 1em;
padding: 0.5em;
width: 60px;
-
border-width: 2px;
border-style: solid;
-   border-color: #333;
-   border-radius: 0.3em;
-
-   color: @darkColor;
+   border-color: @colorGray5;
+   border-radius: @borderRadius;
background-color: @colorWhiteOpac;
+   color: @colorGray2;
 
&:hover {
-   background: @colorProgressiveHighlight;
-   border-color: @colorProgressiveHighlight;
+   background-color: @colorWhite;
+   color: @colorProgressive;
+   border-color: #859dcc;
}
&:active {
-   color: @colorWhite;
-   background-color: @colorProgressiveActive;
+   background-color: @colorWhite;
+   color: @colorProgressive;
border-color: @colorProgressiveActive;
-   .box-shadow(none);
+   .box-shadow( none );
}
&:focus {
-   .box-shadow( ~'inset 0 0 0 1px @{colorWhite}' );
border-color: @colorProgressive;
+   .box-shadow( ~'inset 0 0 0 1px @{colorWhite}' );
}
 
/* Play button style */
@@ -131,28 +127,26 @@
font-style: normal;
}
 
-   }
+   /* Loading button style */
+   &.mw-graph-loading {
+   background-color: @colorWhite;
+   /* @embed */
+   background-image: url( ../includes/ajax-loader.gif );
+   background-position: 50% 50%;
+   background-repeat: no-repeat;
+   background-size: 20px;
+   color: @colorGray5;
+   display: block;
+   border-color: @colorProgressiveActive;
+   .transition( ~'background 0s ease' );
 
-   /* Loading button style */
-   .mw-graph-switch.mw-graph-loading {
+   &:hover {
+   border-color: #859dcc;
+   }
 
-   color: @colorGray5;
-   background-color: @colorWhite;
-   border-color: @colorProgressiveActive;
-
-   &:hover {
-   border-color: #333;
-   }
-   .transition( ~'background 0s ease' );
-   background-position: 50% 50%;
-   background-size: 20px;
-   background-repeat: no-repeat;
-   /* @embed */
-   background-image: url(

1 2 3 4 >

1 - 100 of 389 matches

Mail list logo