date:20170103

[MediaWiki-commits] [Gerrit] translatewiki[master]: Add PdfBook from GitHub

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

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

Change subject: Add PdfBook from GitHub
..


Add PdfBook from GitHub

Bug: T143684
Change-Id: I15be9a903a533428a8c4bb5f3be2d3f6e1b09c13
---
M groups/MediaWiki/mwgithub.yaml
M repoconfig.commit.json
M repoconfig.json
3 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/mwgithub.yaml b/groups/MediaWiki/mwgithub.yaml
index de18d46..c0aafb0 100644
--- a/groups/MediaWiki/mwgithub.yaml
+++ b/groups/MediaWiki/mwgithub.yaml
@@ -324,3 +324,13 @@
 FILES:
   class: JsonFFS
   sourcePattern: 
"%GROUPROOT%/mwgithub/Nikerabbit/mediawiki-extensions-FinnFrameNet/i18n/%CODE%.json"
+
+---
+BASIC:
+  id: mwgithub-pdfbook
+  label: Pdf Book
+  description: "{{Special:MyLanguage/MediaWiki:pdfbook-desc/en}}"
+
+FILES:
+  class: JsonFFS
+  sourcePattern: 
"%GROUPROOT%/mwgithub/OrganicDesign/extensions/MediaWiki/PdfBook/i18n/%CODE%.json"
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index e234617..c91b57f 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -288,6 +288,10 @@
"type": "github",
"url": 
"g...@github.com:Nikerabbit/mediawiki-extensions-FinnFrameNet.git"
},
+   "mwgithub/OrganicDesign/extensions": {
+   "type": "github",
+   "url": 
"g...@github.com:OrganicDesign/extensions"
+   },
"mwgithub/SemanticMediaWiki/SemanticBreadcrumbLinks": {
"type": "git",
"url": 
"g...@github.com:SemanticMediaWiki/SemanticBreadcrumbLinks.git"
diff --git a/repoconfig.json b/repoconfig.json
index 379eb1b..1fab403 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -283,6 +283,10 @@
"type": "github",
"url": 
"https://github.com/Nikerabbit/mediawiki-extensions-FinnFrameNet.git;
},
+   "mwgithub/OrganicDesign/extensions": {
+   "type": "github",
+   "url": 
"https://github.com/OrganicDesign/extensions;
+   },
"mwgithub/SemanticMediaWiki/SemanticBreadcrumbLinks": {
"type": "git",
"url": 
"https://github.com/SemanticMediaWiki/SemanticBreadcrumbLinks.git;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15be9a903a533428a8c4bb5f3be2d3f6e1b09c13
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
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/dns[master]: Removed unused CNAME

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330208 )

Change subject: Removed unused CNAME
..

Removed unused CNAME

Change-Id: I7a2756be3a6283408a2b67f1cbcbe76123ce2294
---
M templates/wmnet
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/08/330208/1

diff --git a/templates/wmnet b/templates/wmnet
index 6d9f93e..619c207 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4164,7 +4164,6 @@
 $ORIGIN svc.eqiad.wmnet.
 
 appservers  1H  IN A10.2.2.1
-appservers-debug  1H  IN CNAMEmw1017.eqiad.wmnet.
 hhvm-api1H  IN A10.2.2.3
 trendingedits 1H  IN A  10.2.2.9
 ores1H  IN A10.2.2.10

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a2756be3a6283408a2b67f1cbcbe76123ce2294
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

___
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] 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]: 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...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...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] 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] 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] wikimedia...crm[master]: Pull composer changes from deployment

2017-01-03 Thread Cdentinger (Code Review)

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

Change subject: Pull composer changes from deployment
..

Pull composer changes from deployment

Change-Id: Id3ebcf2b49f3b289c10988648a6b2e3f4d81f8dd
---
M composer.json
M composer.lock
2 files changed, 18 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/10/330310/1

diff --git a/composer.json b/composer.json
index e16b453..d6a3181 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.21",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index cfdb04f..f2f8e19 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": "9d1888ed603a23fbd5afb2b4eb99acdb",
-"content-hash": "d3d501379291d40d65774ef35b503768",
+"hash": "c2a08d033ae69a5ecbae72fdbe929a2a",
+"content-hash": "824641a9a433422fd2773d67876f5d7b",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -449,16 +449,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -466,14 +466,21 @@
 },
 "require-dev": {
 "phpdocumentor/phpdocumentor": "*",
-"phpunit/phpunit": "*"
+"phpunit/phpunit": "4.7.*"
+},
+"suggest": {
+"league/oauth2-google": "Needed for Google XOAUTH2 
authentication"
 },
 "type": "library",
 "autoload": {
 "classmap": [
 "class.phpmailer.php",
+"class.phpmaileroauth.php",
+"class.phpmaileroauthgoogle.php",
+"class.smtp.php",
 "class.pop3.php",
-"class.smtp.php"
+"extras/EasyPeasyICS.php",
+"extras/ntlm_sasl_client.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -498,7 +505,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2013-04-11 16:45:39"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "phpseclib/phpseclib",
@@ -1191,7 +1198,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-12-06 19:40:49"
+"time": "2016-12-06 19:11:55"
 },
 {
 "name": "zordius/lightncandy",

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Upstream 4.7.11 mulilingual upgrade fix which was merged aft...

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

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

Change subject: Upstream 4.7.11 mulilingual upgrade fix which was merged after 
we forked our version
..


Upstream 4.7.11 mulilingual upgrade fix which was merged after we forked our 
version

Change-Id: I3a02311ffd456515f56fe6b162823d3dbba485e5
---
M CRM/Core/BAO/SchemaHandler.php
M CRM/Upgrade/Incremental/php/FourSeven.php
M CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
3 files changed, 30 insertions(+), 3 deletions(-)

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



diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php
index e68007d..3cc3e3e 100644
--- a/CRM/Core/BAO/SchemaHandler.php
+++ b/CRM/Core/BAO/SchemaHandler.php
@@ -370,11 +370,24 @@
   /**
* @param string $tableName
* @param string $columnName
+   * @param bool $l18n
+   *
*/
-  public static function dropColumn($tableName, $columnName) {
+  public static function dropColumn($tableName, $columnName, $l18n = FALSE) {
 if (self::checkIfFieldExists($tableName, $columnName)) {
   $sql = "ALTER TABLE $tableName DROP COLUMN $columnName";
-  CRM_Core_DAO::executeQuery($sql);
+  if ($l18n) {
+CRM_Core_DAO::executeQuery($sql);
+  }
+  else {
+CRM_Core_DAO::executeQuery($sql, array(), TRUE, NULL, FALSE, FALSE);
+  }
+  $domain = new CRM_Core_DAO_Domain();
+  $domain->find(TRUE);
+  if ($domain->locales) {
+$locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
+CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, NULL);
+  }
 }
   }
 
diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php 
b/CRM/Upgrade/Incremental/php/FourSeven.php
index 973c155..9d820e8 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -786,6 +786,8 @@
   CRM_Core_DAO::executeQuery('DELETE c1 FROM civicrm_dashboard_contact c1, 
civicrm_dashboard_contact c2 WHERE c1.contact_id = c2.contact_id AND 
c1.dashboard_id = c2.dashboard_id AND c1.id > c2.id');
   CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_dashboard_contact ADD 
UNIQUE INDEX index_dashboard_id_contact_id (dashboard_id, contact_id);');
 }
+$domain = new CRM_Core_DAO_Domain();
+$domain->find(TRUE);
 CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 
'content');
 CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 
'is_minimized');
 CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 
'is_fullscreen');
@@ -798,7 +800,12 @@
 CRM_Core_DAO::executeQuery('UPDATE civicrm_dashboard SET url = 
REPLACE(url, "=5", ""), fullscreen_url = REPLACE(fullscreen_url, 
"=5", "")');
 
 if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_dashboard', 
'cache_minutes')) {
-  CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_dashboard ADD COLUMN 
cache_minutes int unsigned NOT NULL DEFAULT 60 COMMENT "Number of minutes to 
cache dashlet content in browser localStorage."');
+  CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_dashboard ADD COLUMN 
cache_minutes int unsigned NOT NULL DEFAULT 60 COMMENT "Number of minutes to 
cache dashlet content in browser localStorage."',
+ array(), TRUE, NULL, FALSE, FALSE);
+}
+if ($domain->locales) {
+  $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
+  CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, NULL);
 }
 
 CRM_Core_DAO::executeQuery('UPDATE civicrm_dashboard SET cache_minutes = 
1440 WHERE name = "blog"');
diff --git a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl 
b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
index 64ff7eb..d0eeed5 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
@@ -14,6 +14,13 @@
 UPDATE civicrm_dashboard SET name = 'allCases' WHERE (name IS NULL OR name = 
'') AND url LIKE "civicrm/dashlet/allCases?%";
 UPDATE civicrm_dashboard SET name = 'casedashboard' WHERE (name IS NULL OR 
name = '') AND url LIKE "civicrm/dashlet/casedashboard?%";
 
+-- CRM-19291 Fix names on dashlets where name is an empty string
+{if $multilingual}
+UPDATE civicrm_dashboard SET name = label_{$locales.0} WHERE name = '';
+{else}
+UPDATE civicrm_dashboard SET name = label WHERE name = '';
+{/if}
+
 -- CRM-18508 Display State/Province in event address in registration emails
 {include file='../CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl'}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a02311ffd456515f56fe6b162823d3dbba485e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Upstream whitespace variant

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

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

Change subject: Upstream whitespace variant
..


Upstream whitespace variant

Change-Id: If80e878fa793fce8c03c06e3ab8dcf190a806c10
---
M templates/CRM/Contact/Page/DedupeFind.tpl
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl 
b/templates/CRM/Contact/Page/DedupeFind.tpl
index 2811f79..09f73c3 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -156,8 +156,8 @@
   {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q="`$urlQuery`=map" a=1}{/capture}
 {ts}Batch Merge Selected 
Duplicates{/ts}
 
-{capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q=$urlQuery a=1}{/capture}
- {ts}Batch Merge All Duplicates{/ts}
+   {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q=$urlQuery 
a=1}{/capture}
+{ts}Batch Merge All Duplicates{/ts}
 
 {ts}Flip Selected Duplicates{/ts}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Cleanup after Iba0138a6

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

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

Change subject: Cleanup after Iba0138a6
..


Cleanup after Iba0138a6

Iba0138a6 removed the custom error handler in Hooks::run(), but didn't
remove the comment describing it and left behind an unused variable.

Change-Id: I9b043fa8bd79625e63d35f95f2fa3ac1b214275c
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 11 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 511781d..f4f86be 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -176,22 +176,13 @@
throw new MWException( 'Invalid callback ' . 
$func . ' in hooks for ' . $event . "\n" );
}
 
-   /*
-* Call the hook. The documentation of 
call_user_func_array says
-* false is returned on failure. However, if the 
function signature
-* does not match the call signature, PHP will issue an 
warning and
-* return null instead. The following code catches that 
warning and
-* provides better error message.
-*/
-   $retval = null;
-   $badhookmsg = null;
-   $hook_args = array_merge( $hook, $args );
-
// mark hook as deprecated, if deprecation version is 
specified
if ( $deprecatedVersion !== null ) {
wfDeprecated( "$event hook (used in $func)", 
$deprecatedVersion );
}
 
+   // Call the hook.
+   $hook_args = array_merge( $hook, $args );
$retval = call_user_func_array( $callback, $hook_args );
 
// Process the return value.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b043fa8bd79625e63d35f95f2fa3ac1b214275c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Introduce stricter validation involving Newsletters' content...

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

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

Change subject: Introduce stricter validation involving Newsletters' content 
models
..


Introduce stricter validation involving Newsletters' content models

This prevents the content model of a page and whether it is in the
newsletter namespace from becoming inconsistent, which caused bizzare
behavior when editing such a page and lead to "Could not find newsletter
with name ... " stack traces.
* fixed indentation for NewsletterHooks::onTitleMove

Bug: T154379
Bug: T154380
Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
---
M Newsletter.hooks.php
M extension.json
2 files changed, 34 insertions(+), 15 deletions(-)

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



diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 742963f..71db636 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -271,21 +271,37 @@
return true;
}
 
-   /**
-* @param Title $title
-* @param Title $newtitle
-* @param User $user
-* @return bool
-*/
-   public static function onTitleMove( Title $title, Title 
$newtitle, User $user ) {
-   if ( $newtitle->inNamespace( NS_NEWSLETTER ) ) {
-   $newsletter = Newsletter::newFromName( 
$title->getText() );
-   if ( $newsletter ) {
-   
NewsletterStore::getDefaultInstance()->updateName( $newsletter->getId(), 
$newtitle->getText() );
-   } else {
-   throw new MWException( 'Cannot find 
newsletter with name \"' . $title->getText() . '\"' );
-   }
+   /**
+* @param Title $title
+* @param Title $newtitle
+* @param User $user
+* @return bool
+* @throws MWException
+*/
+   public static function onTitleMove( Title $title, Title $newtitle, User 
$user ) {
+   if ( $newtitle->inNamespace( NS_NEWSLETTER ) ) {
+   $newsletter = Newsletter::newFromName( 
$title->getText() );
+   if ( $newsletter ) {
+   
NewsletterStore::getDefaultInstance()->updateName( $newsletter->getId(), 
$newtitle->getText() );
+   } else {
+   throw new MWException( 'Cannot find newsletter 
with name \"' . $title->getText() . '\"' );
}
-   return true;
}
+   return true;
+   }
+
+   /**
+* @param string $contentModel ID of the content model in question
+* @param Title $title the Title in question.
+* @param $ok Output parameter, whether it is OK to use $contentModel 
on $title.
+* @return bool
+*/
+   public static function onContentModelCanBeUsedOn( $contentModel, Title 
$title, &$ok ){
+   if ( $title->inNamespace( NS_NEWSLETTER ) && $contentModel != 
'NewsletterContent' ) {
+   $ok = false;
+   } elseif ( !$title->inNamespace( NS_NEWSLETTER ) && 
$contentModel == 'NewsletterContent' ) {
+   $ok = false;
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 774c4a5..05fddab 100644
--- a/extension.json
+++ b/extension.json
@@ -155,6 +155,9 @@
],
"TitleMove": [
"NewsletterHooks::onTitleMove"
+   ],
+   "ContentModelCanBeUsedOn": [
+   "NewsletterHooks::onContentModelCanBeUsedOn"
]
},
"namespaces": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Pppery 
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]: Enable mapframe on frwiki and fiwiki

2017-01-03 Thread MaxSem (Code Review)

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

Change subject: Enable mapframe on frwiki and fiwiki
..

Enable mapframe on frwiki and fiwiki

Bug: T151591
Change-Id: I69a0632604a23a502154a150bf9dc8cd7fd4b826
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 834efdf..bef6e6b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17779,6 +17779,8 @@
'default' => false,
'mediawikiwiki' => true,
'cawiki' => true,
+   'fiwiki' => true, // T151591
+   'frwiki' => true,
'hewiki' => true,
'mkwiki' => true,
'nowiki' => true, // T154021
@@ -17791,6 +17793,8 @@
'default' => true,
'wikipedia' => false,
'cawiki' => true,
+'fiwiki' => true, // T151591
+   'frwiki' => true,
'hewiki' => true,
'mkwiki' => true,
'nowiki' => true, // T154021

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Pull composer changes from deployment

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

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

Change subject: Pull composer changes from deployment
..


Pull composer changes from deployment

Change-Id: Id3ebcf2b49f3b289c10988648a6b2e3f4d81f8dd
---
M composer.json
M composer.lock
2 files changed, 18 insertions(+), 11 deletions(-)

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



diff --git a/composer.json b/composer.json
index e16b453..d6a3181 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.21",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index cfdb04f..f2f8e19 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": "9d1888ed603a23fbd5afb2b4eb99acdb",
-"content-hash": "d3d501379291d40d65774ef35b503768",
+"hash": "c2a08d033ae69a5ecbae72fdbe929a2a",
+"content-hash": "824641a9a433422fd2773d67876f5d7b",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -449,16 +449,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -466,14 +466,21 @@
 },
 "require-dev": {
 "phpdocumentor/phpdocumentor": "*",
-"phpunit/phpunit": "*"
+"phpunit/phpunit": "4.7.*"
+},
+"suggest": {
+"league/oauth2-google": "Needed for Google XOAUTH2 
authentication"
 },
 "type": "library",
 "autoload": {
 "classmap": [
 "class.phpmailer.php",
+"class.phpmaileroauth.php",
+"class.phpmaileroauthgoogle.php",
+"class.smtp.php",
 "class.pop3.php",
-"class.smtp.php"
+"extras/EasyPeasyICS.php",
+"extras/ntlm_sasl_client.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -498,7 +505,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2013-04-11 16:45:39"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "phpseclib/phpseclib",
@@ -1191,7 +1198,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-12-06 19:40:49"
+"time": "2016-12-06 19:11:55"
 },
 {
 "name": "zordius/lightncandy",

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [Ids] add npm job

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

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

Change subject: [Ids] add npm job
..


[Ids] add npm job

package.json was added with Iebe7fb7fe9293ba5f2c96b2b1e0467ddfa035dfd

Change-Id: I59182ab5d95b0d613dbe41fa4884ee7920f781ca
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ae227f0..1faab1c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3900,6 +3900,7 @@
 template:
   - name: composer-test
   - name: extension-unittests-generic
+  - name: npm
 check:
   - jsonlint
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59182ab5d95b0d613dbe41fa4884ee7920f781ca
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] icons: Rename 'Undo' to 'un'

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

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

Change subject: [DEPRECATING CHANGE] icons: Rename '*Undo' to 'un*'
..


[DEPRECATING CHANGE] icons: Rename '*Undo' to 'un*'

For consistency:

* blockUndo is now unBlock
* flagUndo is now unFlag
* trashUndo is now unTrash

This fits in with the pre-existing unLock and unStar patterns.

Change-Id: Ibb24bc7b9cebb814ebf179d93bec32afcd3f45ff
---
M demos/pages/icons.js
M src/themes/apex/icons-moderation.json
R src/themes/apex/images/icons/unBlock-ltr.svg
R src/themes/apex/images/icons/unBlock-rtl.svg
R src/themes/apex/images/icons/unFlag-ltr.svg
R src/themes/apex/images/icons/unFlag-rtl.svg
R src/themes/apex/images/icons/unTrash-ltr.svg
R src/themes/apex/images/icons/unTrash-rtl.svg
M src/themes/mediawiki/icons-moderation.json
R src/themes/mediawiki/images/icons/unBlock-ltr.svg
R src/themes/mediawiki/images/icons/unBlock-rtl.svg
R src/themes/mediawiki/images/icons/unFlag-ltr.svg
R src/themes/mediawiki/images/icons/unFlag-rtl.svg
R src/themes/mediawiki/images/icons/unTrash-ltr.svg
R src/themes/mediawiki/images/icons/unTrash-rtl.svg
15 files changed, 63 insertions(+), 35 deletions(-)

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



diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 4c9bdc1..728e61c 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -83,16 +83,16 @@
],
moderation: [
'block',
-   'blockUndo',
+   'unBlock',
'flag',
-   'flagUndo',
+   'unFlag',
'lock',
-   'ongoingConversation',
+   'unLock',
'star',
-   'trash',
-   'trashUndo',
'unStar',
-   'unLock'
+   'trash',
+   'unTrash',
+   'ongoingConversation'
],
'editing-core': [
'edit',
diff --git a/src/themes/apex/icons-moderation.json 
b/src/themes/apex/icons-moderation.json
index f904cc2..b5dff27 100644
--- a/src/themes/apex/icons-moderation.json
+++ b/src/themes/apex/icons-moderation.json
@@ -4,30 +4,46 @@
"images": {
"block": { "file": "images/icons/block.svg" },
"blockUndo": { "file": {
-   "ltr": "images/icons/blockUndo-ltr.svg",
-   "rtl": "images/icons/blockUndo-rtl.svg"
+   "ltr": "images/icons/unBlock-ltr.svg",
+   "rtl": "images/icons/unBlock-rtl.svg"
+   } },
+   "unBlock": { "file": {
+   "ltr": "images/icons/unBlock-ltr.svg",
+   "rtl": "images/icons/unBlock-rtl.svg"
} },
"flag": { "file": {
"ltr": "images/icons/flag-ltr.svg",
"rtl": "images/icons/flag-rtl.svg"
} },
"flagUndo": { "file": {
-   "ltr": "images/icons/flagUndo-ltr.svg",
-   "rtl": "images/icons/flagUndo-rtl.svg"
+   "ltr": "images/icons/unFlag-ltr.svg",
+   "rtl": "images/icons/unFlag-rtl.svg"
+   } },
+   "unFlag": { "file": {
+   "ltr": "images/icons/unFlag-ltr.svg",
+   "rtl": "images/icons/unFlag-rtl.svg"
} },
"lock": { "file": "images/icons/lock.svg" },
-   "star": { "file": "images/icons/star.svg" },
-   "trash": { "file": "images/icons/trash.svg" },
-   "trashUndo": { "file": {
-   "ltr": "images/icons/trashUndo-ltr.svg",
-   "rtl": "images/icons/trashUndo-rtl.svg"
-   } },
"unLock": { "file": {
"ltr": "images/icons/unLock-ltr.svg",
"rtl": "images/icons/unLock-rtl.svg"
} },
-   "unStar": { "file": "images/icons/unStar.svg" }
-
-
+   "star": { "file": "images/icons/star.svg" },
+   "unStar": { "file": "images/icons/unStar.svg" },
+   "trash": { "file": "images/icons/trash.svg" },
+   "unTrash": { "file": {
+   "ltr": "images/icons/unTrash-ltr.svg",
+   "rtl": "images/icons/unTrash-rtl.svg"
+   } },
+   "trashUndo": { "file": {
+   "ltr":

[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/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...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...News[master]: Replace deprecated Article::getContent with ContentHandler u...

2017-01-03 Thread Victorbarbu (Code Review)

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

Change subject: Replace deprecated Article::getContent with ContentHandler usage
..

Replace deprecated Article::getContent with ContentHandler usage

Bug: T151973
Change-Id: I86858a9a3c30fa2714ce576cdd8be5ea58fe19da
---
M NewsRenderer.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/News 
refs/changes/00/330200/1

diff --git a/NewsRenderer.php b/NewsRenderer.php
index e8da045..8809c5c 100644
--- a/NewsRenderer.php
+++ b/NewsRenderer.php
@@ -523,7 +523,9 @@
 
if ( stripos($templatetext, '{{{content}}}')!==false || 
stripos($templatetext, '{{{head}}}')!==false ) {
$article = new Article( $title, 
$row->rc_this_oldid );
-   $t = $article->getContent();
+   $wikiPage = WikiPage::factory( 
$article->getTitle() );
+   $content = $wikiPage->getContent();
+   $t = ContentHandler::getContentText( $content );
 
//TODO: expand variables & templates first, so 
cut-off applies to effective content,
//  and extension tags from templates are 
stripped properly

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86858a9a3c30fa2714ce576cdd8be5ea58fe19da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/News
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use EntityIdPager interface from DataModel Services

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

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

Change subject: Use EntityIdPager interface from DataModel Services
..


Use EntityIdPager interface from DataModel Services

This is a 100% copy-paste job. We already require the Services
version needed for this.

Change-Id: I7d522ef949f6980961cba3da48ab350d00134cd7
---
M repo/includes/Dumpers/DumpGenerator.php
M repo/includes/IO/EntityIdReader.php
D repo/includes/Store/EntityIdPager.php
M repo/includes/Store/Sql/ItemsPerSiteBuilder.php
M repo/includes/Store/Sql/SqlEntityIdPager.php
M repo/includes/Store/Sql/SqlEntityIdPagerFactory.php
M repo/maintenance/dumpEntities.php
M repo/maintenance/dumpRdf.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/Store/MockEntityIdPager.php
M repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php
M repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php
M repo/tests/phpunit/maintenance/dumpJsonTest.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
14 files changed, 13 insertions(+), 62 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/includes/Dumpers/DumpGenerator.php 
b/repo/includes/Dumpers/DumpGenerator.php
index 65f6323..a827959 100644
--- a/repo/includes/Dumpers/DumpGenerator.php
+++ b/repo/includes/Dumpers/DumpGenerator.php
@@ -12,7 +12,7 @@
 use Wikibase\Lib\Reporting\NullMessageReporter;
 use Wikibase\Lib\Reporting\RethrowingExceptionHandler;
 use Wikibase\Lib\Store\StorageException;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
 
 /**
  * DumpGenerator generates a dump of a given set of entities, excluding
diff --git a/repo/includes/IO/EntityIdReader.php 
b/repo/includes/IO/EntityIdReader.php
index f76f933..3f8dbca 100644
--- a/repo/includes/IO/EntityIdReader.php
+++ b/repo/includes/IO/EntityIdReader.php
@@ -8,7 +8,7 @@
 use Wikibase\Lib\Reporting\ExceptionHandler;
 use Wikibase\Lib\Reporting\RethrowingExceptionHandler;
 use Wikibase\Repo\Disposable;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
 
 /**
  * EntityIdReader reads entity IDs from a file, one per line.
diff --git a/repo/includes/Store/EntityIdPager.php 
b/repo/includes/Store/EntityIdPager.php
deleted file mode 100644
index a16dab3..000
--- a/repo/includes/Store/EntityIdPager.php
+++ /dev/null
@@ -1,49 +0,0 @@
-https://gerrit.wikimedia.org/r/330161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d522ef949f6980961cba3da48ab350d00134cd7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Fix failing tests after adding tags parameter to core ApiUse...

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

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

Change subject: Fix failing tests after adding tags parameter to core 
ApiUserrights
..


Fix failing tests after adding tags parameter to core ApiUserrights

Broken after I4f6dacd0ddf7b45d62aff6f85c329bc15be27daf. Ideally the
parameter would be unset in an overridden getAllowedParams(), but that
would cause undefined variable errors.

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 9d14736..9b6eb8e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -513,6 +513,7 @@
"apihelp-globaluserrights-param-add": "Add the user to these global 
groups.",
"apihelp-globaluserrights-param-remove": "Remove the user from these 
global groups.",
"apihelp-globaluserrights-param-reason": "Reason for the change.",
+   "apihelp-globaluserrights-param-tags": "This parameter is currently 
unused.",
"apihelp-globaluserrights-example-1": "Add user FooBot to global group 
\"bot\", and remove from global groups \"sysop\" and \"bureaucrat\"",
"apihelp-globaluserrights-example-2": "Add the global user with ID 123 
to global group \"bot\", and remove from global groups \"sysop\" and 
\"bureaucrat\"",
"apihelp-query+globalallusers-description": "Enumerate all global 
users.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 716a8d7..0c17fa1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -529,6 +529,7 @@
"apihelp-globaluserrights-param-add": 
"{{doc-apihelp-param|globaluserrights|add}}",
"apihelp-globaluserrights-param-remove": 
"{{doc-apihelp-param|globaluserrights|remove}}",
"apihelp-globaluserrights-param-reason": 
"{{doc-apihelp-param|globaluserrights|reason}}",
+   "apihelp-globaluserrights-param-tags": 
"{{doc-apihelp-param|globaluserrights|tags}}",
"apihelp-globaluserrights-example-1": 
"{{doc-apihelp-example|globaluserrights}}",
"apihelp-globaluserrights-example-2": 
"{{doc-apihelp-example|globaluserrights}}",
"apihelp-query+globalallusers-description": 
"{{doc-apihelp-description|query+globalallusers}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2761820a3f52061361a15bc9d9a5927620edb5d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace SiteLookup mocks with HashSiteStore

2017-01-03 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330201 )

Change subject: Replace SiteLookup mocks with HashSiteStore
..

Replace SiteLookup mocks with HashSiteStore

In some cases it does not make that much of a difference, but in some
cases this greatly reduces the complexity of the code, making it much
easier to read.

Change-Id: If5580a400451d1bb714be9a760b5c7e87df67567
---
M repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
M repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
M repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
6 files changed, 29 insertions(+), 68 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php 
b/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
index 7a9da5d..e01ef84 100644
--- a/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
+++ b/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
@@ -3,7 +3,9 @@
 namespace Wikibase\Repo\Tests\Api;
 
 use ApiBase;
+use HashSiteStore;
 use MediaWikiSite;
+use Site;
 use SiteLookup;
 use Title;
 use ApiUsageException;
@@ -38,17 +40,13 @@
 * @return SiteLookup
 */
public function getSiteLookupMock() {
-   $dummySite = new MediaWikiSite();
+   $site = $this->getMock( Site::class );
 
-   $siteLookupMock = $this->getMockBuilder( SiteLookup::class )
-   ->disableOriginalConstructor()
-   ->getMock();
+   $site->expects( $this->any() )
+   ->method( 'getGlobalId' )
+   ->will( $this->returnValue( 'FooSite' ) );
 
-   $siteLookupMock->expects( $this->any() )
-   ->method( 'getSite' )
-   ->will( $this->returnValue( $dummySite ) );
-
-   return $siteLookupMock;
+   return new HashSiteStore( [ $site ] );
}
 
/**
diff --git 
a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php 
b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
index 39119b8..0372014 100644
--- a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
+++ b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\DataValue;
 use DataValues\DecimalValue;
+use HashSiteStore;
 use Language;
 use PHPUnit_Framework_TestCase;
 use Site;
@@ -104,14 +105,7 @@
$acme->setGlobalId( 'acme' );
$acme->setLinkPath( "http://acme.com/$1; );
 
-   $mock = $this->getMock( SiteLookup::class );
-   $mock->expects( $this->any() )
-   ->method( 'getSite' )
-   ->will( $this->returnValueMap( [
-   [ 'acme', $acme ],
-   ] ) );
-
-   return $mock;
+   return new HashSiteStore( [ $acme ] );
}
 
 }
diff --git a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
index d5b3ddb..518000f 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Repo\Tests\Specials;
 
 use FauxResponse;
+use HashSiteStore;
 use InvalidArgumentException;
 use Site;
 use SiteLookup;
@@ -53,22 +54,11 @@
 * @return SiteLookup
 */
private function getMockSiteLookup() {
-   $mock = $this->getMock( SiteLookup::class );
-   $mock->expects( $this->any() )
-   ->method( 'getSite' )
-   ->will( $this->returnCallback( function( $siteId ) {
-   if ( substr( $siteId, -4 ) !== 'wiki' ) {
-   return null;
-   }
+   $dewiki = new Site();
+   $dewiki->setGlobalId( 'dewiki' );
+   $dewiki->setLinkPath( 'http://dewiki.com/$1' );
 
-   $site = new Site();
-   $site->setGlobalId( $siteId );
-   $site->setLinkPath( 'http://'.$siteId.'.com/$1' 
);
-
-   return $site;
-   } ) );
-
-   return $mock;
+   return new HashSiteStore( [ $dewiki ] );
}
 
/**
diff --git a/repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php

[MediaWiki-commits] [Gerrit] translatewiki[master]: Add PdfBook from GitHub

2017-01-03 Thread Nikerabbit (Code Review)

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

Change subject: Add PdfBook from GitHub
..

Add PdfBook from GitHub

Bug: T143684
Change-Id: I15be9a903a533428a8c4bb5f3be2d3f6e1b09c13
---
M groups/MediaWiki/mwgithub.yaml
M repoconfig.commit.json
M repoconfig.json
3 files changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/02/330202/1

diff --git a/groups/MediaWiki/mwgithub.yaml b/groups/MediaWiki/mwgithub.yaml
index de18d46..c0aafb0 100644
--- a/groups/MediaWiki/mwgithub.yaml
+++ b/groups/MediaWiki/mwgithub.yaml
@@ -324,3 +324,13 @@
 FILES:
   class: JsonFFS
   sourcePattern: 
"%GROUPROOT%/mwgithub/Nikerabbit/mediawiki-extensions-FinnFrameNet/i18n/%CODE%.json"
+
+---
+BASIC:
+  id: mwgithub-pdfbook
+  label: Pdf Book
+  description: "{{Special:MyLanguage/MediaWiki:pdfbook-desc/en}}"
+
+FILES:
+  class: JsonFFS
+  sourcePattern: 
"%GROUPROOT%/mwgithub/OrganicDesign/extensions/MediaWiki/PdfBook/i18n/%CODE%.json"
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index e234617..c91b57f 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -288,6 +288,10 @@
"type": "github",
"url": 
"g...@github.com:Nikerabbit/mediawiki-extensions-FinnFrameNet.git"
},
+   "mwgithub/OrganicDesign/extensions": {
+   "type": "github",
+   "url": 
"g...@github.com:OrganicDesign/extensions"
+   },
"mwgithub/SemanticMediaWiki/SemanticBreadcrumbLinks": {
"type": "git",
"url": 
"g...@github.com:SemanticMediaWiki/SemanticBreadcrumbLinks.git"
diff --git a/repoconfig.json b/repoconfig.json
index 379eb1b..1fab403 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -283,6 +283,10 @@
"type": "github",
"url": 
"https://github.com/Nikerabbit/mediawiki-extensions-FinnFrameNet.git;
},
+   "mwgithub/OrganicDesign/extensions": {
+   "type": "github",
+   "url": 
"https://github.com/OrganicDesign/extensions;
+   },
"mwgithub/SemanticMediaWiki/SemanticBreadcrumbLinks": {
"type": "git",
"url": 
"https://github.com/SemanticMediaWiki/SemanticBreadcrumbLinks.git;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15be9a903a533428a8c4bb5f3be2d3f6e1b09c13
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...TwoColConflict[master]: Small refactoring of the HTML composing

2017-01-03 Thread WMDE-Fisch (Code Review)

WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330209 )

Change subject: Small refactoring of the HTML composing
..

Small refactoring of the HTML composing

Addressing comments in
https://gerrit.wikimedia.org/r/#/c/322128/9/includes/TwoColConflictPage.php@75

Change-Id: Iaf8e320e924e8d3fa89c3357504dbf3a68c5854b
---
M includes/TwoColConflictPage.php
1 file changed, 12 insertions(+), 9 deletions(-)


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

diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 996d369..74d17eb 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -58,7 +58,16 @@
 * @return string
 */
private function addEditFormBeforeContent() {
-   return $this->buildConflictPageChangesCol() . 
$this->buildConflictPageEditorCol();
+   $out = $this->buildConflictPageChangesCol();
+
+   $editorClass = '';
+   if ( $this->wikiEditorIsEnabled() ) {
+   $editorClass = ' mw-twocolconflict-wikieditor';
+   }
+   $out.= '';
+   $out.= $this->buildConflictPageEditorCol();
+
+   return $out;
}
 
/**
@@ -67,7 +76,7 @@
 * @return string
 */
private function addEditFormAfterContent() {
-   // this div is opened when encapsulating the editor in 
buildConflictPageEditorCol.
+   // this div is opened when encapsulating the default editor in 
addEditFormBeforeContent.
return '';
}
 
@@ -171,13 +180,7 @@
$lastChangeTime, $this->context->getUser()
);
 
-   $editorClass = '';
-   if ( $this->wikiEditorIsEnabled() ) {
-   $editorClass = ' mw-twocolconflict-wikieditor';
-   }
-
-   $out = '';
-   $out.= '' . $this->getContext()->msg( 
'twoColConflict-editor-col-title' ) . '';
+   $out = '' . $this->getContext()->msg( 
'twoColConflict-editor-col-title' ) . '';
$out.= '' . 
$this->getContext()->msg(
'twoColConflict-editor-col-desc', $lastUser, 
$lastChangeTime
) . '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf8e320e924e8d3fa89c3357504dbf3a68c5854b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Use HTML tags as insertables for MediaWiki messages

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

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

Change subject: Use HTML tags as insertables for MediaWiki messages
..


Use HTML tags as insertables for MediaWiki messages

Bug: T106632
Change-Id: I1abb3b1128ae8768cab48042dcb1657326776cde
---
M insertables/MediaWikiInsertablesSuggester.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/insertables/MediaWikiInsertablesSuggester.php 
b/insertables/MediaWikiInsertablesSuggester.php
index f4a9cbf..ca49c0a 100644
--- a/insertables/MediaWikiInsertablesSuggester.php
+++ b/insertables/MediaWikiInsertablesSuggester.php
@@ -33,6 +33,13 @@
}, $matches );
$insertables = array_merge( $insertables, $new );
 
+   $matches = array();
+   preg_match_all( '/<\/?[a-z]+>/', $text, $matches, 
PREG_SET_ORDER );
+   $new = array_map( function( $match ) {
+   return new Insertable( $match[0], $match[0] );
+   }, $matches );
+   $insertables = array_merge( $insertables, $new );
+
return $insertables;
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Introduced form field for content language

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

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

Change subject: Introduced form field for content language
..


Introduced form field for content language

Change-Id: I1c432364143a346693f1e6cbc5085e83c7ecd2d6
---
M repo/i18n/en.json
M repo/i18n/qqq.json
A repo/includes/Specials/HTMLForm/HTMLContentLanguageField.php
M repo/includes/Specials/SpecialNewItem.php
M repo/includes/Specials/SpecialNewProperty.php
A repo/tests/phpunit/includes/Specials/HTMLForm/HTMLContentLanguageFieldTest.php
6 files changed, 172 insertions(+), 28 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 727b9f8..1fddc2b 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -50,6 +50,8 @@
"wikibase-aliases-edit-placeholder": "enter some aliases",
"wikibase-aliases-edit-placeholder-language-aware": "enter some aliases 
in $1",
"wikibase-aliases-edit-label": "Aliases, pipe-separated:",
+   "wikibase-content-language-edit-label": "Language:",
+   "wikibase-content-language-edit-not-recognized-language": "The supplied 
language code was not recognized.",
"wikibase-diffview-reference": "reference",
"wikibase-diffview-rank": "rank",
"wikibase-diffview-rank-preferred": "Preferred rank",
@@ -182,7 +184,6 @@
"wikibase-newitem-page": "Name of the first linked page",
"wikibase-newitem-no-external-page": "A page \"$2\" could not be found 
on \"$1\".",
"wikibase-newitem-not-recognized-siteid": "The provided site identifier 
was not recognized.",
-   "wikibase-newitem-not-recognized-language": "The supplied language code 
was not recognized.",
"wikibase-newitem-insufficient-data": "You need to fill at least either 
label, description or aliases.",
"wikibase-newentity-language": "Language:",
"wikibase-newentity-label": "Label:",
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index af7c8f1..2bd8d5f 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -81,6 +81,8 @@
"wikibase-aliases-edit-placeholder": "This is a generic text used as a 
placeholder while editing a new list of pipe-separated aliases.",
"wikibase-aliases-edit-placeholder-language-aware": "Like 
{{msg-mw|Wikibase-aliases-edit-placeholder}}, but language ($1) aware.",
"wikibase-aliases-edit-label": "Generic label for the \"aliases\" text 
field holding the pipe-separated aliases.",
+   "wikibase-content-language-edit-label": "Generic label for the 
\"language\" field.\n{{Identical|Language}}",
+   "wikibase-content-language-edit-not-recognized-language": "Error 
message shown when a user enters an unknown language code into a \"language\" 
field.\n\nSee also:\n* {{msg-mw|Wikibase-api-not-recognized-language}}",
"wikibase-diffview-reference": "Label within the header of a 
diff-operation on the entity diff view to describe that the diff-operation 
affects a reference. Will be shown as e.g. \"claim / property q1 / 
reference\".\n{{Identical|Reference}}",
"wikibase-diffview-rank": "Label within the header of a diff-operation 
on the entity diff view to describe that the diff-operation affects the rank of 
the statement. Will be shown as e.g. \"claim / property q1 / 
rank\".\n{{Identical|Rank}}",
"wikibase-diffview-rank-preferred": "The 
[[d:Wikidata:Glossary#Rank-preferred|Preferred Rank]] to be shown in diffs.",
@@ -213,7 +215,6 @@
"wikibase-newitem-page": "Label for the page-textfield holding the page 
name of the first linked page to add to the new item",
"wikibase-newitem-no-external-page": "Error message shown when a user 
tries to add a page that does not exist on the site chosen.\n\nParameters:\n* 
$1 - global site ID, known to be valid\n* $2 - requested page name that could 
not be found on the site\n{{Related|Wikibase-no-external-page}}",
"wikibase-newitem-not-recognized-siteid": "Error message shown when a 
user tries to add a link to a site with an unknown identifier.\n\nSee also:\n* 
{{msg-mw|Wikibase-api-not-recognized-siteid}}",
-   "wikibase-newitem-not-recognized-language": "Error message shown when a 
user tries to create an item with an unknown language code.\n\nSee also:\n* 
{{msg-mw|Wikibase-api-not-recognized-language}}",
"wikibase-newitem-insufficient-data": "Error message shown when a user 
tries to create an item and didn't fill in enough data",
"wikibase-newentity-language": "Name for \"language\"",
"wikibase-newentity-label": "Label for the \"label\" textfield holding 
the label of the new item.\n{{Identical|Label}}",
diff --git a/repo/includes/Specials/HTMLForm/HTMLContentLanguageField.php 
b/repo/includes/Specials/HTMLForm/HTMLContentLanguageField.php
new file mode 100644
index 000..28e5a05
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Adapt to changed Wikibase\Repo\Tests\… namespace

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

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

Change subject: Adapt to changed Wikibase\Repo\Tests\… namespace
..


Adapt to changed Wikibase\Repo\Tests\… namespace

Depends-On: I55412bf7cea1880a5e9e49634f9f6a893cc2aa80
Change-Id: Ia5e08b599d7fb9ae0085b772b1377e22febd3d91
---
M tests/phpunit/Api/RunCrossCheckTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  Addshore: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/tests/phpunit/Api/RunCrossCheckTest.php 
b/tests/phpunit/Api/RunCrossCheckTest.php
index b231348..eb10f71 100644
--- a/tests/phpunit/Api/RunCrossCheckTest.php
+++ b/tests/phpunit/Api/RunCrossCheckTest.php
@@ -14,7 +14,7 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Statement\StatementGuid;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
+use Wikibase\Repo\Tests\Api\WikibaseApiTestCase;
 use 
WikibaseQuality\ExternalValidation\DumpMetaInformation\SqlDumpMetaInformationRepo;
 use WikibaseQuality\ExternalValidation\ExternalDataRepo;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e08b599d7fb9ae0085b772b1377e22febd3d91
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add language fallback for gom as for gom-deva, its fallback

2017-01-03 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330205 )

Change subject: Add language fallback for gom as for gom-deva, its fallback
..

Add language fallback for gom as for gom-deva, its fallback

Consisency is needed and falling back from Goan Konkani to Hindi is
probably appropriate. I could not find official statistics or other
research, but officious information indicates that most Goan Konkani
speakers, at least in Goa, do understand Hindi, also thanks to the
tourism business and Bollywood.
http://goastreets.com/goa-rise-hindi/
http://www.goatourism.gov.in/people/languageEnd

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


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

diff --git a/languages/messages/MessagesGom.php 
b/languages/messages/MessagesGom.php
index fb26675..ffc0523 100644
--- a/languages/messages/MessagesGom.php
+++ b/languages/messages/MessagesGom.php
@@ -8,4 +8,4 @@
  *
  */
 
-$fallback = 'gom-deva';
+$fallback = 'gom-deva, hi';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a70e46ad5d1496bdc8753d6552e945ba065823b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Remove unused methods from DumpMetaInformationLookup interface

2017-01-03 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330211 )

Change subject: Remove unused methods from DumpMetaInformationLookup interface
..

Remove unused methods from DumpMetaInformationLookup interface

I believe we still want to keep this code in a shape that we can
continue working on it. This includes removing as much unneeded stuff
as possible.

I found this with a fulltext search for "fixme" and "todo". Note that
the implementation was incomplete.

Change-Id: I69b1b599b9d24fc775d848191f1ebd5aa7b7bc57
---
M includes/DumpMetaInformation/DumpMetaInformationLookup.php
M includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
M tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
3 files changed, 0 insertions(+), 75 deletions(-)


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

diff --git a/includes/DumpMetaInformation/DumpMetaInformationLookup.php 
b/includes/DumpMetaInformation/DumpMetaInformationLookup.php
index a964ef2..ad07288 100644
--- a/includes/DumpMetaInformation/DumpMetaInformationLookup.php
+++ b/includes/DumpMetaInformation/DumpMetaInformationLookup.php
@@ -2,7 +2,6 @@
 
 namespace WikibaseQuality\ExternalValidation\DumpMetaInformation;
 
-use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
 
 /**
@@ -12,15 +11,6 @@
  * @license GNU GPL v2+
  */
 interface DumpMetaInformationLookup {
-
-   /**
-* Gets DumpMetaInformation for specific dump id from database.
-*
-* @param $dumpId
-* @return DumpMetaInformation
-* @throws \InvalidArgumentException
-*/
-   public function getWithId( $dumpId );
 
/**
 * Gets DumpMetaInformation for specific dump ids from database
@@ -41,13 +31,6 @@
 * @return DumpMetaInformation[]
 */
public function getWithIdentifierProperties( array 
$identifierPropertyIds );
-
-   /**
-* Gets id of item that represents the data source for each dump.
-*
-* @return ItemId[]
-*/
-   public function getSourceItemIds();
 
/**
 * Gets all DumpMetaInformation from database
diff --git a/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php 
b/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
index 1623537..0371b82 100644
--- a/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
+++ b/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php
@@ -22,23 +22,6 @@
const IDENTIFIER_PROPERTIES_TABLE_NAME = 'wbqev_identifier_properties';
 
/**
-* Gets DumpMetaInformation for specific dump id from database.
-*
-* @param $dumpId
-* @return DumpMetaInformation
-* @throws InvalidArgumentException
-*/
-   public function getWithId( $dumpId ) {
-   if ( !is_string( $dumpId ) ) {
-   throw new InvalidArgumentException( '$dumpId must be 
string.' );
-   }
-
-   $dumpMetaInformation = $this->getWithIds( array( $dumpId ) );
-
-   return reset( $dumpMetaInformation );
-   }
-
-   /**
 * Gets DumpMetaInformation for specific dump ids from database
 * Returns array in the form 'dumpId' => DumpMetaInformation
 *
@@ -122,30 +105,6 @@
}
 
return array();
-   }
-
-   /**
-* Gets id of item that represents the data source for each dump.
-*
-* @return ItemId[]
-*/
-   public function getSourceItemIds() {
-   $db = wfGetDB( DB_SLAVE );
-   $result = $db->selectFieldValues(
-   self::META_TABLE_NAME,
-   'source_qid',
-   array(),
-   __METHOD__,
-   'DISTINCT'
-   );
-
-   $sourceItemIds = $result; // TODO: Parse as ItemId, when 
ItemIds are used in violation table
-   /*$sourceItemIds = array();
-   foreach ( $result as $itemId ) {
-   $sourceItemIds = new ItemId( $itemId );
-   }*/
-
-   return $sourceItemIds;
}
 
/**
diff --git 
a/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php 
b/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
index ca3ec05..d0d661c 100644
--- a/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
+++ b/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php
@@ -130,17 +130,6 @@
}
 
/**
-* @dataProvider getWithIdDataProvider
-*/
-   public function testGetWithId( $dumpId, $expectedDumpMetaInformation, 
$expectedException = null ) {
-   $this->setExpectedException( $expectedException );
-
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::docker::builder: add alpine linux

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330207 )

Change subject: profile::docker::builder: add alpine linux
..

profile::docker::builder: add alpine linux

Also, adapt the coding to our own coding standards.

Change-Id: I82dc465018184d558a12864fd9a150b4782cd100
---
M modules/profile/manifests/docker/builder.pp
1 file changed, 20 insertions(+), 5 deletions(-)


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

diff --git a/modules/profile/manifests/docker/builder.pp 
b/modules/profile/manifests/docker/builder.pp
index 85ae87f..1d68af2 100644
--- a/modules/profile/manifests/docker/builder.pp
+++ b/modules/profile/manifests/docker/builder.pp
@@ -1,16 +1,31 @@
-class profile::docker::builder {
-$proxy_address = hiera('profile::docker::builder::proxy_address')
-$proxy_port = hiera('profile::docker::builder::proxy_port')
+# == Class profile::docker::builder
+#
+# This class sets up a docker builder server, where our base images can be 
built
+# and uploaded to the docker registry.
+#
+# === Parameters
+#
+# [*proxy_address*] The http proxy address, set to undef if you don't want to 
use item
+#
+# [*proxy_port*] The http proxy port; set to undef if not needed
+#
+# [*registry*] Address of the docker registry.
+#
+class profile::docker::builder(
+$proxy_address = hiera('profile::docker::builder::proxy_address'),
+$proxy_port = hiera('profile::docker::builder::proxy_port'),
+$registry = hiera('docker::registry'),
+) {
 
 system::role { 'role::docker::builder':
 description => 'Docker images builder'
 }
 
 class { 'docker::baseimages':
-docker_registry => hiera('docker::registry'),
+docker_registry =>
 proxy_address   => $proxy_address,
 proxy_port  => $proxy_port,
-distributions   => ['jessie'],
+distributions   => ['jessie', 'alpine'],
 }
 
 # TODO: create a repo for base images in prod for this

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82dc465018184d558a12864fd9a150b4782cd100
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker::baseimages: add support for alpine linux

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330206 )

Change subject: docker::baseimages: add support for alpine linux
..

docker::baseimages: add support for alpine linux

Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
---
M modules/docker/manifests/baseimages.pp
M modules/docker/templates/images/build-base-images.erb
2 files changed, 37 insertions(+), 1 deletion(-)


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

diff --git a/modules/docker/manifests/baseimages.pp 
b/modules/docker/manifests/baseimages.pp
index 5d576d1..bf84a22 100644
--- a/modules/docker/manifests/baseimages.pp
+++ b/modules/docker/manifests/baseimages.pp
@@ -47,7 +47,24 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0544',
-require => File['/srv/images/base']
+require => File['/srv/images/base'],
+}
+
+if 'alpine' in $distributions {
+if $proxy_address {
+$env = ["https_proxy=http://${proxy_address}:${proxy_port};]
+}
+else {
+$env = undef
+}
+
+exec { 'git clone alpine linux':
+command => '/usr/bin/git clone 
https://github.com/gliderlabs/docker-alpine.git alpine',
+creates => '/srv/images/alpine',
+cwd => '/srv/images',
+environment => $env,
+require => File['/srv/images'],
+}
 }
 
 file { '/usr/local/bin/build-base-images':
diff --git a/modules/docker/templates/images/build-base-images.erb 
b/modules/docker/templates/images/build-base-images.erb
index 07bf03d..e94afa2 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -18,3 +18,22 @@
 # Push it to the repo
 docker push <%= @docker_registry %>/wikimedia-trusty
 <%- end -%>
+<%- if @distributions.include?('alpine') -%>
+
+# Build the latest alpine version
+(cd /srv/images/alpine && git checkout master && git pull --rebase)
+AP_BASE="/srv/images/alpine/versions"
+AP_VERSIONS=("${AP_BASE}/library-?.?")
+AP_DIR=${AP_VERSIONS[-1]}
+AP_BRANCH="rootfs/${AP_DIR#$AP_BASE}"
+
+(cd $ALPINE_DIR && git remote update && \
+ git checkout $AP_BRANCH && docker build .)
+# Now get the release tag from the repos own variables
+source ${AP_DIR}/options
+for tag in $TAGS; do
+docker push <%= @docker_registry %>/${tag};
+done;
+# This is the latest version, so...
+docker push <%= @docker_registry %>/alpine
+<%- end -%>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Do not try to change directory when running Phan tests with ...

2017-01-03 Thread WMDE-leszek (Code Review)

WMDE-leszek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330204 )

Change subject: Do not try to change directory when running Phan tests with no 
params
..

Do not try to change directory when running Phan tests with no params

When running tests with:
PHAN=/path/to/phan/phan /path/to/mediawiki-core/tests/phan/bin/phan
the script changes to the home dir (does "cd" with no param),
which results in git error message (unless the home dir happens
to be a git repository).

Change-Id: Ib11e419fb5cca51ceaed0e9c7c86ae9c5c4ae0f2
---
M tests/phan/bin/phan
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/330204/1

diff --git a/tests/phan/bin/phan b/tests/phan/bin/phan
index 6ce1e84..61ad7da 100755
--- a/tests/phan/bin/phan
+++ b/tests/phan/bin/phan
@@ -31,7 +31,7 @@
 
 # If the first argument doesn't start with a -, then it's a path
 # to another project (extension, skin, etc.) to analyze
-if [[ "$1" != "-"* ]]; then
+if [[ -n "$1" && "$1" != "-"* ]]; then
cd $1
shift
 else

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib11e419fb5cca51ceaed0e9c7c86ae9c5c4ae0f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add accessor to DeferredUpdates

2017-01-03 Thread Hashar (Code Review)

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

Change subject: Add accessor to DeferredUpdates
..

Add accessor to DeferredUpdates

Updates are stored in private variables which is not convenient when
testing deferred updates.  Add a getPendingUpdates() accessor. The stage
can be specified to only retrieve PRE or POST ones.

Change-Id: I1af730ec5e48bc0be555a8db4611a76eb9332444
---
M includes/deferred/DeferredUpdates.php
M tests/phpunit/includes/deferred/DeferredUpdatesTest.php
2 files changed, 44 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/330212/1

diff --git a/includes/deferred/DeferredUpdates.php 
b/includes/deferred/DeferredUpdates.php
index 1ba6c1f..8b0d5ba 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -335,6 +335,21 @@
}
 
/**
+* @param integer $stage DeferredUpdates constant (PRESEND, POSTSEND, 
or ALL)
+* @since 1.29
+*/
+   public static function getPendingUpdates( $stage = self::ALL ) {
+   $updates = [];
+   if ( $stage === self::ALL || $stage === self::PRESEND ) {
+   $updates = array_merge( $updates, self::$preSendUpdates 
);
+   }
+   if ( $stage === self::ALL || $stage === self::POSTSEND ) {
+   $updates = array_merge( $updates, 
self::$postSendUpdates );
+   }
+   return $updates;
+   }
+
+   /**
 * Clear all pending updates without performing them. Generally, you 
don't
 * want or need to call this. Unit tests need it though.
 */
diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php 
b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index 4227693..530dbe3 100644
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -1,6 +1,35 @@
 getMockBuilder( 'DeferrableUpdate' )
+ ->getMock();
+   $update->expects( $this->never() )
+   ->method( 'doUpdate' );
+
+   DeferredUpdates::addUpdate( $update, $pre );
+   $this->assertCount( 1, DeferredUpdates::getPendingUpdates( $pre 
) );
+   $this->assertCount( 0, DeferredUpdates::getPendingUpdates( 
$post ) );
+   $this->assertCount( 1, DeferredUpdates::getPendingUpdates( $all 
) );
+   $this->assertCount( 1, DeferredUpdates::getPendingUpdates( ) );
+   DeferredUpdates::clearPendingUpdates();
+
+   DeferredUpdates::addUpdate( $update, $post );
+   $this->assertCount( 0, DeferredUpdates::getPendingUpdates( $pre 
) );
+   $this->assertCount( 1, DeferredUpdates::getPendingUpdates( 
$post ) );
+   $this->assertCount( 1, DeferredUpdates::getPendingUpdates( $all 
) );
+   $this->assertCount( 1, DeferredUpdates::getPendingUpdates( ) );
+   DeferredUpdates::clearPendingUpdates();
+   }
+
public function testDoUpdatesWeb() {
$this->setMwGlobals( 'wgCommandLineMode', false );
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker::baseimages: add support for alpine linux

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

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

Change subject: docker::baseimages: add support for alpine linux
..


docker::baseimages: add support for alpine linux

Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
---
M modules/docker/manifests/baseimages.pp
M modules/docker/templates/images/build-base-images.erb
2 files changed, 37 insertions(+), 1 deletion(-)

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



diff --git a/modules/docker/manifests/baseimages.pp 
b/modules/docker/manifests/baseimages.pp
index 5d576d1..bf84a22 100644
--- a/modules/docker/manifests/baseimages.pp
+++ b/modules/docker/manifests/baseimages.pp
@@ -47,7 +47,24 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0544',
-require => File['/srv/images/base']
+require => File['/srv/images/base'],
+}
+
+if 'alpine' in $distributions {
+if $proxy_address {
+$env = ["https_proxy=http://${proxy_address}:${proxy_port};]
+}
+else {
+$env = undef
+}
+
+exec { 'git clone alpine linux':
+command => '/usr/bin/git clone 
https://github.com/gliderlabs/docker-alpine.git alpine',
+creates => '/srv/images/alpine',
+cwd => '/srv/images',
+environment => $env,
+require => File['/srv/images'],
+}
 }
 
 file { '/usr/local/bin/build-base-images':
diff --git a/modules/docker/templates/images/build-base-images.erb 
b/modules/docker/templates/images/build-base-images.erb
index 07bf03d..e94afa2 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -18,3 +18,22 @@
 # Push it to the repo
 docker push <%= @docker_registry %>/wikimedia-trusty
 <%- end -%>
+<%- if @distributions.include?('alpine') -%>
+
+# Build the latest alpine version
+(cd /srv/images/alpine && git checkout master && git pull --rebase)
+AP_BASE="/srv/images/alpine/versions"
+AP_VERSIONS=("${AP_BASE}/library-?.?")
+AP_DIR=${AP_VERSIONS[-1]}
+AP_BRANCH="rootfs/${AP_DIR#$AP_BASE}"
+
+(cd $ALPINE_DIR && git remote update && \
+ git checkout $AP_BRANCH && docker build .)
+# Now get the release tag from the repos own variables
+source ${AP_DIR}/options
+for tag in $TAGS; do
+docker push <%= @docker_registry %>/${tag};
+done;
+# This is the latest version, so...
+docker push <%= @docker_registry %>/alpine
+<%- end -%>

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

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

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

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

2017-01-03 Thread WikidataBuilder (Code Review)

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

Change subject: New Wikidata Build - 2017-01-03T10:00:01+
..

New Wikidata Build - 2017-01-03T10:00:01+

Change-Id: I3cdea4f388d0ae549b66899d42f485d703a0fdb1
---
M composer.lock
M extensions/Constraints/composer.json
M extensions/ExternalValidation/composer.json
M extensions/Quality/composer.json
M extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
M extensions/Wikibase/lib/tests/phpunit/Units/UnitConverterTest.php
M extensions/Wikibase/lib/tests/phpunit/Units/UnitStorageTest.php
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOp.php
M extensions/Wikibase/repo/includes/DataTypeSelector.php
A extensions/Wikibase/repo/includes/Specials/HTMLForm/HTMLAliasesField.php
M extensions/Wikibase/repo/includes/Specials/SpecialListProperties.php
M extensions/Wikibase/repo/includes/Specials/SpecialNewItem.php
M extensions/Wikibase/repo/includes/Specials/SpecialNewProperty.php
M extensions/Wikibase/repo/maintenance/addUnitConversions.php
M extensions/Wikibase/repo/maintenance/updateUnits.php
M extensions/Wikibase/repo/tests/phpunit/includes/DataTypeSelectorTest.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/HTMLForm/HTMLAliasesFieldTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewItemTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewPropertyTest.php
M extensions/Wikibase/repo/tests/phpunit/maintenance/UpdateUnitsTest.php
M 
extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
M 
extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js
M extensions/Wikibase/view/src/StatementGroupListView.php
M extensions/Wikibase/view/src/ViewFactory.php
A extensions/WikimediaBadges/Gruntfile.js
A extensions/WikimediaBadges/package.json
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
30 files changed, 562 insertions(+), 130 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 64e73dc..6fa6faf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -990,7 +990,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "f73f5829b770fa6cb8107de640f145ae15ad3b24"
+"reference": "572b4c167a56ad998c8201c6e0d27aa85cb364d9"
 },
 "require": {
 "php": ">=5.3.0",
@@ -999,6 +999,7 @@
 "wikibase/data-model-services": "~2.0|~3.0"
 },
 "require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
 "phpunit/phpunit": "^3.7.37|~4.5",
 "satooshi/php-coveralls": "master-dev"
 },
@@ -1013,6 +1014,11 @@
 "classmap": [
 "WikibaseQualityConstraintsHooks.php",
 "maintenance/UpdateConstraintsTable.php"
+]
+},
+"scripts": {
+"test": [
+"parallel-lint . --exclude vendor"
 ]
 },
 "license": [
@@ -1036,7 +1042,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2017-01-02 00:14:14"
+"time": "2017-01-02 12:40:50"
 },
 {
 "name": "wikibase/data-model",
@@ -1267,7 +1273,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation;,
-"reference": "90717768e69a37db8b5ceaf639e1c48a1a37dffd"
+"reference": "1de75391b52cf46947850495880e6c587ef8ca6e"
 },
 "require": {
 "data-values/common": ">=0.1 <0.4",
@@ -1281,6 +1287,7 @@
 "wikibase/data-model-services": "~2.0|~3.0"
 },
 "require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
 "phpunit/phpunit": "~3.7,>=3.7.37",
 "satooshi/php-coveralls": "dev-master"
 },
@@ -1295,6 +1302,11 @@
 "classmap": [
 "WikibaseQualityExternalValidationHooks.php",
 "maintenance/UpdateExternalData.php"
+]
+},
+"scripts": {
+"test": [
+"parallel-lint . --exclude vendor"
 ]
 },
 "license": [
@@ -1319,7 +1331,7 @@
 "support": {

[MediaWiki-commits] [Gerrit] oojs/ui[master]: FloatableElement: Replace superfluous class with general one

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

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

Change subject: FloatableElement: Replace superfluous class with general one
..


FloatableElement: Replace superfluous class with general one

Replacing `.oo-ui-floatableElement-hidden` with general
`.oo-ui-element-hidden` class.

Change-Id: Ied0159dbba5d68d41bb9cdeaf81bdcbd03ce8d0a
---
M src/mixins/FloatableElement.js
M src/styles/elements/FloatableElement.less
2 files changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index 9da0d28..8fa82e5 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -177,10 +177,10 @@
}
 
if ( !this.isElementInViewport( this.$floatableContainer, 
this.$floatableClosestScrollable ) ) {
-   this.$floatable.addClass( 'oo-ui-floatableElement-hidden' );
+   this.$floatable.addClass( 'oo-ui-element-hidden' );
return;
} else {
-   this.$floatable.removeClass( 'oo-ui-floatableElement-hidden' );
+   this.$floatable.removeClass( 'oo-ui-element-hidden' );
}
 
if ( !this.needsCustomPosition ) {
diff --git a/src/styles/elements/FloatableElement.less 
b/src/styles/elements/FloatableElement.less
index 6abbf97..293f4fd 100644
--- a/src/styles/elements/FloatableElement.less
+++ b/src/styles/elements/FloatableElement.less
@@ -1,9 +1,5 @@
 @import '../common';
 
 .oo-ui-floatableElement {
-   &-hidden {
-   display: none;
-   }
-
.theme-oo-ui-floatableElement();
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied0159dbba5d68d41bb9cdeaf81bdcbd03ce8d0a
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix JavaScript error in section restoration

2017-01-03 Thread Nikerabbit (Code Review)

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

Change subject: Fix JavaScript error in section restoration
..

Fix JavaScript error in section restoration

See T154279 for more details and why this doesn't actually
help much.

Change-Id: I5396e4b7de85f45d26464fa34b7b846f023a2da7
---
M modules/translation/ext.cx.translation.loader.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/92/330192/1

diff --git a/modules/translation/ext.cx.translation.loader.js 
b/modules/translation/ext.cx.translation.loader.js
index 1d66c96..165e5d4 100644
--- a/modules/translation/ext.cx.translation.loader.js
+++ b/modules/translation/ext.cx.translation.loader.js
@@ -308,10 +308,10 @@
.prop( 'id', sourceSectionId );
 
if ( afterOrBefore === 'after' ) {
-   $( '#' + $section.data( 'source' ) ).after( 
$dummySourceSection );
+   mw.cx.getSourceSection( $section.data( 'source' ) 
).after( $dummySourceSection );
$section.after( $translation );
} else {
-   $( '#' + $section.data( 'source' ) ).before( 
$dummySourceSection );
+   mw.cx.getSourceSection( $section.data( 'source' ) 
).before( $dummySourceSection );
$section.before( $translation );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5396e4b7de85f45d26464fa34b7b846f023a2da7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
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...Video[master]: Remove unused method getContent

2017-01-03 Thread Victorbarbu (Code Review)

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

Change subject: Remove unused method getContent
..

Remove unused method getContent

The method was not used anywhere in the extension's scope and it
was using deprecated Article::getContent

Bug: T151973
Change-Id: I95bfc6fd2728bed9580cdd5d75db797031b8a7fb
---
M VideoPage.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Video 
refs/changes/99/330199/1

diff --git a/VideoPage.php b/VideoPage.php
index dfe4d47..92d3699 100644
--- a/VideoPage.php
+++ b/VideoPage.php
@@ -130,11 +130,6 @@
}
}
 
-   /** @todo FIXME: is this needed? If not, remove! */
-   function getContent() {
-   return Article::getContent();
-   }
-
/**
 * Get the HTML table that contains the code for embedding the current
 * video on a wiki page.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95bfc6fd2728bed9580cdd5d75db797031b8a7fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Converted Special:Tags to OOUI

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

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

Change subject: Converted Special:Tags to OOUI
..


Converted Special:Tags to OOUI

Updated forms to use OOUI with HTMLForm::factory()

Bug: T117742
Change-Id: I6ec8dd59af482ed22ac3bee29c35d4a056540ac2
---
M includes/specials/SpecialTags.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/specials/SpecialTags.php 
b/includes/specials/SpecialTags.php
index ea40cb8..e67356f 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -98,7 +98,7 @@
],
];
 
-   $form = new HTMLForm( $fields, $this->getContext() );
+   $form = HTMLForm::factory( 'ooui', $fields, 
$this->getContext() );
$form->setAction( $this->getPageTitle( 'create' 
)->getLocalURL() );
$form->setWrapperLegendMsg( 'tags-create-heading' );
$form->setHeaderText( $this->msg( 
'tags-create-explanation' )->parseAsBlock() );
@@ -312,7 +312,7 @@
$out->parse( $status->getWikiText() ) .
$this->msg( 'tags-create-warnings-below' 
)->parseAsBlock();
 
-   $subform = new HTMLForm( $fields, $this->getContext() );
+   $subform = HTMLForm::factory( 'ooui', $fields, 
$this->getContext() );
$subform->setAction( $this->getPageTitle( 'create' 
)->getLocalURL() );
$subform->setWrapperLegendMsg( 'tags-create-heading' );
$subform->setHeaderText( $headerText );
@@ -377,7 +377,7 @@
'required' => true,
];
 
-   $form = new HTMLForm( $fields, $this->getContext() );
+   $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form->setAction( $this->getPageTitle( 'delete' 
)->getLocalURL() );
$form->tagAction = 'delete'; // custom property on HTMLForm 
object
$form->setSubmitCallback( [ $this, 'processTagForm' ] );
@@ -428,7 +428,7 @@
'required' => true,
];
 
-   $form = new HTMLForm( $fields, $this->getContext() );
+   $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form->setAction( $this->getPageTitle( $actionStr 
)->getLocalURL() );
$form->tagAction = $actionStr;
$form->setSubmitCallback( [ $this, 'processTagForm' ] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ec8dd59af482ed22ac3bee29c35d4a056540ac2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Awu42 <9922y...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MtDu 
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] operations/puppet[production]: Revert NTP disabling for leap second

2017-01-03 Thread Alexandros Kosiaris (Code Review)

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

Change subject: Revert NTP disabling for leap second
..


Revert NTP disabling for leap second

Revert all commits that disabled NTP across the fleet for leap second

This reverts commit 82079564388f3ae039d8de7ee66b17a8a134268f.
This reverts commit 74ec817bb1e8ea5d7ecee5014e6a1205234c9cd7.
This reverts commit de0769badc3f08ef01fa6d3e62bcb734b801069b.

Change-Id: I187220a293e816d1363b3828ba6e0b388e882d2f
---
D hieradata/codfw/ntp/daemon.yaml
D hieradata/eqiad/ntp/daemon.yaml
D hieradata/esams/ntp/daemon.yaml
D hieradata/hosts/acamar.yaml
M hieradata/hosts/achernar.yaml
D hieradata/hosts/chromium.yaml
D hieradata/hosts/hydrogen.yaml
D hieradata/hosts/maerlant.yaml
D hieradata/hosts/nescio.yaml
D hieradata/ulsfo/ntp/daemon.yaml
M modules/standard/manifests/ntp/client.pp
11 files changed, 0 insertions(+), 11 deletions(-)

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



diff --git a/hieradata/codfw/ntp/daemon.yaml b/hieradata/codfw/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/codfw/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/hieradata/eqiad/ntp/daemon.yaml b/hieradata/eqiad/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/eqiad/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/hieradata/esams/ntp/daemon.yaml b/hieradata/esams/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/esams/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/hieradata/hosts/acamar.yaml b/hieradata/hosts/acamar.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/acamar.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/achernar.yaml b/hieradata/hosts/achernar.yaml
index 40085f2..75e02b8 100644
--- a/hieradata/hosts/achernar.yaml
+++ b/hieradata/hosts/achernar.yaml
@@ -1,4 +1,3 @@
 debdeploy::grains:
   debdeploy-dnsrecursor:
 value: canary
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/chromium.yaml b/hieradata/hosts/chromium.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/chromium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/hydrogen.yaml b/hieradata/hosts/hydrogen.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/hydrogen.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/maerlant.yaml b/hieradata/hosts/maerlant.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/maerlant.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/nescio.yaml b/hieradata/hosts/nescio.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/nescio.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/ulsfo/ntp/daemon.yaml b/hieradata/ulsfo/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/ulsfo/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/modules/standard/manifests/ntp/client.pp 
b/modules/standard/manifests/ntp/client.pp
index c30ed95..134a9a4 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -20,7 +20,6 @@
 }
 
 monitoring::service { 'ntp':
-ensure => absent,
 description=> 'NTP',
 check_command  => 'check_ntp_time!0.5!1',
 check_interval => 30,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Update deprecated UsageException to ApiUsageException

2017-01-03 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330210 )

Change subject: Update deprecated UsageException to ApiUsageException
..

Update deprecated UsageException to ApiUsageException

Change-Id: Ic19e5377ebec94c0602f419e9ac01f3b5b9bc3d4
---
M specials/SpecialExternalDatabases.php
M tests/phpunit/Api/RunCrossCheckTest.php
2 files changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/specials/SpecialExternalDatabases.php 
b/specials/SpecialExternalDatabases.php
index 3466dd2..b467154 100644
--- a/specials/SpecialExternalDatabases.php
+++ b/specials/SpecialExternalDatabases.php
@@ -12,7 +12,6 @@
 use Wikibase\Repo\WikibaseRepo;
 use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation;
 use 
WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformationLookup;
-use 
WikibaseQuality\ExternalValidation\DumpMetaInformation\SqlDumpMetaInformationRepo;
 use WikibaseQuality\ExternalValidation\ExternalValidationServices;
 use WikibaseQuality\Html\HtmlTableBuilder;
 use WikibaseQuality\Html\HtmlTableCellBuilder;
@@ -25,7 +24,7 @@
private $entityIdLinkFormatter;
 
/**
-* @var SqlDumpMetaInformationRepo
+* @var DumpMetaInformationLookup
 */
private $dumpMetaInformationRepo;
 
diff --git a/tests/phpunit/Api/RunCrossCheckTest.php 
b/tests/phpunit/Api/RunCrossCheckTest.php
index eb10f71..00dacfb 100644
--- a/tests/phpunit/Api/RunCrossCheckTest.php
+++ b/tests/phpunit/Api/RunCrossCheckTest.php
@@ -3,7 +3,7 @@
 namespace WikibaseQuality\ExternalValidation\Tests\Api;
 
 use DataValues\StringValue;
-use UsageException;
+use ApiUsageException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel\Entity\Item;
@@ -188,7 +188,7 @@
);
 
$this->setExpectedException(
-   UsageException::class,
+   ApiUsageException::class,
'Either provide the ids of entities or ids of claims, 
that should be cross-checked.'
);
 
@@ -201,7 +201,7 @@
);
 
$this->setExpectedException(
-   UsageException::class,
+   ApiUsageException::class,
'A parameter that is required was missing. (Either 
provide the ids of entities or '
. 'ids of claims, that should be 
cross-checked.)'
);
@@ -280,7 +280,7 @@
'action' => 'wbqevcrosscheck',
'claims' => 'broken-claim-guid',
);
-   $this->setExpectedException( UsageException::class, 'Invalid 
claim guid.' );
+   $this->setExpectedException( ApiUsageException::class, 'Invalid 
claim guid.' );
$this->doApiRequest( $params );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic19e5377ebec94c0602f419e9ac01f3b5b9bc3d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Greatly reduce the complexity of InfoActionHookHandlerTest

2017-01-03 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330194 )

Change subject: Greatly reduce the complexity of InfoActionHookHandlerTest
..

Greatly reduce the complexity of InfoActionHookHandlerTest

* I found this because this was mocking specific implementations instead
  of interfaces.
* InfoActionHookHandler was also expecting a specific implementation,
  but should not.
* There was an entirely unused $enabled parameter.
* I turned the $message parameter into actual names for the test cases.
* A method was mocked twice. This never triggered an error because the
  return value of this method was never used anyway. I fixed this by
  adding with() conditions.
* handle() was called with a pre-set array, even if it does not care
  about what is in this array. Replaced with [].
* Replaced a returnCallback() with a more simple returnValue().
* Inlined as well as extracted some code.
* Fixed PHPDocs.

Change-Id: Ie975283a564c2493842bdc7fec13f0d28f5122b8
---
M repo/includes/Hooks/InfoActionHookHandler.php
M repo/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
2 files changed, 65 insertions(+), 83 deletions(-)


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

diff --git a/repo/includes/Hooks/InfoActionHookHandler.php 
b/repo/includes/Hooks/InfoActionHookHandler.php
index 133c4b7..f3e5cae 100644
--- a/repo/includes/Hooks/InfoActionHookHandler.php
+++ b/repo/includes/Hooks/InfoActionHookHandler.php
@@ -6,7 +6,7 @@
 use IContextSource;
 use SiteLookup;
 use Title;
-use Wikibase\Store\Sql\SqlSubscriptionLookup;
+use Wikibase\Store\SubscriptionLookup;
 use Wikibase\Store\EntityIdLookup;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 
@@ -24,7 +24,7 @@
private $namespaceChecker;
 
/**
-* @var SqlSubscriptionLookup
+* @var SubscriptionLookup
 */
private $subscriptionLookup;
 
@@ -45,7 +45,7 @@
 
public function __construct(
EntityNamespaceLookup $namespaceChecker,
-   SqlSubscriptionLookup $subscriptionLookup,
+   SubscriptionLookup $subscriptionLookup,
SiteLookup $siteLookup,
EntityIdLookup $entityIdLookup,
IContextSource $context
@@ -77,7 +77,7 @@
/**
 * @param Title $title
 *
-* @return array
+* @return string[] HTML
 */
private function getPageInfoRow( Title $title ) {
$entity = $this->entityIdLookup->getEntityIdForTitle( $title );
@@ -93,7 +93,7 @@
 * @param string[] $subscriptions
 * @param Title $title
 *
-* @return string HTML[]
+* @return string[] HTML
 */
private function formatSubscriptions( array $subscriptions, Title 
$title ) {
$output = '';
diff --git a/repo/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php 
b/repo/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
index 847da7f..b52b600 100644
--- a/repo/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
+++ b/repo/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
@@ -5,15 +5,15 @@
 use Html;
 use IContextSource;
 use RequestContext;
-use FileBasedSiteLookup;
+use SiteLookup;
 use Site;
 use Title;
-use Wikibase\Client\Store\Sql\PagePropsEntityIdLookup;
+use Wikibase\Store\EntityIdLookup;
 use Wikibase\Lib\Store\EntityNamespaceLookup;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Repo\Hooks\InfoActionHookHandler;
-use Wikibase\Store\Sql\SqlSubscriptionLookup;
+use Wikibase\Store\SubscriptionLookup;
 
 /**
  * @covers Wikibase\Repo\Hooks\InfoActionHookHandler
@@ -24,17 +24,22 @@
  *
  * @license GPL-2.0+
  * @author Amir Sarabadani 
+ * @author Thiemo Mättig
  */
 class InfoActionHookHandlerTest extends \PHPUnit_Framework_TestCase {
 
/**
 * @dataProvider handleProvider
 */
-   public function testHandle( $expected, $context, $pageInfo, $enabled, 
$subscriptions, $message ) {
-   $hookHandler = $this->newHookHandler( $enabled, $subscriptions, 
$context );
-   $pageInfo = $hookHandler->handle( $context, $pageInfo );
+   public function testHandle(
+   array $expected,
+   IContextSource $context,
+   array $subscriptions
+   ) {
+   $hookHandler = $this->newHookHandler( $subscriptions, $context 
);
+   $pageInfo = $hookHandler->handle( $context, [] );
 
-   $this->assertEquals( $expected, $pageInfo, $message );
+   $this->assertEquals( $expected, $pageInfo );
}
 
public function handleProvider() {
@@ -44,114 +49,92 @@
$elementElwiki = Html::element( 'a', [ 'href' => $url ], 
'elwiki' );
$context =

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Finally switch the Wikibase\Repo\Tests\… namespace to PSR-4

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

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

Change subject: Finally switch the Wikibase\Repo\Tests\… namespace to PSR-4
..


Finally switch the Wikibase\Repo\Tests\… namespace to PSR-4

This moves the last class. Note that this is used in PropertySuggester
as well as WikibaseQualityExternalValidation. Patches for both are already
uploaded.

Change-Id: I55412bf7cea1880a5e9e49634f9f6a893cc2aa80
---
M composer.json
M repo/tests/phpunit/includes/Api/BotEditTest.php
M repo/tests/phpunit/includes/Api/CreateClaimTest.php
M repo/tests/phpunit/includes/Api/EditEntityTest.php
M repo/tests/phpunit/includes/Api/EditPageTest.php
M repo/tests/phpunit/includes/Api/GetEntitiesTest.php
M repo/tests/phpunit/includes/Api/LinkTitlesTest.php
M repo/tests/phpunit/includes/Api/MergeItemsTest.php
M repo/tests/phpunit/includes/Api/ModifyTermTestCase.php
M repo/tests/phpunit/includes/Api/PermissionsTestCase.php
M repo/tests/phpunit/includes/Api/RemoveClaimsTest.php
M repo/tests/phpunit/includes/Api/RemoveQualifiersTest.php
M repo/tests/phpunit/includes/Api/RemoveReferencesTest.php
M repo/tests/phpunit/includes/Api/SetClaimTest.php
M repo/tests/phpunit/includes/Api/SetClaimValueTest.php
M repo/tests/phpunit/includes/Api/SetQualifierTest.php
M repo/tests/phpunit/includes/Api/SetReferenceTest.php
M repo/tests/phpunit/includes/Api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/Api/WikibaseApiTestCase.php
M repo/tests/phpunit/includes/BabelUserLanguageLookupDouble.php
M repo/tests/phpunit/includes/BabelUserLanguageLookupTest.php
M repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
M repo/tests/phpunit/includes/ChangeDispatcherTest.php
M repo/tests/phpunit/includes/ChangePrunerTest.php
M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
M repo/tests/phpunit/includes/Content/EntityContentFactoryTest.php
M repo/tests/phpunit/includes/CopyrightMessageBuilderTest.php
M repo/tests/phpunit/includes/DispatchingEntityTypeStatementGrouperTest.php
M repo/tests/phpunit/includes/EditEntityTest.php
M repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
M repo/tests/phpunit/includes/EntityIdLabelFormatterFactoryTest.php
M repo/tests/phpunit/includes/EntityModificationTestHelper.php
M repo/tests/phpunit/includes/EntityTypesTest.php
M repo/tests/phpunit/includes/FingerprintSearchTextGeneratorTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/ItemDisambiguationTest.php
M repo/tests/phpunit/includes/ItemMoveTest.php
M repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
M repo/tests/phpunit/includes/LabelDescriptionDuplicateDetectorTest.php
M repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php
M repo/tests/phpunit/includes/PermissionsHelper.php
M repo/tests/phpunit/includes/PidLockTest.php
M repo/tests/phpunit/includes/PropertyDataTypeChangerTest.php
M repo/tests/phpunit/includes/PropertyInfoBuilderTest.php
M repo/tests/phpunit/includes/SiteLinkTargetProviderTest.php
M repo/tests/phpunit/includes/SnakFactoryTest.php
M repo/tests/phpunit/includes/Specials/SpecialMergeItemsTest.php
M repo/tests/phpunit/includes/Specials/SpecialRedirectEntityTest.php
M repo/tests/phpunit/includes/StatementGrouperBuilderTest.php
M repo/tests/phpunit/includes/StatementRankSerializerTest.php
R repo/tests/phpunit/includes/Store/MockEntityIdPager.php
M repo/tests/phpunit/includes/SummaryFormatterTest.php
M repo/tests/phpunit/includes/ValidatorBuildersTest.php
M repo/tests/phpunit/includes/ValueParserFactoryTest.php
M repo/tests/phpunit/includes/WikibaseHtmlSnakFormatterFactoryTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/maintenance/dumpJsonTest.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
58 files changed, 42 insertions(+), 62 deletions(-)

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



diff --git a/composer.json b/composer.json
index ff6f467..eb92279 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,6 @@
"lib/maintenance/",
"repo/includes/",
"repo/maintenance/",
-   "repo/tests/phpunit/",
"repo/Wikibase.hooks.php"
],
"psr-4": {
diff --git a/repo/tests/phpunit/includes/Api/BotEditTest.php 
b/repo/tests/phpunit/includes/Api/BotEditTest.php
index 088bd16..1204c22 100644
--- a/repo/tests/phpunit/includes/Api/BotEditTest.php
+++ b/repo/tests/phpunit/includes/Api/BotEditTest.php
@@ -6,7 +6,6 @@
 use TestUser;
 use Title;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 
 /**
  * Tests for the ApiWikibase class.
diff --git a/repo/tests/phpunit/includes/Api/CreateClaimTest.php 
b/repo/tests/phpunit/includes/Api/CreateClaimTest.php
index f004760..8fe6295 100644
---

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

2017-01-03 Thread Muehlenhoff (Code Review)

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

Change subject: eventbus: Restrict to domain networks
..


eventbus: Restrict to domain networks

We're getting rid of $INTERNAL, which is needlessly broad. Restrict
eventbus to $DOMAIN_NETWORKS, so that when running in production
access is restriced to production networks and when running in labs
to labs networks.

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

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



diff --git a/modules/role/manifests/eventbus/eventbus.pp 
b/modules/role/manifests/eventbus/eventbus.pp
index f96116c..1d1cc0a 100644
--- a/modules/role/manifests/eventbus/eventbus.pp
+++ b/modules/role/manifests/eventbus/eventbus.pp
@@ -107,7 +107,7 @@
 ferm::service { 'eventlogging-service-eventbus':
 proto  => 'tcp',
 port   => '8085',
-srange => '$INTERNAL',
+srange => '$DOMAIN_NETWORKS',
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9bcce8f47d1aac93e1c49684bddc67b88d29f88
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Update composer.json to use DataTypes 1.0.0

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

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

Change subject: Update composer.json to use DataTypes 1.0.0
..


Update composer.json to use DataTypes 1.0.0

This requires a 1.0.0 release of the DataTypes component, including
these two patches:
https://github.com/wmde/DataTypes/pull/63
https://github.com/wmde/DataTypes/pull/62

Change-Id: Id95bdc6f12014f6b50c103debb3257b6907008e6
---
M composer.json
M repo/includes/DataTypeSelector.php
M repo/tests/phpunit/includes/DataTypeSelectorTest.php
M view/src/PropertyView.php
4 files changed, 18 insertions(+), 17 deletions(-)

Approvals:
  WMDE-leszek: Looks good to me, approved
  Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index ff6f467..384ccbc 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
"data-values/number": "~0.8.2",
"data-values/time": "~0.8.4",
"data-values/validators": "~0.1.0",
-   "data-values/data-types": "~0.5.0",
+   "data-values/data-types": "~1.0.0",
"data-values/serialization": "~1.1",
"data-values/javascript": "~0.8.3",
"data-values/value-view": "~0.18.0",
diff --git a/repo/includes/DataTypeSelector.php 
b/repo/includes/DataTypeSelector.php
index 920f646..1028346 100644
--- a/repo/includes/DataTypeSelector.php
+++ b/repo/includes/DataTypeSelector.php
@@ -61,7 +61,8 @@
$byId = [];
 
foreach ( $this->dataTypes as $dataType ) {
-   $label = $dataType->getLabel( $this->languageCode );
+   $label = wfMessage( $dataType->getMessageKey() 
)->inLanguage( $this->languageCode )
+   ->text();
$id = $dataType->getId();
 
$byLabel[$label] = $id;
diff --git a/repo/tests/phpunit/includes/DataTypeSelectorTest.php 
b/repo/tests/phpunit/includes/DataTypeSelectorTest.php
index fc05140..05cb3a2 100644
--- a/repo/tests/phpunit/includes/DataTypeSelectorTest.php
+++ b/repo/tests/phpunit/includes/DataTypeSelectorTest.php
@@ -18,13 +18,16 @@
  */
 class DataTypeSelectorTest extends PHPUnit_Framework_TestCase {
 
+   /** @see \LanguageQqx */
+   const DUMMY_LANGUAGE = 'qqx';
+
/**
 * @param string $propertyType
-* @param string $label
+* @param string $messageKey
 *
 * @return DataType
 */
-   private function newDataType( $propertyType, $label ) {
+   private function newDataType( $propertyType, $messageKey ) {
$dataType = $this->getMockBuilder( DataType::class )
->disableOriginalConstructor()
->getMock();
@@ -34,9 +37,8 @@
->will( $this->returnValue( $propertyType ) );
 
$dataType->expects( $this->any() )
-   ->method( 'getLabel' )
-   ->with( 'en' )
-   ->will( $this->returnValue( $label ) );
+   ->method( 'getMessageKey' )
+   ->will( $this->returnValue( $messageKey ) );
 
return $dataType;
}
@@ -62,10 +64,10 @@
public function testGetOptionsArrayWithOneElement() {
$selector = new DataTypeSelector( [
$this->newDataType( '', '' ),
-   ], 'en' );
+   ], self::DUMMY_LANGUAGE );
 
$expected = [
-   '' => '',
+   '()' => '',
];
$this->assertSame( $expected, $selector->getOptionsArray() );
}
@@ -74,7 +76,7 @@
$selector = new DataTypeSelector( [
$this->newDataType( '', '' ),
$this->newDataType( '', '' ),
-   ], 'en' );
+   ], self::DUMMY_LANGUAGE );
 
$expected = [
'' => '',
@@ -87,11 +89,11 @@
$selector = new DataTypeSelector( [
$this->newDataType( '', '' ),
$this->newDataType( '', '' ),
-   ], 'en' );
+   ], self::DUMMY_LANGUAGE );
 
$expected = [
-   '' => '',
-   '' => '',
+   '()' => '',
+   '()' => '',
];
$this->assertSame( $expected, $selector->getOptionsArray() );
}
diff --git a/view/src/PropertyView.php b/view/src/PropertyView.php
index 3802453..6a83c75 100644
--- a/view/src/PropertyView.php
+++ b/view/src/PropertyView.php
@@ -99,19 +99,17 @@
 * @return string HTML
 */
private function getHtmlForDataType( $propertyType ) {
-

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Clean up IDs in SpecialNewLexeme

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

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

Change subject: Clean up IDs in SpecialNewLexeme
..


Clean up IDs in SpecialNewLexeme

Bug: T154317
Change-Id: I9a4a11526c45231279bd3d99d167fa180caf86f9
---
M src/Specials/SpecialNewLexeme.php
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/src/Specials/SpecialNewLexeme.php 
b/src/Specials/SpecialNewLexeme.php
index 9233071..182ebbb 100644
--- a/src/Specials/SpecialNewLexeme.php
+++ b/src/Specials/SpecialNewLexeme.php
@@ -181,13 +181,13 @@
$this->lexicalCategory = $this->stringNormalizer->trimToNFC( 
$lexicalCategory );
 
$language = $this->getRequest()->getVal(
-   'language',
+   'lexeme-language',
isset( $this->parts[0] ) ? $this->parts[0] : ''
);
$this->language = $this->stringNormalizer->trimToNFC( $language 
);
 
$this->contentLanguageCode = $this->getRequest()->getVal(
-   'lang', $this->getLanguage()->getCode()
+   'lemma-language', $this->getLanguage()->getCode()
);
}
 
@@ -264,12 +264,12 @@
$langCode = $this->contentLanguageCode;
$langDir = 
$this->languageDirectionalityLookup->getDirectionality( 
$this->contentLanguageCode );
return [
-   'lang' => [
-   'name' => 'lang',
+   'lemma-language' => [
+   'name' => 'lemma-language',
'options' => $this->getLanguageOptions(),
'default' => $langCode,
'type' => 'combobox',
-   'id' => 'wb-newlexeme-language',
+   'id' => 'wb-newlexeme-lemma-language',
'label-message' => 'wikibase-newlexeme-language'
],
'lemma' => [
@@ -296,11 +296,11 @@
)->text(),
'label-message' => 
'wikibase-newlexeme-lexicalcategory'
],
-   'language' => [
-   'name' => 'language',
+   'lexeme-language' => [
+   'name' => 'lexeme-language',
'default' => $this->language,
'type' => 'text',
-   'id' => 'wb-newlexeme-language',
+   'id' => 'wb-newlexeme-lexeme-language',
'lang' => $langCode,
'dir' => $langDir,
'placeholder' => $this->msg(
@@ -321,7 +321,7 @@
$this->addCopyrightText();
 
HTMLForm::factory( 'ooui', $additionalFormElements, 
$this->getContext() )
-   ->setId( 'mw-newlexeme-form1' )
+   ->setId( 'wb-newlexeme-form1' )
->setSubmitID( 'wb-newlexeme-submit' )
->setSubmitName( 'submit' )
->setSubmitTextMsg( 'wikibase-newlexeme-submit' )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a4a11526c45231279bd3d99d167fa180caf86f9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Convert Special:GlobalRenameRequest to OOUI

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

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

Change subject: Convert Special:GlobalRenameRequest to OOUI
..


Convert Special:GlobalRenameRequest to OOUI

I also removed the help-message for the current username field
and email address field because it feels pretty self-explanatory
and redundant to me. The CSS has been removed so the field labels
are no longer bold faced because we don't that for other forms either.
The JS module has also been removed and instead of a popup, it now
shows the globalrenamerequest-email-why-explain message as a notice
generated on the PHP side.

Bug: T104299
Bug: T88214
Change-Id: I62a2c2ecab82652dbccb40d5605e429754f136ba
Depends-On: I512f3936bc3335df1bdf76505cfc39da6be99bed
---
M i18n/en.json
M i18n/qqq.json
M includes/CentralAuthHooks.php
M includes/specials/SpecialGlobalRenameRequest.php
D modules/ext.centralauth.globalrenamerequest.css
D modules/ext.centralauth.globalrenamerequest.js
6 files changed, 9 insertions(+), 74 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index b760439..6343d77 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -427,15 +427,12 @@
"globalrenamerequest-forced": "The Wikimedia Foundation is 
[[:mw:SUL_finalisation|unifying usernames across all Wikimedia projects]]. This 
username was identified as being in use in other Wikimedia wikis and must be 
changed in order to finalize this unification. As a result, you must select a 
new username.",
"globalrenamerequest-pretext" : "Request a new username to be known by 
across all projects.\n\nAll of your previous contributions will be connected 
with this new username.\n\nOnce you have requested a new username, a 
notification will be sent to Wikimedia stewards to perform the rename. You will 
be notified by email when this process is completed.",
"globalrenamerequest-username-label": "Current username:",
-   "globalrenamerequest-username-help": "This is your username now.",
"globalrenamerequest-newname-label": "Requested username:",
"globalrenamerequest-newname-help": "Enter the new username you wish to 
use, e.g., \"$1\".",
"globalrenamerequest-newname-err-invalid": "You have not specified a 
valid user name.",
"globalrenamerequest-newname-err-taken": "Username entered already in 
use. Please choose a different name.",
"globalrenamerequest-email-label": "Email address:",
-   "globalrenamerequest-email-help": "Enter your email address.",
-   "globalrenamerequest-email-why-label": "Why?",
-   "globalrenamerequest-email-why-explain": "We need an email address 
during this process to ensure that you do not lose access to this 
account.You can remove the email address after the rename process has 
completed.",
+   "globalrenamerequest-email-why-explain": "We need an email address 
during this process to ensure that you do not lose access to this account.You can remove the email address after the rename process has completed.",
"globalrenamerequest-email2-label": "Confirm email address:",
"globalrenamerequest-email2-help": "Enter the same email address you 
entered above for confirmation.",
"globalrenamerequest-email-mismatch": "Email addresses differ.Please check both and try again.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2d2476b..9cd2eae 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -443,15 +443,12 @@
"globalrenamerequest-forced": "Explanation for users that are being 
forced to rename.\n\nFollowed by the message 
{{msg-mw|globalrenamerequest-pretext}}",
"globalrenamerequest-pretext": "Instructions for rename process.",
"globalrenamerequest-username-label": "Form field label.",
-   "globalrenamerequest-username-help": "Form field inline help.",
"globalrenamerequest-newname-label": "Form field label.",
"globalrenamerequest-newname-help": "Form field inline help.\n\n* $1 is 
a randomly generated username suggestion.",
"globalrenamerequest-newname-err-invalid": "Used as error message.",
"globalrenamerequest-newname-err-taken": "Used as error message.",
"globalrenamerequest-email-label": "Form field 
label.\n{{Identical|E-mail address}}",
-   "globalrenamerequest-email-help": "Form field inline help.",
-   "globalrenamerequest-email-why-label": "Label for popup 
dialog.\n{{Identical|Why}}",
-   "globalrenamerequest-email-why-explain": "Message for popup dialog.",
+   "globalrenamerequest-email-why-explain": "Information message for email 
address field shown on Special:GlobalRenameRequest.",
"globalrenamerequest-email2-label": "Form field label.",
"globalrenamerequest-email2-help": "Form field inline help.",
"globalrenamerequest-email-mismatch": "Error message shown when the 
user

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject dependencies to SpecialPagesWithBadges

2017-01-03 Thread Ladsgroup (Code Review)

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

Change subject: Inject dependencies to SpecialPagesWithBadges
..

Inject dependencies to SpecialPagesWithBadges

Bug: T154317
Change-Id: I8993a86486a6b007999b5a68bf4d3b52d43af56f
---
M client/WikibaseClient.php
M client/includes/Specials/SpecialPagesWithBadges.php
M client/tests/phpunit/includes/Specials/SpecialPagesWithBadgesTest.php
3 files changed, 24 insertions(+), 22 deletions(-)


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

diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 07a6ad8..7d944d9 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -214,7 +214,19 @@
 
// Special page registration
$wgSpecialPages['UnconnectedPages'] = 
'Wikibase\Client\Specials\SpecialUnconnectedPages';
-   $wgSpecialPages['PagesWithBadges'] = 
'Wikibase\Client\Specials\SpecialPagesWithBadges';
+   $wgSpecialPages['PagesWithBadges'] = function( $name = 
'PagesWithBadges' ) {
+   $wikibaseClient = 
Wikibase\Client\WikibaseClient::getDefaultInstance();
+   return new \Wikibase\Client\Specials\SpecialPagesWithBadges(
+   $name,
+   new 
Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory(
+   
$wikibaseClient->getLanguageFallbackChainFactory(),
+   $wikibaseClient->getTermLookup(),
+   $wikibaseClient->getTermBuffer()
+   ),
+   array_keys( $wikibaseClient->getSettings()->getSetting( 
'badgeClassNames' ) ),
+   $wikibaseClient->getSettings()->getSetting( 
'siteGlobalID' )
+   );
+   };
$wgSpecialPages['EntityUsage'] = 
'Wikibase\Client\Specials\SpecialEntityUsage';
$wgHooks['wgQueryPages'][] = 'Wikibase\ClientHooks::onwgQueryPages';
 
diff --git a/client/includes/Specials/SpecialPagesWithBadges.php 
b/client/includes/Specials/SpecialPagesWithBadges.php
index 7832fb4..c09ea71 100644
--- a/client/includes/Specials/SpecialPagesWithBadges.php
+++ b/client/includes/Specials/SpecialPagesWithBadges.php
@@ -9,7 +9,6 @@
 use QueryPage;
 use Skin;
 use Title;
-use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
 
@@ -47,28 +46,12 @@
 * @see SpecialPage::__construct
 *
 * @param string $name
-*/
-   public function __construct( $name = 'PagesWithBadges' ) {
-   parent::__construct( $name );
-
-   $wikibaseClient = WikibaseClient::getDefaultInstance();
-   $this->initServices(
-   new LanguageFallbackLabelDescriptionLookupFactory(
-   
$wikibaseClient->getLanguageFallbackChainFactory(),
-   $wikibaseClient->getTermLookup(),
-   $wikibaseClient->getTermBuffer()
-   ),
-   array_keys( $wikibaseClient->getSettings()->getSetting( 
'badgeClassNames' ) ),
-   $wikibaseClient->getSettings()->getSetting( 
'siteGlobalID' )
-   );
-   }
-
-   /**
 * @param LanguageFallbackLabelDescriptionLookupFactory 
$labelDescriptionLookupFactory
 * @param string[] $badgeIds
 * @param string $siteId
 */
-   public function initServices(
+   public function __construct(
+   $name = 'PagesWithBadges',
LanguageFallbackLabelDescriptionLookupFactory 
$labelDescriptionLookupFactory,
array $badgeIds,
$siteId
@@ -76,6 +59,9 @@
$this->labelDescriptionLookupFactory = 
$labelDescriptionLookupFactory;
$this->badgeIds = $badgeIds;
$this->siteId = $siteId;
+
+   parent::__construct( $name );
+
}
 
/**
diff --git 
a/client/tests/phpunit/includes/Specials/SpecialPagesWithBadgesTest.php 
b/client/tests/phpunit/includes/Specials/SpecialPagesWithBadgesTest.php
index be39484..8fb9370 100644
--- a/client/tests/phpunit/includes/Specials/SpecialPagesWithBadgesTest.php
+++ b/client/tests/phpunit/includes/Specials/SpecialPagesWithBadgesTest.php
@@ -60,8 +60,12 @@
}
 
protected function newSpecialPage() {
-   $specialPage = new SpecialPagesWithBadges();
-   $specialPage->initServices( 
$this->getLabelDescriptionLookupFactory(), array( 'Q123', 'Q456' ), 'enwiki' );
+   $specialPage = new SpecialPagesWithBadges(
+   null,
+   $this->getLabelDescriptionLookupFactory(),
+   [ 'Q123', 'Q456' ],
+   'enwiki'
+

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

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

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

Change subject: Typo fixes
..


Typo fixes

Change-Id: I8eb6ad556cee11f63fa0f4bbeea3940e5dcdfdee
---
M includes/PF_AutocompleteAPI.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/PF_AutocompleteAPI.php b/includes/PF_AutocompleteAPI.php
index bd0765e..fdb9554 100644
--- a/includes/PF_AutocompleteAPI.php
+++ b/includes/PF_AutocompleteAPI.php
@@ -146,7 +146,7 @@
}
 
protected function getDescription() {
-   return 'Autocompletion call used by the Page Forms extension 
(http://www.mediawiki.org/Extension:Page_F)';
+   return 'Autocompletion call used by the Page Forms extension 
(https://www.mediawiki.org/Extension:Page_Forms)';
}
 
protected function getExamples() {
@@ -333,7 +333,7 @@
$queryResults = $sqlQuery->run();
 
foreach ( $queryResults as $row ) {
-   // @TODO - this check should not be neceaary.
+   // @TODO - this check should not be necessary.
if ( ( $value = $row[$cargoFieldAlias] ) != '' ) {
$values[] = $value;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb6ad556cee11f63fa0f4bbeea3940e5dcdfdee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "RESTBase configuration for fi.wikivoyage.org""

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

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

Change subject: Revert "Revert "RESTBase configuration for fi.wikivoyage.org""
..


Revert "Revert "RESTBase configuration for fi.wikivoyage.org""

This reverts commit 6665b0f48c93607f0368e7029483024b77acf6e7.

Bug: T151570
Change-Id: I89bf1c7e6e7a3fdea5bdf347921de208fb646e6b
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved
  Mobrovac: Looks good to me, but someone else must approve



diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 33ea2ef..224b7d0 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -835,6 +835,7 @@
 /{domain:es.wikivoyage.org}: *default_project
 /{domain:fa.wikivoyage.org}: *default_project
 /{domain:fr.wikivoyage.org}: *default_project
+/{domain:fi.wikivoyage.org}: *default_project
 /{domain:he.wikivoyage.org}: *default_project
 /{domain:it.wikivoyage.org}: *default_project
 /{domain:nl.wikivoyage.org}: *default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89bf1c7e6e7a3fdea5bdf347921de208fb646e6b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] openzim[master]: Fix use of ENABLE_* by preprocessor.

2017-01-03 Thread Mgautierfr (Code Review)

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

Change subject: Fix use of ENABLE_* by preprocessor.
..

Fix use of ENABLE_* by preprocessor.

If a compression lib is not present, the associated ENABLE_* is not
defined.
So we need to always test for the definition existance and not for its
value.
This is not the case in zimcreator.cpp with the #ifdef/#elif construction.

We also change other (correct) syntax #ifdef to #if defined() to keep some
consistency.

Change-Id: I86d4309bfcdeeb3356d0fb4f192d0849a5e57275
---
M zimlib/src/cluster.cpp
M zimlib/src/zimcreator.cpp
M zimlib/test/cluster.cpp
3 files changed, 24 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/openzim refs/changes/36/330236/1

diff --git a/zimlib/src/cluster.cpp b/zimlib/src/cluster.cpp
index 9dbefdc..e944ec6 100644
--- a/zimlib/src/cluster.cpp
+++ b/zimlib/src/cluster.cpp
@@ -28,17 +28,17 @@
 
 #include "config.h"
 
-#ifdef ENABLE_ZLIB
+#if defined(ENABLE_ZLIB)
 #include 
 #include 
 #endif
 
-#ifdef ENABLE_BZIP2
+#if defined(ENABLE_BZIP2)
 #include 
 #include 
 #endif
 
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
 #include 
 #include 
 #endif
@@ -212,7 +212,7 @@
 
   case zimcompZip:
 {
-#ifdef ENABLE_ZLIB
+#if defined(ENABLE_ZLIB)
   log_debug("uncompress data (zlib)");
   zim::InflateStream is(in);
   is.exceptions(std::ios::failbit | std::ios::badbit);
@@ -226,7 +226,7 @@
 
   case zimcompBzip2:
 {
-#ifdef ENABLE_BZIP2
+#if defined(ENABLE_BZIP2)
   log_debug("uncompress data (bzip2)");
   zim::Bunzip2Stream is(in);
   is.exceptions(std::ios::failbit | std::ios::badbit);
@@ -240,7 +240,7 @@
 
   case zimcompLzma:
 {
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
   log_debug("uncompress data (lzma)");
   zim::UnlzmaStream is(in);
   is.exceptions(std::ios::failbit | std::ios::badbit);
@@ -274,7 +274,7 @@
 
   case zimcompZip:
 {
-#ifdef ENABLE_ZLIB
+#if defined(ENABLE_ZLIB)
   log_debug("compress data (zlib)");
   zim::DeflateStream os(out);
   os.exceptions(std::ios::failbit | std::ios::badbit);
@@ -288,7 +288,7 @@
 
   case zimcompBzip2:
 {
-#ifdef ENABLE_BZIP2
+#if defined(ENABLE_BZIP2)
   log_debug("compress data (bzip2)");
   zim::Bzip2Stream os(out);
   os.exceptions(std::ios::failbit | std::ios::badbit);
@@ -302,7 +302,7 @@
 
   case zimcompLzma:
 {
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
   uint32_t lzmaPreset = 3 | LZMA_PRESET_EXTREME;
   /**
* read lzma preset from environment
diff --git a/zimlib/src/zimcreator.cpp b/zimlib/src/zimcreator.cpp
index 1e4a21c..fac4c96 100644
--- a/zimlib/src/zimcreator.cpp
+++ b/zimlib/src/zimcreator.cpp
@@ -55,11 +55,11 @@
 ZimCreator::ZimCreator()
   : minChunkSize(1024-64),
 nextMimeIdx(0),
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
 compression(zimcompLzma),
-#elif ENABLE_BZIP2
+#elif defined(ENABLE_BZIP2)
 compression(zimcompBzip2),
-#elif ENABLE_ZLIB
+#elif defined(ENABLE_ZLIB)
 compression(zimcompZip),
 #else
 compression(zimcompNone),
@@ -70,11 +70,11 @@
 
 ZimCreator::ZimCreator(int& argc, char* argv[])
   : nextMimeIdx(0),
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
 compression(zimcompLzma),
-#elif ENABLE_BZIP2
+#elif defined(ENABLE_BZIP2)
 compression(zimcompBzip2),
-#elif ENABLE_ZLIB
+#elif defined( ENABLE_ZLIB)
 compression(zimcompZip),
 #else
 compression(zimcompNone),
@@ -87,15 +87,15 @@
   else
 minChunkSize = Arg(argc, argv, 's', 1024-64);
 
-#ifdef ENABLE_ZLIB
+#if defined(ENABLE_ZLIB)
   if (Arg(argc, argv, "--zlib"))
 compression = zimcompZip;
 #endif
-#ifdef ENABLE_BZIP2
+#if defined(ENABLE_BZIP2)
   if (Arg(argc, argv, "--bzip2"))
 compression = zimcompBzip2;
 #endif
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
   if (Arg(argc, argv, "--lzma"))
 compression = zimcompLzma;
 #endif
diff --git a/zimlib/test/cluster.cpp b/zimlib/test/cluster.cpp
index 687c1e1..b907bad 100644
--- a/zimlib/test/cluster.cpp
+++ b/zimlib/test/cluster.cpp
@@ -39,13 +39,13 @@
   registerMethod("CreateCluster", *this, ::CreateCluster);
   registerMethod("ReadWriteCluster", *this, 
::ReadWriteCluster);
   registerMethod("ReadWriteEmpty", *this, ::ReadWriteEmpty);
-#ifdef ENABLE_ZLIB
+#if defined(ENABLE_ZLIB)
   registerMethod("ReadWriteClusterZ", *this, 
::ReadWriteClusterZ);
 #endif
-#ifdef ENABLE_BZIP2
+#if defined(ENABLE_BZIP2)
   registerMethod("ReadWriteClusterBz2", *this, 
::ReadWriteClusterBz2);
 #endif
-#ifdef ENABLE_LZMA
+#if defined(ENABLE_LZMA)
   registerMethod("ReadWriteClusterLzma", *this, 
::ReadWriteClusterLzma);
 #endif
 }
@@ -126,7 +126,7 @@

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (da4a0b5)

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

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

Change subject: Update VE core submodule to master (da4a0b5)
..


Update VE core submodule to master (da4a0b5)

New changes:
8562e02 Ensure document is always sliced in #insertDocument when newDocRange 
passed
38885da Unwrap single pasted content branch nodes
afcc2b5 Use this.document directly in surface fragment
9a06a01 Don't show help for a trigger if the command is not registered
16fa88e Rename 'commandName' to 'commandHelpName' and refactor object copy
8640858 Localisation updates from https://translatewiki.net.
3e147fd Localisation updates from https://translatewiki.net.
df590e3 ce.Surface: in blur, make sure activeElement exists before blurring it
2883d2a Localisation updates from https://translatewiki.net.
89b8927 Remove serialization test cheat; make tests actually pass
41e77ad ve.ce.CommentNode: Don't assume icon exists yet
55185ec Rebaser: Allow document id & server to be changed by config
3b06cf3 Filter out nodes completely sanitized away by DOMPurify
755768c Pass dm doc to deserialize to hydrate selections properly
a9b1c86 DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR
3796061 Remove unit test hack, no longer needed.
ef7b4e4 Rebaser: Separate namespace creation from /doc/edit
da4a0b5 Localisation updates from https://translatewiki.net.

Bug: T153247
Bug: T153249
Bug: T153960
Change-Id: Iaa277b86aea4182c8e96ec6ad4ed6c1beaf00ee1
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index f8fc228..da4a0b5 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit f8fc2287b8d7a73ca2823da6e289a8e4c3454f5c
+Subproject commit da4a0b59b7a648778244052f66eb09856713154a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa277b86aea4182c8e96ec6ad4ed6c1beaf00ee1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
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]: Proper instantiating of QueryPage special pages in QueryAllS...

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

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

Change subject: Proper instantiating of QueryPage special pages in 
QueryAllSpecialPagesTest
..


Proper instantiating of QueryPage special pages in QueryAllSpecialPagesTest

Change-Id: If4420067011da756b8a36917f1c35fd2d380dae9
---
M tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  WMDE-leszek: Looks good to me, but someone else must approve
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php 
b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
index c1083af..7b5120c 100644
--- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
+++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
@@ -36,8 +36,9 @@
 
foreach ( QueryPage::getPages() as $page ) {
$class = $page[0];
+   $name = $page[1];
if ( !in_array( $class, $this->manualTest ) ) {
-   $this->queryPages[$class] = new $class;
+   $this->queryPages[$class] = 
SpecialPageFactory::getPage( $name );
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4420067011da756b8a36917f1c35fd2d380dae9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseMediaInfo[master]: Remove unused getEntityTermsForLanguageListView mock

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

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

Change subject: Remove unused getEntityTermsForLanguageListView mock
..


Remove unused getEntityTermsForLanguageListView mock

This method was removed with Ia516f1f (April 2016).

Change-Id: I466bd0c01daa9cb3c281a85d6e87127b7fbace35
---
M tests/phpunit/mediawiki/View/MediaInfoViewTest.php
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  WMDE-leszek: Looks good to me, approved
  Addshore: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php 
b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
index 3f59b36..09373a9 100644
--- a/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
+++ b/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
@@ -145,9 +145,6 @@
)
->will( $this->returnValue( 'entityTermsView->getHtml' 
) );
 
-   $entityTermsView->expects( $this->never() )
-   ->method( 'getEntityTermsForLanguageListView' );
-
$statementSectionsView = $this->newStatementSectionsViewMock();
$statementSectionsView->expects( $this->once() )
->method( 'getHtml' )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I466bd0c01daa9cb3c281a85d6e87127b7fbace35
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Add LinkedWikiConfig to MessagesDirs

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

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

Change subject: Add LinkedWikiConfig to MessagesDirs
..


Add LinkedWikiConfig to MessagesDirs

Actually it is only loaded over shim SpecialLinkedWikiConfig.i18n.php

Change-Id: I51d3414f4089ab7bd7cb8105009d2804f336be8b
---
M Gruntfile.js
M extension.json
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index a7c694e..f080c48 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,6 +6,7 @@
grunt.initConfig( {
/* banana: {
linkedwiki: 'i18n/',
+   linkedwikiconfig: 'i18n/',
sparqlflinteditor: 'i18n/',
sparqlquery: 'i18n/'
}, */
diff --git a/extension.json b/extension.json
index 5301b06..9eb44fa 100644
--- a/extension.json
+++ b/extension.json
@@ -48,6 +48,9 @@
 "LinkedWiki": [
   "i18n/linkedwiki"
 ],
+"LinkedWikiConfig": [
+  "i18n/linkedwikiconfig"
+],
 "linkedwiki-specialsparqlquery": [
   "i18n/sparqlquery"
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51d3414f4089ab7bd7cb8105009d2804f336be8b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Umherirrender 
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...VisualEditor[master]: Replace all usages of Linker::link() with LinkRenderer

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

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

Change subject: Replace all usages of Linker::link() with LinkRenderer
..


Replace all usages of Linker::link() with LinkRenderer

Linker::link was deprected in 1.28. This replaces all usages of
Linker::link with an instance of LinkRenderer in ApiVisualEditor.php, as
this seems to be the only file generating links with Linker::link.

Bug: T149346
Change-Id: Ib395f137787e7dd7c5cfe91905f5feb88ce9f604
---
M ApiVisualEditor.php
1 file changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index dd8eef2..47a6a4f 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -8,6 +8,8 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
+use MediaWiki\MediaWikiServices;
+
 class ApiVisualEditor extends ApiBase {
/**
 * @var Config
@@ -350,7 +352,9 @@
// Unfortunately there's no 
nice way to get only the pages which cause
// editing to be restricted
foreach ( $sources as $source ) 
{
-   $notice .= "" . 
Linker::link( $source ) . "";
+   $notice .= "" .
+   
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( $source ) .
+   "";
}
$notice .= '';
$notices[] = $notice;
@@ -568,9 +572,9 @@
);
$lp->mLimit = 1;
 
-   return $lp->getBody() . Linker::link(
+   return $lp->getBody() . 
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'Log' ),
-   $this->msg( 'log-fulllog' )->escaped(),
+   $this->msg( 'log-fulllog' )->text(),
[],
[
'page' => $title->getPrefixedDBkey(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib395f137787e7dd7c5cfe91905f5feb88ce9f604
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jo12bar 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jo12bar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MtDu 
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...SemanticPageMaker[master]: Replaced deprecated 'Article::getContent()' usage

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

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

Change subject: Replaced deprecated 'Article::getContent()' usage
..


Replaced deprecated 'Article::getContent()' usage

Bug: T151973
Change-Id: Ic154bb3ce94a72faaffcfc8be38ea5bca1b30b6a
---
M includes/models/SPM_OM_Template.php
M includes/widgets/SPM_WFAjaxAccess.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/models/SPM_OM_Template.php 
b/includes/models/SPM_OM_Template.php
index 0c5fd8a..93d6cff 100644
--- a/includes/models/SPM_OM_Template.php
+++ b/includes/models/SPM_OM_Template.php
@@ -47,7 +47,7 @@
return null;
}
 
-   $text = $article->getContent();
+   $text = ContentHandler::getContentText( 
$article->getPage()->getContent() );
$len = strlen( $text );
$offset = 0;
$content2 = '';
diff --git a/includes/widgets/SPM_WFAjaxAccess.php 
b/includes/widgets/SPM_WFAjaxAccess.php
index 56e8dcd..ca7614a 100644
--- a/includes/widgets/SPM_WFAjaxAccess.php
+++ b/includes/widgets/SPM_WFAjaxAccess.php
@@ -296,7 +296,7 @@
 // $article = new Article( $tmpl_title );
 // if ( !$article->exists() ) continue;
 //
-// $text = $article->getContent();
+// $text = ContentHandler::getContentText( 
$article->getPage()->getContent() );
 // $len = strlen( $text );
 // $offset = 0;
 // $content2 = '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic154bb3ce94a72faaffcfc8be38ea5bca1b30b6a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.

2017-01-03 Thread Niedzielski (Code Review)

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

Change subject: Localisation updates from https://translatewiki.net.
..

Localisation updates from https://translatewiki.net.

Change-Id: I30b8981492c2fc97bf95a3f139e803bda8001da2
---
M app/src/main/res/values-ast/strings.xml
M app/src/main/res/values-bn/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fi/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-hi/strings.xml
M app/src/main/res/values-hu/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-iw/strings.xml
M app/src/main/res/values-ji/strings.xml
M app/src/main/res/values-jv/strings.xml
M app/src/main/res/values-ko/strings.xml
A app/src/main/res/values-ksh/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-lt/strings.xml
M app/src/main/res/values-lv/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-ms/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-ne/strings.xml
M app/src/main/res/values-nl/strings.xml
M app/src/main/res/values-oc/strings.xml
M app/src/main/res/values-or/strings.xml
M app/src/main/res/values-pl/strings.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-ta/strings.xml
M app/src/main/res/values-tr/strings.xml
M app/src/main/res/values-uk/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
38 files changed, 393 insertions(+), 46 deletions(-)


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

diff --git a/app/src/main/res/values-ast/strings.xml 
b/app/src/main/res/values-ast/strings.xml
index af3ebd2..7386d49 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -300,11 +300,19 @@
 Fai %d díes
   
   Güei
+  Non, gracies
   Editando
   ¿Qué ye esto?
   Escribe una descripción
   Guardar
-  Amiesta una 
descripción
+  Amestar una descripción 
curtia
+  Editar la 
descripción
+  Encaboxar
+  Ayuda: descripción de 
títulos
+  Tocante a 
Wikidata
+  Guía de Wikidata pa 
escribir descripciones
+  https://www.wikidata.org/wiki/Wikidata:Introduction
+  https://www.wikidata.org/wiki/Help:Description#Guidelines_for_descriptions_in_English
   Guardóse la 
descripción
   Acabes d\'ameyorar 
Wikipedia pa toos
   Fecho
diff --git a/app/src/main/res/values-bn/strings.xml 
b/app/src/main/res/values-bn/strings.xml
index dcd6b21..a8a6f98 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -302,5 +302,12 @@
   এটি কী?
   একটি বিবরণ লিখুন!
   সংরক্ষণ
-  বিবরণ যোগ 
করুন
+  সংক্ষিপ্ত বিবরণ যোগ 
করুন
+  বিবরণ সম্পাদনা করুন
+  বাতিল
+  সাহায্য: শিরোনামের বিবরণ
+  উইকিউপাত্ত 
সম্পর্কে
+  বিবরণ লেখার জন্য 
উইকিউপাত্তের নির্দেশিকা
+  https://www.wikidata.org/wiki/Wikidata:Introduction/bn
+  https://www.wikidata.org/wiki/Help:Description/bn
 
diff --git a/app/src/main/res/values-ca/strings.xml 
b/app/src/main/res/values-ca/strings.xml
index bf2d83c..e0696bc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -90,7 +90,7 @@
   Següent
   Crea un compte
   General
-  PMF de l\'app de la Viquipèdia
+  PMF de l\'aplicació de la 
Viquipèdia
   L\'accés gratuït a la Viquipèdia ja no 
és actiu.
   Avisa\'m si se surt de Viquipèdia 
Zero
   Si el vostre operador de 
telefonia mòbil ha renunciat a cobrar per l\'accés de dades des de l\'aplicació 
de la Viquipèdia gràcies a un acord amb Viquipèdia Zero, en deixar aquest 
paràmetre habilitat se us avisarà quan sortiu de l\'aplicació de la Viquipèdia, 
moment en què us poden tornar a cobrar.
@@ -300,11 +300,19 @@
 Fa %d dies
   
   Avui
+  No, gràcies
   Modificació
   Què és això?
   Escriviu una descripció!
   Desa
-  Afegeix una 
descripció
+  Afegeix una descripció 
curta
+  Modifica la 
descripció
+  Cancel·la
+  Ajuda: descripcions dels 
títols
+  Quant a Wikidata
+  Guia de Wikidata per a 
escriure descripcions
+  https://www.wikidata.org/wiki/Wikidata:Introduction/ca
+  https://www.wikidata.org/wiki/Help:Description#Guidelines_for_descriptions_in_English
   S\'ha desat la 
descripció!
   Acabeu de millorar la 
Viquipèdia per a tothom
   Fet
diff --git a/app/src/main/res/values-da/strings.xml 
b/app/src/main/res/values-da/strings.xml
index c215ed6..435f809 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -238,6 +238,9 @@
   Tilføj denne artikel til en

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added more alias options for "calendar" format

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

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

Change subject: Added more alias options for "calendar" format
..

Added more alias options for "calendar" format

Patch by Duncan Crane.

Change-Id: Ic4c8524b38a2dde8055823f1aa05b6be447fba3a
---
M specials/CargoExport.php
1 file changed, 26 insertions(+), 3 deletions(-)


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

diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index 8c83baa..401202c 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -125,6 +125,28 @@
} else {
$eventTitle = reset( $queryResult );
}
+   if ( array_key_exists( 'color', $queryResult ) 
) {
+   $eventColor = $queryResult['color'];
+   } else {
+   $eventColor = $colorArray[$i];
+   }
+   if ( array_key_exists( 'text color', 
$queryResult ) ) {
+   $eventTextColor = $queryResult['text 
color'];
+   } else {
+   $eventTextColor = $textColorArray[$i];
+   }
+   if ( array_key_exists( 'start', $queryResult ) 
) {
+   $eventStart = $queryResult['start'];
+   } else {
+   $eventStart = 
$queryResult[$dateFieldAliases[0]];
+   }
+   if ( array_key_exists( 'end', $queryResult ) ) {
+   $eventEnd = $queryResult['end'];
+   } elseif ( count( $dateFieldAliases ) > 1 && 
array_key_exists( $dateFieldAliases[1], $queryResult ) ) {
+   $eventEnd = 
$queryResult[$dateFieldAliases[1]];
+   } else {
+   $eventEnd = null;
+   }
if ( array_key_exists( 'description', 
$queryResult ) ) {
$eventDescription = 
$queryResult['description'];
} else {
@@ -141,9 +163,10 @@
// necessarily the page name.
'title' => $eventTitle,
'url' => $title->getLocalURL(),
-   'start' => 
$queryResult[$dateFieldAliases[0]],
-   'color' => $colorArray[$i],
-   'textColor' => $textColorArray[$i],
+   'start' => $eventStart,
+   'end' => $eventEnd,
+   'color' => $eventColor,
+   'textColor' => $eventTextColor,
'description' => $eventDescription
);
if ( $startDatePrecision != 
CargoStore::DATE_AND_TIME ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c8524b38a2dde8055823f1aa05b6be447fba3a
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] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.

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

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

Change subject: Localisation updates from https://translatewiki.net.
..


Localisation updates from https://translatewiki.net.

Change-Id: I30b8981492c2fc97bf95a3f139e803bda8001da2
---
M app/src/main/res/values-ast/strings.xml
M app/src/main/res/values-bn/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fi/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-hi/strings.xml
M app/src/main/res/values-hu/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-iw/strings.xml
M app/src/main/res/values-ji/strings.xml
M app/src/main/res/values-jv/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-lt/strings.xml
M app/src/main/res/values-lv/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-ms/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-ne/strings.xml
M app/src/main/res/values-nl/strings.xml
M app/src/main/res/values-oc/strings.xml
M app/src/main/res/values-or/strings.xml
M app/src/main/res/values-pl/strings.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-ta/strings.xml
M app/src/main/res/values-tr/strings.xml
M app/src/main/res/values-uk/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
37 files changed, 392 insertions(+), 46 deletions(-)

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



diff --git a/app/src/main/res/values-ast/strings.xml 
b/app/src/main/res/values-ast/strings.xml
index af3ebd2..7386d49 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -300,11 +300,19 @@
 Fai %d díes
   
   Güei
+  Non, gracies
   Editando
   ¿Qué ye esto?
   Escribe una descripción
   Guardar
-  Amiesta una 
descripción
+  Amestar una descripción 
curtia
+  Editar la 
descripción
+  Encaboxar
+  Ayuda: descripción de 
títulos
+  Tocante a 
Wikidata
+  Guía de Wikidata pa 
escribir descripciones
+  https://www.wikidata.org/wiki/Wikidata:Introduction
+  https://www.wikidata.org/wiki/Help:Description#Guidelines_for_descriptions_in_English
   Guardóse la 
descripción
   Acabes d\'ameyorar 
Wikipedia pa toos
   Fecho
diff --git a/app/src/main/res/values-bn/strings.xml 
b/app/src/main/res/values-bn/strings.xml
index dcd6b21..a8a6f98 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -302,5 +302,12 @@
   এটি কী?
   একটি বিবরণ লিখুন!
   সংরক্ষণ
-  বিবরণ যোগ 
করুন
+  সংক্ষিপ্ত বিবরণ যোগ 
করুন
+  বিবরণ সম্পাদনা করুন
+  বাতিল
+  সাহায্য: শিরোনামের বিবরণ
+  উইকিউপাত্ত 
সম্পর্কে
+  বিবরণ লেখার জন্য 
উইকিউপাত্তের নির্দেশিকা
+  https://www.wikidata.org/wiki/Wikidata:Introduction/bn
+  https://www.wikidata.org/wiki/Help:Description/bn
 
diff --git a/app/src/main/res/values-ca/strings.xml 
b/app/src/main/res/values-ca/strings.xml
index bf2d83c..e0696bc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -90,7 +90,7 @@
   Següent
   Crea un compte
   General
-  PMF de l\'app de la Viquipèdia
+  PMF de l\'aplicació de la 
Viquipèdia
   L\'accés gratuït a la Viquipèdia ja no 
és actiu.
   Avisa\'m si se surt de Viquipèdia 
Zero
   Si el vostre operador de 
telefonia mòbil ha renunciat a cobrar per l\'accés de dades des de l\'aplicació 
de la Viquipèdia gràcies a un acord amb Viquipèdia Zero, en deixar aquest 
paràmetre habilitat se us avisarà quan sortiu de l\'aplicació de la Viquipèdia, 
moment en què us poden tornar a cobrar.
@@ -300,11 +300,19 @@
 Fa %d dies
   
   Avui
+  No, gràcies
   Modificació
   Què és això?
   Escriviu una descripció!
   Desa
-  Afegeix una 
descripció
+  Afegeix una descripció 
curta
+  Modifica la 
descripció
+  Cancel·la
+  Ajuda: descripcions dels 
títols
+  Quant a Wikidata
+  Guia de Wikidata per a 
escriure descripcions
+  https://www.wikidata.org/wiki/Wikidata:Introduction/ca
+  https://www.wikidata.org/wiki/Help:Description#Guidelines_for_descriptions_in_English
   S\'ha desat la 
descripció!
   Acabeu de millorar la 
Viquipèdia per a tothom
   Fet
diff --git a/app/src/main/res/values-da/strings.xml 
b/app/src/main/res/values-da/strings.xml
index c215ed6..435f809 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -238,6 +238,9 @@
   Tilføj denne artikel til en 
læseliste
   Del link til artiklen
   Naviger til det

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: PSR-4 autoload definition

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

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

Change subject: PSR-4 autoload definition
..


PSR-4 autoload definition

Change-Id: I776b71328f16ce8c671649ff22b118e9bfafacd1
---
M composer.json
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/composer.json b/composer.json
index 5c69699..90c6b25 100644
--- a/composer.json
+++ b/composer.json
@@ -63,8 +63,11 @@
"repo/Wikibase.hooks.php"
],
"psr-4": {
+   "Wikibase\\Client\\": "client/includes",
"Wikibase\\Client\\Tests\\": 
"client/tests/phpunit/includes",
+   "Wikibase\\Lib\\": "lib/includes",
"Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
+   "Wikibase\\Repo\\": "repo/includes",
"Wikibase\\Repo\\Tests\\": 
"repo/tests/phpunit/includes",
"Wikibase\\View\\": "view/src",
"Wikibase\\View\\Tests\\": "view/tests/phpunit"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I776b71328f16ce8c671649ff22b118e9bfafacd1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (da4a0b5)

2017-01-03 Thread Jforrester (Code Review)

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

Change subject: Update VE core submodule to master (da4a0b5)
..

Update VE core submodule to master (da4a0b5)

New changes:
8562e02 Ensure document is always sliced in #insertDocument when newDocRange 
passed
38885da Unwrap single pasted content branch nodes
afcc2b5 Use this.document directly in surface fragment
9a06a01 Don't show help for a trigger if the command is not registered
16fa88e Rename 'commandName' to 'commandHelpName' and refactor object copy
8640858 Localisation updates from https://translatewiki.net.
3e147fd Localisation updates from https://translatewiki.net.
df590e3 ce.Surface: in blur, make sure activeElement exists before blurring it
2883d2a Localisation updates from https://translatewiki.net.
89b8927 Remove serialization test cheat; make tests actually pass
41e77ad ve.ce.CommentNode: Don't assume icon exists yet
55185ec Rebaser: Allow document id & server to be changed by config
3b06cf3 Filter out nodes completely sanitized away by DOMPurify
755768c Pass dm doc to deserialize to hydrate selections properly
a9b1c86 DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR
3796061 Remove unit test hack, no longer needed.
ef7b4e4 Rebaser: Separate namespace creation from /doc/edit
da4a0b5 Localisation updates from https://translatewiki.net.

Bug: T153247
Bug: T153249
Bug: T153960
Change-Id: Iaa277b86aea4182c8e96ec6ad4ed6c1beaf00ee1
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index f8fc228..da4a0b5 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit f8fc2287b8d7a73ca2823da6e289a8e4c3454f5c
+Subproject commit da4a0b59b7a648778244052f66eb09856713154a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa277b86aea4182c8e96ec6ad4ed6c1beaf00ee1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] operations/puppet[production]: Enable enhanced sandbox privilege separation for sshd

2017-01-03 Thread Muehlenhoff (Code Review)

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

Change subject: Enable enhanced sandbox privilege separation for sshd
..

Enable enhanced sandbox privilege separation for sshd

If 'UsePrivilegeSeparation' is set to "sandbox", it additonally
enables a seccomp-based restriction for the (unprivileged)
pre-auth process.

This feature has been introduced in openssh 5.9, so even trusty
supports it (but we're using a trusty backport in precise-wikimedia
anyway)

Change-Id: Ie08eaa561325848d311f81cf9583ef48b055c72a
---
M modules/ssh/templates/sshd_config.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ssh/templates/sshd_config.erb 
b/modules/ssh/templates/sshd_config.erb
index 184523d..1a6ba21 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -18,7 +18,7 @@
 HostKey /etc/ssh/ssh_host_ecdsa_key
 HostKey /etc/ssh/ssh_host_ed25519_key
 #Privilege Separation is turned on for security
-UsePrivilegeSeparation yes
+UsePrivilegeSeparation sandbox
 
 <%- if @disable_nist_kex -%>
 KexAlgorithms curve25519-sha...@libssh.org,diffie-hellman-group-exchange-sha256

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Changed descriptionmsg to description in extension.json

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

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

Change subject: Changed descriptionmsg to description in extension.json
..


Changed descriptionmsg to description in extension.json

Was not an message key

Also update url to https

Change-Id: I5689b37153b76d24495e2c9bde5c116fadd4d2a1
---
M extension.json
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/extension.json b/extension.json
index 5301b06..ce28383 100644
--- a/extension.json
+++ b/extension.json
@@ -2,10 +2,10 @@
   "name": "LinkedWiki",
   "version": "3.0.0 Alpha",
   "author": [
-"[http://www.mediawiki.org/wiki/User:Karima_Rafes Karima Rafes]"
+"[https://www.mediawiki.org/wiki/User:Karima_Rafes Karima Rafes]"
   ],
-  "url": "http://www.mediawiki.org/wiki/Extension:LinkedWiki;,
-  "descriptionmsg": "See the Linked Data in your Wiki.",
+  "url": "https://www.mediawiki.org/wiki/Extension:LinkedWiki;,
+  "description": "See the Linked Data in your Wiki.",
   "license-name": "CC-BY-NC-SA-3.0",
   "type": "datavalues",
   "AutoloadClasses": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5689b37153b76d24495e2c9bde5c116fadd4d2a1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Fix ExtensionJsonValidationTest::testPassesValidation test

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

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

Change subject: Fix ExtensionJsonValidationTest::testPassesValidation test
..


Fix ExtensionJsonValidationTest::testPassesValidation test

20:34:04 1) ExtensionJsonValidationTest::testPassesValidation with data
set #0 ('/srv/jenkins-workspace/worksp...n.json')
20:34:04 Failed asserting that
'/srv/jenkins-workspace/workspace/mwext-testextension-hhvm/src/extensions/LinkedWiki/extension.json
did pass validation.
20:34:04 [ResourceFileModulePaths] The property group is not defined and
the definition does not allow additional properties
20:34:04 [license-name] Invalid SPDX license identifier, see

20:34:04 ' matches expected false.

Change-Id: I54f6e22c4627364e4a8d7ea5a8952ab2f00c0631
---
M extension.json
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7d01d05..5301b06 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
   ],
   "url": "http://www.mediawiki.org/wiki/Extension:LinkedWiki;,
   "descriptionmsg": "See the Linked Data in your Wiki.",
-  "license-name": "CC BY-NC-SA-3.0",
+  "license-name": "CC-BY-NC-SA-3.0",
   "type": "datavalues",
   "AutoloadClasses": {
 "Endpoint": "vendor/bordercloud/sparql/Endpoint.php",
@@ -66,16 +66,19 @@
   },
   "ResourceModules": {
 "ext.LinkedWiki.table2CSV": {
+  "group": "ext.LinkedWiki",
   "scripts": [
 "js/table2CSV.js"
   ]
 },
 "ext.LinkedWiki.lwgraph": {
+  "group": "ext.LinkedWiki",
   "scripts": [
 "js/lwgraph.js"
   ]
 },
 "ext.LinkedWiki.flowchart": {
+  "group": "ext.LinkedWiki",
   "scripts": [
 "js/flowchart.js"
   ],
@@ -84,6 +87,7 @@
   ]
 },
 "ext.LinkedWiki.flint": {
+  "group": "ext.LinkedWiki",
   "scripts": [
 "js/FlintSparqlEditor/sparql/lib/codemirror.js",
 "js/FlintSparqlEditor/sparql/lib/jquery-migrate-1.0.0.js",
@@ -102,8 +106,7 @@
   },
   "ResourceFileModulePaths": {
 "localBasePath": "",
-"remoteExtPath": "LinkedWiki",
-"group": "ext.LinkedWiki"
+"remoteExtPath": "LinkedWiki"
   },
   "SpecialPages": {
 "linkedwiki-specialsparqlquery": "SpecialSparqlQuery",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54f6e22c4627364e4a8d7ea5a8952ab2f00c0631
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
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...SemanticPageMaker[master]: Replace deprecated "Revision::getText()" calls in SemanticPa...

2017-01-03 Thread Georggi199 (Code Review)

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

Change subject: Replace deprecated "Revision::getText()" calls in 
SemanticPageMaker MediaWiki extension
..

Replace deprecated "Revision::getText()" calls in SemanticPageMaker MediaWiki 
extension

Bug: T151973
Change-Id: Ic0b1fb52eb14c6311c71a9f00bfec09ad1955e63
---
M includes/widgets/SPM_WFAjaxAccess.php
M includes/widgets/SPM_WidgetPage.php
M includes/widgets/SPM_WidgetUtils.php
M includes/widgets/datatype/SPMWidgetDataType.php
M includes/widgets/extra/SPM_WG_Widget.php
M specials/WidgetClone/SPM_WidgetClone.php
6 files changed, 16 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageMaker 
refs/changes/35/330235/1

diff --git a/includes/widgets/SPM_WFAjaxAccess.php 
b/includes/widgets/SPM_WFAjaxAccess.php
index ca7614a..e821c4d 100644
--- a/includes/widgets/SPM_WFAjaxAccess.php
+++ b/includes/widgets/SPM_WFAjaxAccess.php
@@ -177,7 +177,7 @@
 
$page = WikiPage::factory( $revision->getTitle() );
$status = $page->doEditContent(
-   ContentHandler::makeContent( 
$revision->getText(), $revision->getTitle() ),
+   $revision->getContent(),
$summary,
0,
$rid
@@ -196,7 +196,7 @@
 
$revision = Revision::newFromTitle( $title );
if ( $revision == null ) continue;
-   $wiki .= $revision->getText();
+   $wiki .= ContentHandler::getContentText( 
$revision->getContent() );
}
$tmpls = SPMArticleUtils::parsePageTemplates( $wiki );
SPMWidgetViewUtils::initialize();
@@ -255,7 +255,7 @@
$text = "[[{$smwdatatype->getWikiValue()}::" . 
SPMWidgetUtils::getPrefixedText( $template ) . "| ]]\n";
 
$revision = Revision::newFromTitle( $title );
-   if ( $revision != null ) $text .= $revision->getText();
+   if ( $revision != null ) $text .= 
ContentHandler::getContentText( $revision->getContent() );
 
$page = WikiPage::factory( $title );
$ret = $page->doEditContent(
diff --git a/includes/widgets/SPM_WidgetPage.php 
b/includes/widgets/SPM_WidgetPage.php
index 87106ab..b589d08 100644
--- a/includes/widgets/SPM_WidgetPage.php
+++ b/includes/widgets/SPM_WidgetPage.php
@@ -222,7 +222,7 @@
$revision = Revision::newFromTitle( $title );
if ( $revision == null ) return '';
 
-   return $this->getWidgetWiki( $revision->getText(), $title, 
$update );
+   return $this->getWidgetWiki( ContentHandler::getContentText( 
$revision->getContent() ), $title, $update );
}
function loadParentWidgets( $widgets ) {
$wiki = '';
diff --git a/includes/widgets/SPM_WidgetUtils.php 
b/includes/widgets/SPM_WidgetUtils.php
index f4b3407..a484896 100644
--- a/includes/widgets/SPM_WidgetUtils.php
+++ b/includes/widgets/SPM_WidgetUtils.php
@@ -512,7 +512,7 @@
}
}
 
-   $text = $revision->getText();
+   $text = ContentHandler::getContentText( 
$revision->getContent() );
 
$tmpl_name = $title->getDBkey();
$tmpl_data[$tmpl_name] = array();
@@ -660,7 +660,7 @@
SPMWidgetParserFunctions::reset();
global $wgParser, $wgUser;
$options = ParserOptions::newFromUser( $wgUser );
-   $wgParser->parse( $r->getText(), $title, $options );
+   $wgParser->parse( ContentHandler::getContentText( 
$r->getContent() ), $title, $options );
 
$connectorExpressions = 
SPMWidgetParserFunctions::$connectorExpressions;
 
@@ -1004,7 +1004,7 @@
 */
static function updateWidgetConnectors( Title $title, array $wfexps ) {
$revision = Revision::newFromTitle( $title );
-   if ( $revision != null ) $text = $revision->getText();
+   if ( $revision != null ) $text = 
ContentHandler::getContentText( $revision->getContent() );
// remove all wfexp parser functions
$wom = WOMProcessor::parseToWOM( $text );
foreach ( $wom->getObjectsByTypeID( WOM_TYPE_PARSERFUNCTION ) 
as $pf ) {
diff --git a/includes/widgets/datatype/SPMWidgetDataType.php 
b/includes/widgets/datatype/SPMWidgetDataType.php
index c978b78..595cb03 100644
--- a/includes/widgets/datatype/SPMWidgetDataType.php
+++

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add missing QueryAllSpecialPagesTest $queryPages property

2017-01-03 Thread Addshore (Code Review)

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

Change subject: Add missing QueryAllSpecialPagesTest $queryPages property
..

Add missing QueryAllSpecialPagesTest $queryPages property

Change-Id: Ic19e1b5f656599ed1dc06818403a0a8bca8004b7
---
M tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/330238/1

diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php 
b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
index 7b5120c..1208a20 100644
--- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
+++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
@@ -13,6 +13,11 @@
  */
 class QueryAllSpecialPagesTest extends MediaWikiTestCase {
 
+   /**
+* @var SpecialPage[]
+*/
+   private $queryPages;
+
/** List query pages that can not be tested automatically */
protected $manualTest = [
'LinkSearchPage'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: tests: mock should not __clone Database

2017-01-03 Thread Hashar (Code Review)

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

Change subject: tests: mock should not __clone Database
..

tests: mock should not __clone Database

The Database __clone relies on a connLogger which is set in the
constructor.
However, when creating a mock of Database, PHPUnit 5.x does a __clone
which uses a connLogger. That leads to a fatal error.

The sole caller is FileBackendDBRepoWrapperTest, have its mock to skip
invoking __clone().

Change-Id: I2ee3b561104bdacc0232ba5e90b3eae3fbaa6f8f
---
M tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php 
b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
index 410d2df..6c93c79a 100644
--- a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
+++ b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
@@ -113,6 +113,7 @@
 
protected function getMocks() {
$dbMock = $this->getMockBuilder( 'DatabaseMysqli' )
+   ->disableOriginalClone()
->disableOriginalConstructor()
->getMock();
 

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Move kiwix to repong and github

2017-01-03 Thread Nikerabbit (Code Review)

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

Change subject: Move kiwix to repong and github
..

Move kiwix to repong and github

Change-Id: Ic34468d3d9fb4e7355d4ec9e2bb6fb01d1e7073d
---
M REPOCONF
M REPOCONF.commit
M bin/REPONG-PROJECTS
M bin/repocommit
M bin/repoexport
M bin/repoupdate
M repoconfig.commit.json
M repoconfig.json
8 files changed, 19 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/15/330215/1

diff --git a/REPOCONF b/REPOCONF
index f67b560..c420d37 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -15,7 +15,6 @@
 REPO_INTORPHANTALK=https://github.com/Krinkle/mw-tool-orphantalk.git
 REPO_INTRAUN=https://github.com/kenrick95/Raun.git
 REPO_INTREFILL=https://github.com/zhaofengli/refill.git
-REPO_KIWIX=https://github.com/kiwix/maintenance.git
 REPO_MATHJAX=https://github.com/mathjax/MathJax-i18n.git
 REPO_MIFOS=https://github.com/openMF/community-app.git
 REPO_NFCRINGCONTROL=https://github.com/mclear/NFC_Ring_Control.git
diff --git a/REPOCONF.commit b/REPOCONF.commit
index 6c24ba3..0ae558e 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -24,7 +24,6 @@
 REPO_INTORPHANTALK=g...@github.com:Krinkle/mw-tool-orphantalk.git
 REPO_INTRAUN=g...@github.com:kenrick95/Raun.git
 REPO_INTREFILL=g...@github.com:zhaofengli/refill.git
-REPO_KIWIX=g...@github.com:kiwix/maintenance.git
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
 REPO_MIFOS=g...@github.com:openMF/community-app.git
 REPO_NFCRINGCONTROL=g...@github.com:mclear/NFC_Ring_Control.git
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index df2b974..ff82104 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -16,6 +16,7 @@
 int-dcatap
 int-heritage
 jquery.uls
+kiwix
 lib.reviews
 mantis
 mwgerrit
diff --git a/bin/repocommit b/bin/repocommit
index 5408f86..08342eb 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -42,7 +42,6 @@
 int-orphantalk \
 int-raun \
 int-refill \
-kiwix \
 mathjax \
 nfcring-control \
 osm \
diff --git a/bin/repoexport b/bin/repoexport
index 1de0a09..3d245c3 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -58,10 +58,6 @@
php "$EXPORTER" --target . --group=int-refill --lang='*' --skip en 
$HOURS
php "$EXPORTER" --target . --group=int-refill --lang qqq
 
-elif [ "$PROJECT" = "kiwix" ]
-then
-   php "$EXPORTER" --target . --group=out-kiwix --lang='*' --skip en 
--threshold 80
-
 elif [ "$PROJECT" = "mathjax" ]
 then
php "$EXPORTER" --target . --group='out-mathjax-*' --lang='*' --skip 
en,qqq $THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index 6734378..be2e92e 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -50,7 +50,6 @@
 int-orphantalk \
 int-raun \
 int-refill \
-kiwix \
 mathjax \
 nfcring-control \
 vicuna \
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index c91b57f..9a97811 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -193,6 +193,15 @@
}
}
},
+   "kiwix": {
+   "group": "out-kiwix",
+   "repos": {
+   "kiwix": {
+   "type": "github",
+   "url": "g...@github.com:kiwix/maintenance.git"
+   }
+   }
+   },
"lib.reviews": {
"group": "lib.reviews",
"repos": {
diff --git a/repoconfig.json b/repoconfig.json
index 1fab403..7b281c6 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -191,6 +191,15 @@
}
}
},
+   "kiwix": {
+   "group": "out-kiwix",
+   "repos": {
+   "kiwix": {
+   "type": "github",
+   "url": 
"https://github.com/kiwix/maintenance.git;
+   }
+   }
+   },
"lib.reviews": {
"group": "lib.reviews",
"repos": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic34468d3d9fb4e7355d4ec9e2bb6fb01d1e7073d
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...Wikibase[master]: Reduced number of fields for some Special pages and added co...

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

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

Change subject: Reduced number of fields for some Special pages and added 
constructor DI
..


Reduced number of fields for some Special pages and added constructor DI

  * Removed fields `languageCodes` and `languageNameLookup` of 
`SpecialNewEntity` -  not used anymore
  * Moved field `siteLookup` from `SpecialWikibaseRepoPage` to where it is 
actually being used: `SpecialNewItem` and `SpecialSetSiteLink`
  * `SpecialNewItem` and `SpecialNewProperty` now have constructor DI and 
initialized by closure
  * `SpecialNewEntity` removed optionality of restriction argument in 
constructor, replaced by explicit definition in inheritors

Change-Id: Iefe9510a83cedbafc94fbb356d39c31099475570
Bug: T150205
---
M repo/Wikibase.php
M repo/includes/Specials/SpecialModifyEntity.php
M repo/includes/Specials/SpecialNewEntity.php
M repo/includes/Specials/SpecialNewItem.php
M repo/includes/Specials/SpecialNewProperty.php
M repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
M repo/includes/Specials/SpecialSetSiteLink.php
M repo/includes/Specials/SpecialWikibaseRepoPage.php
M repo/tests/phpunit/includes/Specials/SpecialNewEntityTest.php
M repo/tests/phpunit/includes/Specials/SpecialNewItemTest.php
M repo/tests/phpunit/includes/Specials/SpecialNewPropertyTest.php
M repo/tests/phpunit/includes/Specials/SpecialSetLabelDescriptionAliasesTest.php
12 files changed, 79 insertions(+), 66 deletions(-)

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



diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index f4cb472..40689e7 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -180,8 +180,35 @@
$wgAPIListModules['wbsubscribers'] = 
Wikibase\Repo\Api\ListSubscribers::class;
 
// Special page registration
-   $wgSpecialPages['NewItem'] = 
Wikibase\Repo\Specials\SpecialNewItem::class;
-   $wgSpecialPages['NewProperty'] = 
Wikibase\Repo\Specials\SpecialNewProperty::class;
+   $wgSpecialPages['NewItem'] = function () {
+   $wikibaseRepo = 
\Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+
+   $settings = $wikibaseRepo->getSettings();
+   $copyrightView = new 
\Wikibase\Repo\Specials\SpecialPageCopyrightView(
+   new \Wikibase\CopyrightMessageBuilder(),
+   $settings->getSetting( 'dataRightsUrl' ),
+   $settings->getSetting( 'dataRightsText' )
+   );
+
+   return new Wikibase\Repo\Specials\SpecialNewItem(
+   $wikibaseRepo->getSiteLookup(),
+   $copyrightView
+   );
+   };
+   $wgSpecialPages['NewProperty'] = function () {
+   $wikibaseRepo = 
\Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+
+   $settings = $wikibaseRepo->getSettings();
+   $copyrightView = new 
\Wikibase\Repo\Specials\SpecialPageCopyrightView(
+   new \Wikibase\CopyrightMessageBuilder(),
+   $settings->getSetting( 'dataRightsUrl' ),
+   $settings->getSetting( 'dataRightsText' )
+   );
+
+   return new Wikibase\Repo\Specials\SpecialNewProperty(
+   $copyrightView
+   );
+   };
$wgSpecialPages['ItemByTitle'] = 
Wikibase\Repo\Specials\SpecialItemByTitle::class;
$wgSpecialPages['GoToLinkedPage'] = 
Wikibase\Repo\Specials\SpecialGoToLinkedPage::class;
$wgSpecialPages['ItemDisambiguation'] = 
Wikibase\Repo\Specials\SpecialItemDisambiguation::class;
diff --git a/repo/includes/Specials/SpecialModifyEntity.php 
b/repo/includes/Specials/SpecialModifyEntity.php
index 1f894be..aa5acb2 100644
--- a/repo/includes/Specials/SpecialModifyEntity.php
+++ b/repo/includes/Specials/SpecialModifyEntity.php
@@ -74,7 +74,6 @@
$wikibaseRepo->getSummaryFormatter(),
$wikibaseRepo->getEntityRevisionLookup( 'uncached' ),
$wikibaseRepo->getEntityTitleLookup(),
-   $wikibaseRepo->getSiteLookup(),
$wikibaseRepo->newEditEntityFactory( 
$this->getContext() )
);
}
@@ -85,21 +84,18 @@
 * @param SummaryFormatter $summaryFormatter
 * @param EntityRevisionLookup $entityRevisionLookup
 * @param EntityTitleLookup $entityTitleLookup
-* @param SiteLookup $siteLookup
 * @param EditEntityFactory $editEntityFactory
 */
public function setSpecialModifyEntityServices(
SummaryFormatter $summaryFormatter,
EntityRevisionLookup $entityRevisionLookup,
EntityTitleLookup $entityTitleLookup,
-   SiteLookup $siteLookup,
EditEntityFactory $editEntityFactory
)

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace SiteLookup mocks with HashSiteStore

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

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

Change subject: Replace SiteLookup mocks with HashSiteStore
..


Replace SiteLookup mocks with HashSiteStore

In some cases it does not make that much of a difference, but in some
cases this greatly reduces the complexity of the code, making it much
easier to read.

Change-Id: If5580a400451d1bb714be9a760b5c7e87df67567
---
M repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
M repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
M repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
6 files changed, 29 insertions(+), 68 deletions(-)

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



diff --git a/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php 
b/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
index 7a9da5d..e01ef84 100644
--- a/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
+++ b/repo/tests/phpunit/includes/Api/ItemByTitleHelperTest.php
@@ -3,7 +3,9 @@
 namespace Wikibase\Repo\Tests\Api;
 
 use ApiBase;
+use HashSiteStore;
 use MediaWikiSite;
+use Site;
 use SiteLookup;
 use Title;
 use ApiUsageException;
@@ -38,17 +40,13 @@
 * @return SiteLookup
 */
public function getSiteLookupMock() {
-   $dummySite = new MediaWikiSite();
+   $site = $this->getMock( Site::class );
 
-   $siteLookupMock = $this->getMockBuilder( SiteLookup::class )
-   ->disableOriginalConstructor()
-   ->getMock();
+   $site->expects( $this->any() )
+   ->method( 'getGlobalId' )
+   ->will( $this->returnValue( 'FooSite' ) );
 
-   $siteLookupMock->expects( $this->any() )
-   ->method( 'getSite' )
-   ->will( $this->returnValue( $dummySite ) );
-
-   return $siteLookupMock;
+   return new HashSiteStore( [ $site ] );
}
 
/**
diff --git 
a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php 
b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
index 39119b8..0372014 100644
--- a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
+++ b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\DataValue;
 use DataValues\DecimalValue;
+use HashSiteStore;
 use Language;
 use PHPUnit_Framework_TestCase;
 use Site;
@@ -104,14 +105,7 @@
$acme->setGlobalId( 'acme' );
$acme->setLinkPath( "http://acme.com/$1; );
 
-   $mock = $this->getMock( SiteLookup::class );
-   $mock->expects( $this->any() )
-   ->method( 'getSite' )
-   ->will( $this->returnValueMap( [
-   [ 'acme', $acme ],
-   ] ) );
-
-   return $mock;
+   return new HashSiteStore( [ $acme ] );
}
 
 }
diff --git a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
index d5b3ddb..518000f 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Repo\Tests\Specials;
 
 use FauxResponse;
+use HashSiteStore;
 use InvalidArgumentException;
 use Site;
 use SiteLookup;
@@ -53,22 +54,11 @@
 * @return SiteLookup
 */
private function getMockSiteLookup() {
-   $mock = $this->getMock( SiteLookup::class );
-   $mock->expects( $this->any() )
-   ->method( 'getSite' )
-   ->will( $this->returnCallback( function( $siteId ) {
-   if ( substr( $siteId, -4 ) !== 'wiki' ) {
-   return null;
-   }
+   $dewiki = new Site();
+   $dewiki->setGlobalId( 'dewiki' );
+   $dewiki->setLinkPath( 'http://dewiki.com/$1' );
 
-   $site = new Site();
-   $site->setGlobalId( $siteId );
-   $site->setLinkPath( 'http://'.$siteId.'.com/$1' 
);
-
-   return $site;
-   } ) );
-
-   return $mock;
+   return new HashSiteStore( [ $dewiki ] );
}
 
/**
diff --git a/repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php

[MediaWiki-commits] [Gerrit] translatewiki[master]: Drop the deprecated out- prefix from kiwix and jquery-uls

2017-01-03 Thread Nikerabbit (Code Review)

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

Change subject: Drop the deprecated out- prefix from kiwix and jquery-uls
..

Drop the deprecated out- prefix from kiwix and jquery-uls

Using aliases to keep links working.

Change-Id: I462efac3ce9aa91f78c49d78c3b64d6045f6fc8d
---
M TranslateSettings.php
M bin/twn-wikistats
M groups/Kiwix/Kiwix.yaml
M groups/Wikimedia/jquery.uls.yaml
M repoconfig.commit.json
M repoconfig.json
6 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/17/330217/1

diff --git a/TranslateSettings.php b/TranslateSettings.php
index 8f2156c..039b530 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -242,6 +242,7 @@
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/crosswatch.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/GapFinder.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/jquery.uls.yaml";
+$wgTranslateGroupAliases['out-jquery-uls'] = 'jquery-uls';
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/Pageviews.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/video2commons.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/wiki-ai.yaml";
@@ -363,6 +364,7 @@
 
 wfAddNamespace( 1244, 'Kiwix' );
 $wgTranslateGroupFiles[] = "$GROUPS/Kiwix/Kiwix.yaml";
+$wgTranslateGroupAliases['out-kiwix'] = 'kiwix';
 $wgTranslateSupportUrlNamespace[NS_KIWIX] = [
'page' => 'Translating_talk:Kiwix',
'params' => $lqtParams,
diff --git a/bin/twn-wikistats b/bin/twn-wikistats
index 1488206..d184fc0 100755
--- a/bin/twn-wikistats
+++ b/bin/twn-wikistats
@@ -11,7 +11,7 @@
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:FreeCol/stats/trunk" "$PARAMS 
--groups=out-freecol"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:FUDforum/stats/trunk" "$PARAMS 
--groups=out-fudforum"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:iHRIS/stats" "$PARAMS 
--groups=out-ihris-0-all"
-$BASEDIR/wikistats "$WIKI" "$USER" "Translating:Kiwix/stats" "$PARAMS 
--groups=out-kiwix"
+$BASEDIR/wikistats "$WIKI" "$USER" "Translating:Kiwix/stats" "$PARAMS 
--groups=kiwix"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:MantisBT/stats/trunk" "$PARAMS 
--groups=out-mantis-0-all"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:Mifos/stats" "$PARAMS 
--groups=out-mifos"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:OpenStreetMap/stats/trunk" 
"$PARAMS --groups=out-osm-0-all"
diff --git a/groups/Kiwix/Kiwix.yaml b/groups/Kiwix/Kiwix.yaml
index e5a69bd..d1ff853 100644
--- a/groups/Kiwix/Kiwix.yaml
+++ b/groups/Kiwix/Kiwix.yaml
@@ -1,6 +1,6 @@
 ---
 BASIC:
-  id: out-kiwix
+  id: kiwix
   label: Kiwix
   icon: wiki://Kiwix_icon.svg
   description: "{{Special:MyLanguage/Translations:Group 
descriptions/kiwix/en}}"
diff --git a/groups/Wikimedia/jquery.uls.yaml b/groups/Wikimedia/jquery.uls.yaml
index 2cd221b..a5de588 100644
--- a/groups/Wikimedia/jquery.uls.yaml
+++ b/groups/Wikimedia/jquery.uls.yaml
@@ -2,7 +2,7 @@
 BASIC:
   description: "Translations of Universal Language Selector library"
   namespace: NS_WIKIMEDIA
-  id: out-jquery-uls
+  id: jquery-uls
   label: jQuery.ULS
   icon: wiki://JQuery-logo-square.svg
   class: FileBasedMessageGroup
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 9a97811..32d1ec6 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -81,7 +81,7 @@
}
},
"jquery.uls": {
-   "group": "out-jquery-uls",
+   "group": "jquery-uls",
"repos": {
"jquery.uls": {
"type": "github",
@@ -194,7 +194,7 @@
}
},
"kiwix": {
-   "group": "out-kiwix",
+   "group": "kiwix",
"repos": {
"kiwix": {
"type": "github",
diff --git a/repoconfig.json b/repoconfig.json
index 7b281c6..c0d1907 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -79,7 +79,7 @@
}
},
"jquery.uls": {
-   "group": "out-jquery-uls",
+   "group": "jquery-uls",
"repos": {
"jquery.uls": {
"type": "github",
@@ -192,7 +192,7 @@
}
},
"kiwix": {
-   "group": "out-kiwix",
+   "group": "kiwix",
"repos": {
"kiwix": {
"type": "github",

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

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

___

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable subpages in NS0 for arbcom_cswiki

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

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

Change subject: Enable subpages in NS0 for arbcom_cswiki
..


Enable subpages in NS0 for arbcom_cswiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cf2a41b..1d60fe9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4026,6 +4026,7 @@
// @}
 
// Specials wiki @{
+   '+arbcom_cswiki' => [ 0 => 1],
'+arbcom_enwiki' => [ 0 => 1, 6 => 0, 8 => 0, 10 => 0 ],
'+arbcom_nlwiki' => [0 => 1], // T147186
'+auditcomwiki' => [ 0 => 1, 6 => 0, 8 => 0, 10 => 0 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife7d9ffd7c8811eba2bc0919654c3868bf36dcbe
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Urbanecm 
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 reciprocal language fallback for nn and nb (Norwegian)

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

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

Change subject: Add reciprocal language fallback for nn and nb (Norwegian)
..


Add reciprocal language fallback for nn and nb (Norwegian)

https://translatewiki.net/wiki/Thread:Portal_talk:Nb/Language_fallbacks

Change-Id: I597e317ef33758dba8eaa9d6dd458ea3922e3f33
---
M languages/messages/MessagesNb.php
M languages/messages/MessagesNn.php
2 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/languages/messages/MessagesNb.php 
b/languages/messages/MessagesNb.php
index c378f23..548b3db 100644
--- a/languages/messages/MessagesNb.php
+++ b/languages/messages/MessagesNb.php
@@ -47,6 +47,8 @@
  * @author לערי ריינהארט
  */
 
+$fallback = 'nn';
+
 $bookstoreList = [
'Antikvariat.net' => 'http://www.antikvariat.net/',
'Frida' => 
'http://wo.uio.no/as/WebObjects/frida.woa/wa/fres?action=sok=$1=1=alfabetisk=50',
@@ -83,6 +85,14 @@
 $separatorTransformTable = [ ',' => "\xc2\xa0", '.' => ',' ];
 $linkTrail = '/^([æøåa-z]+)(.*)$/sDu';
 
+$datePreferenceMigrationMap = [
+   'default',
+   'mdy',
+   'dmy',
+   'ymd'
+];
+$defaultDateFormat = 'dmy';
+
 $dateFormats = [
'mdy time' => 'H:i',
'mdy date' => 'M j., Y',
diff --git a/languages/messages/MessagesNn.php 
b/languages/messages/MessagesNn.php
index 5ceafd1..5b599a9 100644
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -42,6 +42,8 @@
  * @see 
https://nn.wikipedia.org/w/index.php?title=Brukar:Dittaeva/LanguageNn.php=history
  */
 
+$fallback = 'nb';
+
 $datePreferences = [
'default',
'dmyt',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I597e317ef33758dba8eaa9d6dd458ea3922e3f33
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Jon Harald Søby 
Gerrit-Reviewer: Reedy 
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] operations/puppet[production]: docker::baseimages: improvements to script to build alpine l...

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

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

Change subject: docker::baseimages: improvements to script to build alpine linux
..


docker::baseimages: improvements to script to build alpine linux

Change-Id: Ifb5adc316f2e0a0cec8461ddfcc0d82ebd05dc5f
---
M modules/docker/templates/images/build-base-images.erb
1 file changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/modules/docker/templates/images/build-base-images.erb 
b/modules/docker/templates/images/build-base-images.erb
index e94afa2..05003b0 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -20,20 +20,26 @@
 <%- end -%>
 <%- if @distributions.include?('alpine') -%>
 
+<%- if @proxy_address -%>
+export https_proxy=http://<%= @proxy_address %>:<%= @proxy_port %>
+<%- end -%>
 # Build the latest alpine version
 (cd /srv/images/alpine && git checkout master && git pull --rebase)
 AP_BASE="/srv/images/alpine/versions"
-AP_VERSIONS=("${AP_BASE}/library-?.?")
-AP_DIR=${AP_VERSIONS[-1]}
+AP_VERSIONS=( ${AP_BASE}/library-?.? )
+AP_DIR="${AP_VERSIONS[-1]}"
 AP_BRANCH="rootfs/${AP_DIR#$AP_BASE}"
 
-(cd $ALPINE_DIR && git remote update && \
- git checkout $AP_BRANCH && docker build .)
+(cd $AP_DIR && git remote update && \
+ git checkout $AP_BRANCH)
 # Now get the release tag from the repos own variables
 source ${AP_DIR}/options
+(cd $AP_DIR && docker build . -t ${TAGS[0]})
 for tag in $TAGS; do
+docker tag ${TAGS[0]} <%= @docker_registry %>/${tag};
 docker push <%= @docker_registry %>/${tag};
 done;
 # This is the latest version, so...
-docker push <%= @docker_registry %>/alpine
+docker tag ${TAGS[0]} <%= @docker_registry %>/alpine:latest
+docker push <%= @docker_registry %>/alpine:latest
 <%- end -%>

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Use strlen to get length of string

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

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

Change subject: Use strlen to get length of string
..


Use strlen to get length of string

Count is used for arrays

Change-Id: Ica9871d020bcb8db0f9149aaf3f838c93af54327
---
M frontend/RejectConfirmationFormUI.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/frontend/RejectConfirmationFormUI.php 
b/frontend/RejectConfirmationFormUI.php
index 025b144..4637193 100755
--- a/frontend/RejectConfirmationFormUI.php
+++ b/frontend/RejectConfirmationFormUI.php
@@ -120,7 +120,7 @@
)->numParams( count( $rejectAuthors ) 
)->inContentLanguage()->text();
// If the message is too big, then fallback to the shorter one
$colonSeparator = wfMessage( 'colon-separator' )->text();
-   $maxLen = 255 - count( $colonSeparator ) - count( $comment );
+   $maxLen = 255 - strlen( $colonSeparator ) - strlen( $comment );
if ( strlen( $defaultSummary ) > $maxLen ) {
$msg = $newRev->isCurrent()
? 'revreview-reject-summary-cur-short' 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica9871d020bcb8db0f9149aaf3f838c93af54327
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Added support for CommonsDataType

2017-01-03 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330228 )

Change subject: Added support for CommonsDataType
..

Added support for CommonsDataType

Bug: T57549
Change-Id: Ia2b4b67167014fac048c2abd4e713d059577a0a4
---
M RELEASE-NOTES.md
M ValueView.php
M lib/jquery.ui/jquery.ui.commonssuggester.js
A src/experts/CommonsDataType.js
M src/experts/resources.php
5 files changed, 84 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/data-values/value-view 
refs/changes/28/330228/1

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 2e273c6..a6de541 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,8 @@
 # ValueView release notes
 
+## 0.18.1 (2016-01-03)
+* Added support for CommonsDataType.
+
 ## 0.18.0 (2016-10-14)
 * `jQuery.ui.commonssuggester` now allows pasting full and partial Wikimedia 
Commons URLs.
 * Added support for `null` precision to `GlobeCoordinateInput`.
diff --git a/ValueView.php b/ValueView.php
index cc535df..5e3f98f 100644
--- a/ValueView.php
+++ b/ValueView.php
@@ -5,7 +5,7 @@
return 1;
 }
 
-define( 'VALUEVIEW_VERSION', '0.18.0' );
+define( 'VALUEVIEW_VERSION', '0.18.1' );
 
 // Include the composer autoloader if it is present.
 if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
diff --git a/lib/jquery.ui/jquery.ui.commonssuggester.js 
b/lib/jquery.ui/jquery.ui.commonssuggester.js
index 2720637..9150477 100644
--- a/lib/jquery.ui/jquery.ui.commonssuggester.js
+++ b/lib/jquery.ui/jquery.ui.commonssuggester.js
@@ -1,6 +1,11 @@
 ( function( $, util ) {
'use strict';
 
+   var NAMESPACE = {
+   MEDIA: 6,
+   DATA: 486
+   };
+
/**
 * Commons suggester.
 * Enhances an input box with suggestion functionality for Wikimedia 
Commons asset names.
@@ -19,7 +24,8 @@
 * @see jQuery.ui.suggester.options
 */
options: {
-   ajax: $.ajax
+   ajax: $.ajax,
+   namespace: NAMESPACE.MEDIA
},
 
/**
@@ -51,7 +57,7 @@
data: {
search: 
self._grepFileTitleFromTerm( term ),
action: 'opensearch',
-   namespace: 6
+   namespace: 
self.options.namespace
},
timeout: 8000
} )
@@ -100,6 +106,19 @@
}
 
return new $.ui.ooMenu.Item( label, suggestion );
+   },
+
+   /**
+* Set the namespace to search in
+*
+* @param {string} namespace (media or data)
+*/
+   setNamespace: function( namespace ) {
+   namespace = namespace.toUpperCase();
+
+   if ( NAMESPACE[namespace] ) {
+   this.options.namespace = NAMESPACE[namespace];
+   }
}
 
} );
diff --git a/src/experts/CommonsDataType.js b/src/experts/CommonsDataType.js
new file mode 100644
index 000..57eb885
--- /dev/null
+++ b/src/experts/CommonsDataType.js
@@ -0,0 +1,46 @@
+( function( $, vv ) {
+   'use strict';
+
+   var PARENT = vv.experts.StringValue;
+
+   /**
+* `Valueview` expert for adding specialized handling for `CommonsData` 
data type.
+* Without this more specialized expert, the `StringValue` expert would 
be used since the
+* `CommonsData` data type is using the `String` data value type.
+* This expert is based on the ``StringValue` expert but will add a 
drop-down for choosing
+* Commons data sources. It will also display the value as a link to 
Commons.
+* @class jQuery.valueview.experts.CommonsDataType
+* @extends jQuery.valueview.experts.StringValue
+* @since 0.1
+* @licence GNU GPL v2+
+* @author Jonas Kress
+*/
+   vv.experts.CommonsDataType = vv.expert( 'CommonsDataType', PARENT, {
+   /**
+* @inheritdoc
+* @protected
+*/
+   _init: function() {
+   PARENT.prototype._init.call( this );
+
+   var notifier = this._viewNotifier,
+   $input = this.$input;
+
+   $input.commonssuggester();
+   $input.data( 'commonssuggester' ).setNamespace( 'DATA' 
);
+
+   // Using the inputautoexpand plugin, the position of 
the dropdown needs to be updated
+   // whenever the input box expands vertically:
+

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Run loaded banana task on test

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

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

Change subject: Run loaded banana task on test
..


Run loaded banana task on test

It was already in package.json, just use it

Change-Id: Ic9f965a52d0fb8a75d69442b86eeb83f82515f81
---
M Gruntfile.js
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 154d77c..ac8dce5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,7 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
 
grunt.initConfig( {
jsonlint: {
@@ -9,9 +10,14 @@
'**/*.json',
'!node_modules/**'
]
+   },
+   banana: {
+   all: [
+   '**/i18n/'
+   ]
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint' ] );
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9f965a52d0fb8a75d69442b86eeb83f82515f81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fixed variable interpolation in DataOutputFormatter.php

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

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

Change subject: Fixed variable interpolation in DataOutputFormatter.php
..


Fixed variable interpolation in DataOutputFormatter.php

Bug: T154369
Change-Id: Ib51165081797d3aa5e036e3fde771ac92e89baa3
---
M includes/DataOutputFormatter.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/DataOutputFormatter.php b/includes/DataOutputFormatter.php
index ea10eb0..961029c 100644
--- a/includes/DataOutputFormatter.php
+++ b/includes/DataOutputFormatter.php
@@ -165,8 +165,9 @@
 */
protected static function formatNotification( EchoEvent $event, User 
$user, $format, $lang ) {
if ( isset( self::$formatters[$format] ) ) {
+   $class = self::$formatters[$format];
/** @var EchoEventFormatter $formatter */
-   $formatter = new self::$formatters[$format]( $user, 
$lang );
+   $formatter = new $class( $user, $lang );
return $formatter->format( $event );
} else {
return false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib51165081797d3aa5e036e3fde771ac92e89baa3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Georggi199 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Reedy 
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...Wikibase[master]: Cleanup EntityDiffVisualizerTest

2017-01-03 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330229 )

Change subject: Cleanup EntityDiffVisualizerTest
..

Cleanup EntityDiffVisualizerTest

This is a direct follow up that picks up the changes done in
I2f53b0e. Main changes in here are:

* There was only a single case using assertRegExp(). I replaced this
  with a dedicated test method.
* Replaced all assertTag() with assertContains().
* The Context, Language and Message stuff is now entirely mocked and
  does not use real translations any more.

Change-Id: Ie06b7cdfcee9ba1264c23a989b1ec5c8c7865711
---
M repo/includes/Diff/DiffView.php
M repo/includes/Diff/EntityDiffVisualizer.php
M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
3 files changed, 63 insertions(+), 58 deletions(-)


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

diff --git a/repo/includes/Diff/DiffView.php b/repo/includes/Diff/DiffView.php
index e45463a..9eff5c6 100644
--- a/repo/includes/Diff/DiffView.php
+++ b/repo/includes/Diff/DiffView.php
@@ -32,11 +32,6 @@
 class DiffView extends ContextSource {
 
/**
-* @var SiteLookup
-*/
-   private $siteLookup;
-
-   /**
 * @var string[]
 */
private $path;
@@ -45,6 +40,11 @@
 * @var Diff
 */
private $diff;
+
+   /**
+* @var SiteLookup
+*/
+   private $siteLookup;
 
/**
 * @var EntityIdFormatter
@@ -74,12 +74,13 @@
) {
$this->path = $path;
$this->diff = $diff;
-   $this->entityIdFormatter = $entityIdFormatter;
$this->siteLookup = $siteLookup;
+   $this->entityIdFormatter = $entityIdFormatter;
 
if ( !is_null( $contextSource ) ) {
$this->setContext( $contextSource );
}
+
$this->siteLinkPath = $this->msg( 'wikibase-diffview-link' 
)->text();
}
 
@@ -105,16 +106,17 @@
 */
private function generateOpHtml( array $path, DiffOp $op ) {
if ( $op->isAtomic() ) {
-   $translatedPath = $path;
+   $localizedPath = $path;
 
-   if ( $this->isSiteLinkPath( $path ) ) {
+   if ( $this->isSiteLinkPath( $path ) && isset( $path[2] 
) ) {
$translatedLinkSubPath = $this->msg( 
'wikibase-diffview-link-' . $path[2] );
+
if ( !$translatedLinkSubPath->isDisabled() ) {
-   $translatedPath[2] = 
$translatedLinkSubPath->text();
+   $localizedPath[2] = 
$translatedLinkSubPath->text();
}
}
 
-   $html = $this->generateDiffHeaderHtml( implode( ' / ', 
$translatedPath ) );
+   $html = $this->generateDiffHeaderHtml( implode( ' / ', 
$localizedPath ) );
 
//TODO: no path, but localized section title
 
@@ -209,9 +211,20 @@
} else {
$value = $this->getSiteLinkElement( $path[1], 
$value );
}
+
return Html::rawElement( $tag, array( 'class' => 
'diffchange diffchange-inline' ), $value );
}
+
return Html::element( $tag, array( 'class' => 'diffchange 
diffchange-inline' ), $value );
+   }
+
+   /**
+* @param string[] $path
+*
+* @return bool
+*/
+   private function isSiteLinkPath( array $path ) {
+   return $path[0] === $this->siteLinkPath && isset( $path[1] );
}
 
/**
@@ -267,14 +280,6 @@
$html .= Html::closeElement( 'tr' );
 
return $html;
-   }
-
-   /**
-* @param  string[] $path
-* @return boolean
-*/
-   private function isSiteLinkPath( array $path ) {
-   return count( $path ) === 3 && $path[0] === $this->siteLinkPath;
}
 
 }
diff --git a/repo/includes/Diff/EntityDiffVisualizer.php 
b/repo/includes/Diff/EntityDiffVisualizer.php
index 4776733..10a3e74 100644
--- a/repo/includes/Diff/EntityDiffVisualizer.php
+++ b/repo/includes/Diff/EntityDiffVisualizer.php
@@ -61,7 +61,8 @@
 * @param SiteLookup $siteLookup
 * @param EntityIdFormatter $entityIdFormatter
 */
-   public function __construct( IContextSource $contextSource,
+   public function __construct(
+   IContextSource $contextSource,
ClaimDiffer $claimDiffer,
ClaimDifferenceVisualizer $claimDiffView,
SiteLookup $siteLookup,
@@ -107,13 +108,13 @@
$html = '';
 
$termDiffVisualizer = new DiffView(
-

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Specify the namespace when linking to Special:EntityPage

2017-01-03 Thread WMDE-leszek (Code Review)

WMDE-leszek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330214 )

Change subject: Specify the namespace when linking to Special:EntityPage
..

Specify the namespace when linking to Special:EntityPage

Title::makeTitle docs state that page title should be provided
unprefixed.

Change-Id: Ied506ed075dfb68ddaf7c18ca00765c78b5feeeb
---
M repo/includes/Content/EntityContentFactory.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/repo/includes/Content/EntityContentFactory.php 
b/repo/includes/Content/EntityContentFactory.php
index 65a655c..193623d 100644
--- a/repo/includes/Content/EntityContentFactory.php
+++ b/repo/includes/Content/EntityContentFactory.php
@@ -105,14 +105,14 @@
 */
public function getTitleForId( EntityId $id ) {
if ( $id->isForeign() ) {
-   $pageName = 'Special:EntityPage/' . $id->getLocalPart();
+   $pageName = 'EntityPage/' . $id->getLocalPart();
 
// TODO: The interwiki prefix *should* be the same as 
the repo name,
//but we have no way to know or guarantee this! 
See T153496.
$interwiki = $id->getRepositoryName();
 
// TODO: use a TitleFactory
-   return Title::makeTitle( 0, $pageName, '', $interwiki );
+   return Title::makeTitle( NS_SPECIAL, $pageName, '', 
$interwiki );
} else {
$handler = $this->getContentHandlerForType( 
$id->getEntityType() );
return $handler->getTitleForId( $id );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied506ed075dfb68ddaf7c18ca00765c78b5feeeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/skins[refs/meta/config]: Remove uneeded subscribe

2017-01-03 Thread Chad (Code Review)

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

Change subject: Remove uneeded subscribe
..


Remove uneeded subscribe

Change-Id: Idc5817a416af123b3e5c2948fb18c6bf1d480d4a
---
M project.config
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/project.config b/project.config
index 6e85a83..35e8f63 100644
--- a/project.config
+++ b/project.config
@@ -13,7 +13,3 @@
all = refs/heads/*:refs/heads/*
 [allowSuperproject "mediawiki/core"]
all = refs/heads/*:refs/heads/*
-[subscribe "mediawiki/skins"]
-   refs = refs/heads/*:refs/heads/*
-[subscribe "mediawiki/core"]
-   refs = refs/heads/*:refs/heads/*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc5817a416af123b3e5c2948fb18c6bf1d480d4a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins
Gerrit-Branch: refs/meta/config
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: SpecialNewLexeme refactoring and addition of input validation

2017-01-03 Thread Aleksey Bekh-Ivanov (WMDE) (Code Review)

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330231 )

Change subject: SpecialNewLexeme refactoring and addition of input validation
..

SpecialNewLexeme refactoring and addition of input validation

  * added separate key for lemma language label
  * simplified code in special page itself
  * added input validation for all fields

Bug: T150205
Change-Id: I2d0ee034ae8ccb6af26ab287de443d6189057d4b
---
M i18n/en.json
M i18n/qqq.json
M src/Specials/SpecialNewLexeme.php
M tests/phpunit/mediawiki/Specials/SpecialNewLexemeTest.php
4 files changed, 178 insertions(+), 347 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index ae92306..891a4a7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,6 +6,7 @@
"special-newlexeme": "Create a new lexeme",
"wikibase-newlexeme-fieldset": "Create a new lexeme",
"wikibase-newlexeme-lemma": "Lemma",
+   "wikibase-newlexeme-lemma-language": "Lemma language",
"wikibase-lemma-edit-placeholder": "Enter the lemma",
"wikibase-newlexeme-lexicalcategory": "Lexical category",
"wikibase-lexicalcategory-edit-placeholder": "Enter the lexical 
category item ID e.g. Q10",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d65eccb..324220c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,6 +11,7 @@
"special-newlexeme": "Title of Special:NewLexeme",
"wikibase-newlexeme-fieldset": "Title of the form in Special:NewLexeme",
"wikibase-newlexeme-lemma": "Name for \"Lemma\"\n{{Identical|Lemma}}",
+   "wikibase-newlexeme-lemma-language": "Name for \"Lemma\" language",
"wikibase-lemma-edit-placeholder": "Placeholder content for lemma",
"wikibase-newlexeme-lexicalcategory": "Name for \"lexical category\"",
"wikibase-lexicalcategory-edit-placeholder": "Placeholder content for 
lexical category",
diff --git a/src/Specials/SpecialNewLexeme.php 
b/src/Specials/SpecialNewLexeme.php
index 182ebbb..a2c0e5a 100644
--- a/src/Specials/SpecialNewLexeme.php
+++ b/src/Specials/SpecialNewLexeme.php
@@ -2,9 +2,6 @@
 
 namespace Wikibase\Lexeme\Specials;
 
-use Html;
-use HTMLForm;
-use InvalidArgumentException;
 use Status;
 use Wikibase\CopyrightMessageBuilder;
 use Wikibase\DataModel\Entity\EntityDocument;
@@ -12,13 +9,12 @@
 use Wikibase\DataModel\Term\Term;
 use Wikibase\DataModel\Term\TermList;
 use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lib\LanguageNameLookup;
+use Wikibase\Repo\Specials\HTMLForm\HTMLContentLanguageField;
+use Wikibase\Repo\Specials\HTMLForm\HTMLTrimmedTextField;
+use Wikibase\Repo\Specials\SpecialNewEntity;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Repo\Specials\SpecialWikibaseRepoPage;
 use Wikibase\Repo\Specials\SpecialPageCopyrightView;
 use Wikibase\Summary;
-use Wikibase\View\LanguageDirectionalityLookup;
-use Wikimedia\Assert\Assert;
 
 /**
  * Page for creating new Lexeme entities that contain a Fingerprint.
@@ -26,331 +22,151 @@
  *
  * @license GPL-2.0+
  */
-class SpecialNewLexeme extends SpecialWikibaseRepoPage {
+class SpecialNewLexeme extends SpecialNewEntity {
 
-   /**
-* Contains pieces of the sub-page name of this special page if a 
subpage was called.
-* E.g. [ 'a', 'b' ] in case of 'Special:NewLexeme/a/b'
-* @var string[]|null
-*/
-   protected $parts = null;
-
-   /**
-* @var string|null
-*/
-   private $lemma;
-
-   /**
-* @var string
-*/
-   private $contentLanguageCode;
-
-   /**
-* @var string[]
-*/
-   private $languageCodes;
-
-   /**
-* @var SpecialPageCopyrightView
-*/
-   private $copyrightView;
-
-   /**
-* @var LanguageDirectionalityLookup
-*/
-   private $languageDirectionalityLookup;
-
-   /**
-* @var string
-*/
-   private $lexicalCategory;
-
-   /**
-* @var string
-*/
-   private $language;
-
-   /**
-* @var LanguageNameLookup
-*/
-   private $languageNameLookup;
+   const FIELD_LEXEME_LANGUAGE = 'lexeme-language';
+   const FIELD_LEXICAL_CATEGORY = 'lexicalcategory';
+   const FIELD_LEMMA = 'lemma';
+   const FIELD_LEMMA_LANGUAGE = 'lemma-language';
 
public function __construct() {
-   parent::__construct( 'NewLexeme', 'createpage' );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
 
$settings = $wikibaseRepo->getSettings();
-   $this->copyrightView = new SpecialPageCopyrightView(
+   $copyrightView = new SpecialPageCopyrightView(
new CopyrightMessageBuilder(),
$settings->getSetting( 'dataRightsUrl' ),

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added more alias options for "calendar" format

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

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

Change subject: Added more alias options for "calendar" format
..


Added more alias options for "calendar" format

Patch by Duncan Crane.

Change-Id: Ic4c8524b38a2dde8055823f1aa05b6be447fba3a
---
M specials/CargoExport.php
1 file changed, 26 insertions(+), 3 deletions(-)

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



diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index 8c83baa..401202c 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -125,6 +125,28 @@
} else {
$eventTitle = reset( $queryResult );
}
+   if ( array_key_exists( 'color', $queryResult ) 
) {
+   $eventColor = $queryResult['color'];
+   } else {
+   $eventColor = $colorArray[$i];
+   }
+   if ( array_key_exists( 'text color', 
$queryResult ) ) {
+   $eventTextColor = $queryResult['text 
color'];
+   } else {
+   $eventTextColor = $textColorArray[$i];
+   }
+   if ( array_key_exists( 'start', $queryResult ) 
) {
+   $eventStart = $queryResult['start'];
+   } else {
+   $eventStart = 
$queryResult[$dateFieldAliases[0]];
+   }
+   if ( array_key_exists( 'end', $queryResult ) ) {
+   $eventEnd = $queryResult['end'];
+   } elseif ( count( $dateFieldAliases ) > 1 && 
array_key_exists( $dateFieldAliases[1], $queryResult ) ) {
+   $eventEnd = 
$queryResult[$dateFieldAliases[1]];
+   } else {
+   $eventEnd = null;
+   }
if ( array_key_exists( 'description', 
$queryResult ) ) {
$eventDescription = 
$queryResult['description'];
} else {
@@ -141,9 +163,10 @@
// necessarily the page name.
'title' => $eventTitle,
'url' => $title->getLocalURL(),
-   'start' => 
$queryResult[$dateFieldAliases[0]],
-   'color' => $colorArray[$i],
-   'textColor' => $textColorArray[$i],
+   'start' => $eventStart,
+   'end' => $eventEnd,
+   'color' => $eventColor,
+   'textColor' => $eventTextColor,
'description' => $eventDescription
);
if ( $startDatePrecision != 
CargoStore::DATE_AND_TIME ) {

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

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

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

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

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

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

Change subject: Typo fixes
..

Typo fixes

Change-Id: I8eb6ad556cee11f63fa0f4bbeea3940e5dcdfdee
---
M includes/PF_AutocompleteAPI.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/25/330225/2

diff --git a/includes/PF_AutocompleteAPI.php b/includes/PF_AutocompleteAPI.php
index bd0765e..fdb9554 100644
--- a/includes/PF_AutocompleteAPI.php
+++ b/includes/PF_AutocompleteAPI.php
@@ -146,7 +146,7 @@
}
 
protected function getDescription() {
-   return 'Autocompletion call used by the Page Forms extension 
(http://www.mediawiki.org/Extension:Page_F)';
+   return 'Autocompletion call used by the Page Forms extension 
(https://www.mediawiki.org/Extension:Page_Forms)';
}
 
protected function getExamples() {
@@ -333,7 +333,7 @@
$queryResults = $sqlQuery->run();
 
foreach ( $queryResults as $row ) {
-   // @TODO - this check should not be neceaary.
+   // @TODO - this check should not be necessary.
if ( ( $value = $row[$cargoFieldAlias] ) != '' ) {
$values[] = $value;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eb6ad556cee11f63fa0f4bbeea3940e5dcdfdee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Added support for CommonsDataType

2017-01-03 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330230 )

Change subject: [WIP] Added support for CommonsDataType
..

[WIP] Added support for CommonsDataType

Bug: T57549
Change-Id: I25de2783205aa30b4e1a465dc4b7ad7eb859bed9
---
M client/WikibaseClient.datatypes.php
M composer.json
M lib/WikibaseLib.datatypes.php
M lib/i18n/en.json
M lib/i18n/qqq.json
M lib/includes/Formatters/WikibaseValueFormatterBuilders.php
M repo/resources/experts/getStore.js
M repo/resources/experts/resources.php
M repo/resources/parsers/getStore.js
9 files changed, 37 insertions(+), 1 deletion(-)


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

diff --git a/client/WikibaseClient.datatypes.php 
b/client/WikibaseClient.datatypes.php
index 2919d67..ab4b6fe 100644
--- a/client/WikibaseClient.datatypes.php
+++ b/client/WikibaseClient.datatypes.php
@@ -78,6 +78,12 @@
return $factory->newCommonsMediaFormatter( 
$format, $options );
},
],
+   'PT:commonsData' => [
+   'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
+   $factory = 
WikibaseClient::getDefaultValueFormatterBuilders();
+   return $factory->newCommonsDataFormatter( 
$format, $options );
+   },
+   ],
'VT:time' => [
'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
$factory = 
WikibaseClient::getDefaultValueFormatterBuilders();
diff --git a/composer.json b/composer.json
index 5c69699..38d0730 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"data-values/data-types": "~1.0.0",
"data-values/serialization": "~1.1",
"data-values/javascript": "~0.8.3",
-   "data-values/value-view": "~0.18.0",
+   "data-values/value-view": "~0.18.1",
"wikibase/data-model": "^6.3.1",
"wikibase/data-model-serialization": "~2.2",
"wikibase/internal-serialization": "~2.3",
diff --git a/lib/WikibaseLib.datatypes.php b/lib/WikibaseLib.datatypes.php
index 575403e..a4eb4d5 100644
--- a/lib/WikibaseLib.datatypes.php
+++ b/lib/WikibaseLib.datatypes.php
@@ -17,6 +17,7 @@
 
 return array(
'PT:commonsMedia'  => array( 'value-type' => 'string' ),
+   'PT:commonsData'   => array( 'value-type' => 'string' ),
'PT:globe-coordinate'  => array( 'value-type' => 'globecoordinate' ),
'PT:monolingualtext'   => array( 'value-type' => 'monolingualtext' ),
'PT:quantity'  => array( 'value-type' => 'quantity' ),
diff --git a/lib/i18n/en.json b/lib/i18n/en.json
index 876bf99..ad67091 100644
--- a/lib/i18n/en.json
+++ b/lib/i18n/en.json
@@ -73,6 +73,7 @@
"datatypes-type-wikibase-item": "Item",
"datatypes-type-wikibase-property": "Property",
"datatypes-type-commonsMedia": "Commons media file",
+   "datatypes-type-commonsData": "Commons data file",
"datatypes-type-external-id": "External identifier",
"version-wikibase": "Wikibase",
"wikibase-time-precision-Gannum": "$1 billion years CE",
diff --git a/lib/i18n/qqq.json b/lib/i18n/qqq.json
index 0ad24ef..90d4b50 100644
--- a/lib/i18n/qqq.json
+++ b/lib/i18n/qqq.json
@@ -83,6 +83,7 @@
"datatypes-type-wikibase-item": "The name of a data type for items in 
Wikibase.\n{{Identical|Item}}",
"datatypes-type-wikibase-property": "The name of a data type for 
properties in Wikibase.\n{{Identical|Property}}",
"datatypes-type-commonsMedia": "The name of a data type for media files 
on Wikimedia Commons (proper name, capitalised in English; first letter 
capitalised anyway in this message and 
relatives).\n\n{{related|Datatypes-type}}",
+   "datatypes-type-commonsData": "The name of a data type for data files 
on Wikimedia Commons (proper name, capitalised in English; first letter 
capitalised anyway in this message and 
relatives).\n\n{{related|Datatypes-type}}",
"datatypes-type-external-id": "The name of a data type for external 
identifiers in Wikibase.",
"version-wikibase": "Name of the Wikibase extension collection, used on 
[[Special:Version]]",
"wikibase-time-precision-Gannum": "Used to present a point in time with 
the precession of 1 billion of years. $1 is the point in time in billion years, 
rounded to billion years.\n{{Related|Wikibase-time-precision}}",
diff --git a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php 
b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
index 16dbbe9..6317da3 100644
--- a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
+++

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Proper instantiating of QueryPage special pages in QueryAllS...

2017-01-03 Thread Ladsgroup (Code Review)

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

Change subject: Proper instantiating of QueryPage special pages in 
QueryAllSpecialPagesTest
..

Proper instantiating of QueryPage special pages in QueryAllSpecialPagesTest

Change-Id: If4420067011da756b8a36917f1c35fd2d380dae9
---
M tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/330232/1

diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php 
b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
index c1083af..7b5120c 100644
--- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
+++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
@@ -36,8 +36,9 @@
 
foreach ( QueryPage::getPages() as $page ) {
$class = $page[0];
+   $name = $page[1];
if ( !in_array( $class, $this->manualTest ) ) {
-   $this->queryPages[$class] = new $class;
+   $this->queryPages[$class] = 
SpecialPageFactory::getPage( $name );
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: PSR-4 autoload definition

2017-01-03 Thread Aleksey Bekh-Ivanov (WMDE) (Code Review)

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330237 )

Change subject: PSR-4 autoload definition
..

PSR-4 autoload definition

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


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

diff --git a/composer.json b/composer.json
index 5c69699..1045a92 100644
--- a/composer.json
+++ b/composer.json
@@ -63,8 +63,11 @@
"repo/Wikibase.hooks.php"
],
"psr-4": {
-   "Wikibase\\Client\\Tests\\": 
"client/tests/phpunit/includes",
+   "Wikibase\\Lib\\": "lib/includes",
"Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
+   "Wikibase\\Client\\": "client/includes",
+   "Wikibase\\Client\\Tests\\": 
"client/tests/phpunit/includes",
+   "Wikibase\\Repo\\": "repo/includes",
"Wikibase\\Repo\\Tests\\": 
"repo/tests/phpunit/includes",
"Wikibase\\View\\": "view/src",
"Wikibase\\View\\Tests\\": "view/tests/phpunit"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I776b71328f16ce8c671649ff22b118e9bfafacd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Only consider focusNode/Offset for scrollCursorIntoView

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

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

Change subject: Only consider focusNode/Offset for scrollCursorIntoView
..


Only consider focusNode/Offset for scrollCursorIntoView

The anchorNode/Offset should be allowed off screen. Only
the 'live' end of the selection should stay in view.

Bug: T153601
Change-Id: Ie607501d5f1649942403ae5432a184d92830bd73
---
M src/ui/ve.ui.Surface.js
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index ead9a4a..b45d8ac 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -476,14 +476,15 @@
}
 
view = this.getView();
-   nativeRange = view.getNativeRange();
-   if ( !nativeRange ) {
+
+   if ( !view.nativeSelection.focusNode || OO.ui.contains( 
view.$pasteTarget[ 0 ], view.nativeSelection.focusNode, true ) ) {
return;
}
 
-   if ( OO.ui.contains( view.$pasteTarget[ 0 ], 
nativeRange.startContainer, true ) ) {
-   return;
-   }
+   nativeRange = document.createRange();
+   // We only care about the focus end of the selection, the anchor never 
moves
+   // and should be allowed off screen.
+   nativeRange.setStart( view.nativeSelection.focusNode, 
view.nativeSelection.focusOffset );
 
clientRect = RangeFix.getBoundingClientRect( nativeRange );
if ( !clientRect ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie607501d5f1649942403ae5432a184d92830bd73
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
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...Ids[master]: Introduce CI tests

2017-01-03 Thread Filip (Code Review)

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

Change subject: Introduce CI tests
..

Introduce CI tests

Bug: T154453
Change-Id: I38b45fb716fe503fb41447ff57d97147dcdbdec6
---
A composer.json
M ids_body.php
A phpcs.xml
3 files changed, 42 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ids 
refs/changes/39/330239/1

diff --git a/composer.json b/composer.json
new file mode 100644
index 000..98d41d9
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "scripts": {
+   "fix": "phpcbf",
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ]
+   }
+}
diff --git a/ids_body.php b/ids_body.php
index 76b5268..e6b7603 100644
--- a/ids_body.php
+++ b/ids_body.php
@@ -1,37 +1,39 @@
 
+*/
 
-// 0614-2016 change server to https://tools.wmflabs.org/idsgen/
 class IDS {
static function onParserInit( Parser $parser ) {
$parser->setHook( 'ids', [ __CLASS__, 'idsRender' ] );
return true;
}
-   /*
-* This method handles IDS tags.
-*
-* ⿰電心 ->
-*  https://tools.wmflabs.org/idsgen/⿰電心.svg?字體=宋體; ...>
-*
-* ⿰電心 ->
-*  https://tools.wmflabs.org/idsgen/⿰電心.svg?字體=楷體粗體; ...>
-*
-* @see https://www.mediawiki.org/wiki/Manual:Tag_extensions
-*/
+   /**
+   * This method handles IDS tags.
+   *
+   * ⿰電心 ->
+   *   https://tools.wmflabs.org/idsgen/⿰電心.svg?字體=宋體; ...>
+   *
+   * ⿰電心 ->
+   *   https://tools.wmflabs.org/idsgen/⿰電心.svg?字體=楷體粗體; ...>
+   *
+   * @see https://www.mediawiki.org/wiki/Manual:Tag_extensions
+   */
static function idsRender( $input, array $args, Parser $parser, PPFrame 
$frame ) {
// Support for Simplified "體" (font)
-   $font = isset($args['font']) ? strtr($args['font'] , '体', '體') 
: '宋體';
-   $src = 'https://tools.wmflabs.org/idsgen/' . 
rawurlencode($input) . '.svg?字體=' . rawurlencode($font);
+   $font = isset ( $args['font'] ) ? strtr( $args['font'], '体', 
'體' ) : '宋體';
+   $src = 'https://tools.wmflabs.org/idsgen/' .
+   rawurlencode( $input ) .
+   '.svg?字體=' .
+   rawurlencode( $font );
 
-   return Html::element('img', [
+   return Html::element( 'img', [
'align' => 'middle',
'class' => 'ids-char',  // helps with custom styling
'alt' => $input,
'src' => $src,
'onerror' => 'this.src = this.src.replace(".svg?字體=", 
".png?字體=")',  // png fallback
'style' => 'height: 1em; width: 1em; vertical-align: 
middle; margin: 0.4em 0px 0.7em;'
-   ]);
+   ] );
}
 }
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   .
+   
+   
+   vendor
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38b45fb716fe503fb41447ff57d97147dcdbdec6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ids
Gerrit-Branch: master
Gerrit-Owner: Filip 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Disable statistics update on import with maintenance/importD...

2017-01-03 Thread Subins2000 (Code Review)

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

Change subject: Disable statistics update on import with 
maintenance/importDump.php
..

Disable statistics update on import with maintenance/importDump.php

Disable updating statistics in importDump.php to quickly finish imports from 
command line.

Bug: T144600
Change-Id: Ib827c068fb20cc03aab47e3106d489f18be1dac6
---
M includes/import/WikiImporter.php
M maintenance/importDump.php
2 files changed, 29 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/330223/1

diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php
index 328cdad..4ec4cc7 100644
--- a/includes/import/WikiImporter.php
+++ b/includes/import/WikiImporter.php
@@ -45,6 +45,8 @@
private $importTitleFactory;
/** @var array */
private $countableCache = [];
+   /** @var bool $disableStatisticsUpdate */
+   private $disableStatisticsUpdate = false;
 
/**
 * Creates an ImportXMLReader drawing from the source provided
@@ -304,6 +306,13 @@
}
 
/**
+* @since 1.29
+*/
+   public function disableStatisticsUpdate(){
+   $this->disableStatisticsUpdate = true;
+   }
+
+   /**
 * Default per-page callback. Sets up some things related to site 
statistics
 * @param array $titleAndForeignTitle Two-element array, with Title 
object at
 * index 0 and ForeignTitle object at index 1
@@ -381,21 +390,23 @@
// suffers from issues of replica DB lag. We let WikiPage 
handle the total page
// and revision count, and we implement our own custom logic 
for the
// article (content page) count.
-   $page = WikiPage::factory( $title );
-   $page->loadPageData( 'fromdbmaster' );
-   $content = $page->getContent();
-   if ( $content === null ) {
-   wfDebug( __METHOD__ . ': Skipping article count 
adjustment for ' . $title .
-   ' because WikiPage::getContent() returned null' 
);
-   } else {
-   $editInfo = $page->prepareContentForEdit( $content );
-   $countKey = 'title_' . $title->getPrefixedText();
-   $countable = $page->isCountable( $editInfo );
-   if ( array_key_exists( $countKey, $this->countableCache 
) &&
-   $countable != $this->countableCache[$countKey] 
) {
-   DeferredUpdates::addUpdate( 
SiteStatsUpdate::factory( [
-   'articles' => ( (int)$countable - 
(int)$this->countableCache[$countKey] )
-   ] ) );
+   if ( !$this->disableStatisticsUpdate ){
+   $page = WikiPage::factory( $title );
+   $page->loadPageData( 'fromdbmaster' );
+   $content = $page->getContent();
+   if ( $content === null ) {
+   wfDebug( __METHOD__ . ': Skipping article count 
adjustment for ' . $title .
+   ' because WikiPage::getContent() 
returned null' );
+   } else {
+   $editInfo = $page->prepareContentForEdit( 
$content );
+   $countKey = 'title_' . 
$title->getPrefixedText();
+   $countable = $page->isCountable( $editInfo );
+   if ( array_key_exists( $countKey, 
$this->countableCache ) &&
+   $countable != 
$this->countableCache[$countKey] ) {
+   DeferredUpdates::addUpdate( 
SiteStatsUpdate::factory( [
+   'articles' => ( (int)$countable 
- (int)$this->countableCache[$countKey] )
+   ] ) );
+   }
}
}
 
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index f0e0555..c3deb7f 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -283,6 +283,9 @@
$source = new ImportStreamSource( $handle );
$importer = new WikiImporter( $source, $this->getConfig() );
 
+   // Updating statistics require a lot of time so disable it
+   $importer->disableStatisticsUpdate();
+
if ( $this->hasOption( 'debug' ) ) {
$importer->setDebug( true );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 7c86f63

2017-01-03 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 7c86f63
..

Update restbase to 7c86f63

List of changes:
1c4aaa3 Clean-up: Rearrange the blacklists alphabetically
7c86f63 dewiki: Blacklist Wikipedia_Diskussion:Hauptseite/Schon_gewusst

Change-Id: Id0acca87332b0e3748cc6d23408cbac1879e736b
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/22/330222/1

diff --git a/restbase b/restbase
index 296da9a..7c86f63 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 296da9a0d3b20d92fef51125b1e3196a9fd136ee
+Subproject commit 7c86f632d93e8acff51e4c849da178305bc99801

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0acca87332b0e3748cc6d23408cbac1879e736b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::docker::builder: add alpine linux

2017-01-03 Thread Giuseppe Lavagetto (Code Review)

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

Change subject: profile::docker::builder: add alpine linux
..


profile::docker::builder: add alpine linux

Also, adapt the coding to our own coding standards.

Change-Id: I82dc465018184d558a12864fd9a150b4782cd100
---
M modules/profile/manifests/docker/builder.pp
1 file changed, 20 insertions(+), 5 deletions(-)

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



diff --git a/modules/profile/manifests/docker/builder.pp 
b/modules/profile/manifests/docker/builder.pp
index 85ae87f..94a225a 100644
--- a/modules/profile/manifests/docker/builder.pp
+++ b/modules/profile/manifests/docker/builder.pp
@@ -1,16 +1,31 @@
-class profile::docker::builder {
-$proxy_address = hiera('profile::docker::builder::proxy_address')
-$proxy_port = hiera('profile::docker::builder::proxy_port')
+# == Class profile::docker::builder
+#
+# This class sets up a docker builder server, where our base images can be 
built
+# and uploaded to the docker registry.
+#
+# === Parameters
+#
+# [*proxy_address*] The http proxy address, set to undef if you don't want to 
use item
+#
+# [*proxy_port*] The http proxy port; set to undef if not needed
+#
+# [*registry*] Address of the docker registry.
+#
+class profile::docker::builder(
+$proxy_address = hiera('profile::docker::builder::proxy_address'),
+$proxy_port = hiera('profile::docker::builder::proxy_port'),
+$registry = hiera('docker::registry'),
+) {
 
 system::role { 'role::docker::builder':
 description => 'Docker images builder'
 }
 
 class { 'docker::baseimages':
-docker_registry => hiera('docker::registry'),
+docker_registry => $registry,
 proxy_address   => $proxy_address,
 proxy_port  => $proxy_port,
-distributions   => ['jessie'],
+distributions   => ['jessie', 'alpine'],
 }
 
 # TODO: create a repo for base images in prod for this

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Drop the deprecated out- prefix from kiwix and jquery-uls

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

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

Change subject: Drop the deprecated out- prefix from kiwix and jquery-uls
..


Drop the deprecated out- prefix from kiwix and jquery-uls

Using aliases to keep links working.

Change-Id: I462efac3ce9aa91f78c49d78c3b64d6045f6fc8d
---
M TranslateSettings.php
M bin/twn-wikistats
M groups/Kiwix/Kiwix.yaml
M groups/Wikimedia/jquery.uls.yaml
M repoconfig.commit.json
M repoconfig.json
6 files changed, 9 insertions(+), 7 deletions(-)

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



diff --git a/TranslateSettings.php b/TranslateSettings.php
index 8f2156c..039b530 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -242,6 +242,7 @@
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/crosswatch.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/GapFinder.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/jquery.uls.yaml";
+$wgTranslateGroupAliases['out-jquery-uls'] = 'jquery-uls';
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/Pageviews.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/video2commons.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/wiki-ai.yaml";
@@ -363,6 +364,7 @@
 
 wfAddNamespace( 1244, 'Kiwix' );
 $wgTranslateGroupFiles[] = "$GROUPS/Kiwix/Kiwix.yaml";
+$wgTranslateGroupAliases['out-kiwix'] = 'kiwix';
 $wgTranslateSupportUrlNamespace[NS_KIWIX] = [
'page' => 'Translating_talk:Kiwix',
'params' => $lqtParams,
diff --git a/bin/twn-wikistats b/bin/twn-wikistats
index 1488206..d184fc0 100755
--- a/bin/twn-wikistats
+++ b/bin/twn-wikistats
@@ -11,7 +11,7 @@
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:FreeCol/stats/trunk" "$PARAMS 
--groups=out-freecol"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:FUDforum/stats/trunk" "$PARAMS 
--groups=out-fudforum"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:iHRIS/stats" "$PARAMS 
--groups=out-ihris-0-all"
-$BASEDIR/wikistats "$WIKI" "$USER" "Translating:Kiwix/stats" "$PARAMS 
--groups=out-kiwix"
+$BASEDIR/wikistats "$WIKI" "$USER" "Translating:Kiwix/stats" "$PARAMS 
--groups=kiwix"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:MantisBT/stats/trunk" "$PARAMS 
--groups=out-mantis-0-all"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:Mifos/stats" "$PARAMS 
--groups=out-mifos"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:OpenStreetMap/stats/trunk" 
"$PARAMS --groups=out-osm-0-all"
diff --git a/groups/Kiwix/Kiwix.yaml b/groups/Kiwix/Kiwix.yaml
index e5a69bd..d1ff853 100644
--- a/groups/Kiwix/Kiwix.yaml
+++ b/groups/Kiwix/Kiwix.yaml
@@ -1,6 +1,6 @@
 ---
 BASIC:
-  id: out-kiwix
+  id: kiwix
   label: Kiwix
   icon: wiki://Kiwix_icon.svg
   description: "{{Special:MyLanguage/Translations:Group 
descriptions/kiwix/en}}"
diff --git a/groups/Wikimedia/jquery.uls.yaml b/groups/Wikimedia/jquery.uls.yaml
index 2cd221b..a5de588 100644
--- a/groups/Wikimedia/jquery.uls.yaml
+++ b/groups/Wikimedia/jquery.uls.yaml
@@ -2,7 +2,7 @@
 BASIC:
   description: "Translations of Universal Language Selector library"
   namespace: NS_WIKIMEDIA
-  id: out-jquery-uls
+  id: jquery-uls
   label: jQuery.ULS
   icon: wiki://JQuery-logo-square.svg
   class: FileBasedMessageGroup
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 9a97811..32d1ec6 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -81,7 +81,7 @@
}
},
"jquery.uls": {
-   "group": "out-jquery-uls",
+   "group": "jquery-uls",
"repos": {
"jquery.uls": {
"type": "github",
@@ -194,7 +194,7 @@
}
},
"kiwix": {
-   "group": "out-kiwix",
+   "group": "kiwix",
"repos": {
"kiwix": {
"type": "github",
diff --git a/repoconfig.json b/repoconfig.json
index 7b281c6..c0d1907 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -79,7 +79,7 @@
}
},
"jquery.uls": {
-   "group": "out-jquery-uls",
+   "group": "jquery-uls",
"repos": {
"jquery.uls": {
"type": "github",
@@ -192,7 +192,7 @@
}
},
"kiwix": {
-   "group": "out-kiwix",
+   "group": "kiwix",
"repos": {
"kiwix": {
"type": "github",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I462efac3ce9aa91f78c49d78c3b64d6045f6fc8d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add new page protection level on etwiki

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

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

Change subject: Add new page protection level on etwiki
..


Add new page protection level on etwiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6585c9e..cf2a41b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4383,6 +4383,7 @@
'dewiki' => [ '', 'autoconfirmed', 'editeditorprotected', 'sysop' ], // 
T94368
'enwiki' => [ '', 'autoconfirmed', 'extendedconfirmed', 
'templateeditor', 'sysop' ], // T126607, T57432
'enwiktionary' => [ '', 'autoconfirmed', 'templateeditor', 'sysop'], // 
T148007
+   'etwiki' => [ '', 'autoconfirmed', 'autopatrol', 'sysop' ], // T153465
'fawiki' => [ '', 'autoconfirmed', 'extendedconfirmed', 'sysop' ], // 
T140839
'frwiki' => [ '', 'autoconfirmed', 'editextendedsemiprotected', 'sysop' 
], // T131109
'hewiki' => [ '', 'autoconfirmed', 'autopatrol',  'templateeditor' /* 
T102466 */, 'sysop' ], // T60207

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie94f0954852a9f1f5c8c5c2cf05e5e4050fac2e1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable SandboxLink on ruwiki

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

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

Change subject: Enable SandboxLink on ruwiki
..


Enable SandboxLink on ruwiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1d60fe9..780a67b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12734,6 +12734,7 @@
'plwiktionary' => true,
'pswiki' => true,
'ptwiki' => true,
+   'ruwiki' => true, // T153855
'sawiki' => true,
'sdwiki' => true, // T152609
'sdwiktionary' => true, // T152609

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90e123a522051a340853aa042363953a82eea70e
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: uw.DescriptionsDetailsWidget: Update styles for spacing betw...

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

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

Change subject: uw.DescriptionsDetailsWidget: Update styles for spacing between 
multiple descriptions
..


uw.DescriptionsDetailsWidget: Update styles for spacing between multiple 
descriptions

Something has changed in OOjs UI styling, we need this to restore the
previous behavior.

Change-Id: I9deda1e2b888339a8d9c6b8eb743bbfbdb519176
---
M resources/details/uw.DescriptionsDetailsWidget.less
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/resources/details/uw.DescriptionsDetailsWidget.less 
b/resources/details/uw.DescriptionsDetailsWidget.less
index 9682bfa..e868164 100644
--- a/resources/details/uw.DescriptionsDetailsWidget.less
+++ b/resources/details/uw.DescriptionsDetailsWidget.less
@@ -13,7 +13,8 @@
// Allow the "Remove" button to appear alongside
display: inline-block;
margin-right: 0.5em;
-   // Spacing between multiple descriptions
+   // Adjust spacing between multiple descriptions
margin-bottom: 0.5em;
+   margin-top: 0;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9deda1e2b888339a8d9c6b8eb743bbfbdb519176
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 389 matches

Mail list logo