date:20151205

[MediaWiki-commits] [Gerrit] |1= should be always used. Following standard on commons. - change (mediawiki/core)

2015-12-05 Thread Steinsplitter (Code Review)

Steinsplitter has uploaded a new change for review.

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

Change subject: |1= should be always used. Following standard on commons.
..

|1= should be always used. Following standard on commons.

This reverts commit 02c2cbc166f720a4d8b0d957e0a908893822e0b4.

Change-Id: Ied787ecb91aaae3f643c9d013b8982ddabea8142
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/257172/1

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js 
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index 5e79039..c336676 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -136,12 +136,11 @@
 * @return {string}
 */
ForeignStructuredUpload.prototype.getDescriptions = function () {
-   var i, desc, hasEquals, templateCalls = [];
+   var i, desc, templateCalls = [];
 
for ( i = 0; i < this.descriptions.length; i++ ) {
desc = this.descriptions[ i ];
-   hasEquals = desc.text.indexOf( '=' ) !== -1;
-   templateCalls.push( '{{' + desc.language + ( hasEquals 
? '|1=' : '|' ) + desc.text + '}}' );
+   templateCalls.push( '{{' + desc.language + '|' + 
desc.text + '}}' );
}
 
return templateCalls.join( '\n' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied787ecb91aaae3f643c9d013b8982ddabea8142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.7
Gerrit-Owner: Steinsplitter 

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

[MediaWiki-commits] [Gerrit] k8s: Stop including puppet::self related classes - change (operations/puppet)

2015-12-05 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: k8s: Stop including puppet::self related classes
..

k8s: Stop including puppet::self related classes

Change-Id: I54502f130f76bd32bf42fa6ea913d597c89b7304
---
M manifests/role/tools.pp
1 file changed, 0 insertions(+), 17 deletions(-)


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

diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index ffdfae5..254a49b 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -1,14 +1,10 @@
 # Roles for Kubernetes and co on Tool Labs
 class role::toollabs::etcd {
-include role::toollabs::puppet::client
-
 # To deny access to etcd - atm the kubernetes master
 # and etcd will be on the same host, so ok to just deny
 # access to everyone else
 include base::firewall
 include toollabs::infrastructure
-
-include role::toollabs::puppet::client
 
 include etcd
 
@@ -19,7 +15,6 @@
 }
 
 class role::toollabs::docker::registry {
-include role::toollabs::puppet::client
 include ::toollabs::infrastructure
 
 require role::labs::lvm::srv
@@ -34,16 +29,7 @@
 include ::toollabs::puppetmaster
 }
 
-class role::toollabs::puppet::client(
-$puppetmaster,
-) {
-class { '::puppet::self::client':
-server => $puppetmaster,
-}
-}
-
 class role::toollabs::k8s::master {
-include role::toollabs::puppet::client
 # This requires that etcd is on the same host
 # And is not HA. Will re-evaluate when it is HA
 
@@ -77,7 +63,6 @@
 }
 
 class role::toollabs::k8s::worker {
-include role::toollabs::puppet::client
 # NOTE: No base::firewall!
 # ferm and kube-proxy will conflict
 
@@ -106,7 +91,6 @@
 }
 
 class role::toollabs::k8s::webproxy {
-include role::toollabs::puppet::client
 
 $master_host = hiera('k8s_master')
 $etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]), 
':2379'), 'https://'), ',')
@@ -131,7 +115,6 @@
 }
 
 class role::toollabs::k8s::bastion {
-include role::toollabs::puppet::client
 
 # kubectl and things
 include k8s::client

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

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

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

[MediaWiki-commits] [Gerrit] k8s: Stop including puppet::self related classes - change (operations/puppet)

2015-12-05 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: k8s: Stop including puppet::self related classes
..


k8s: Stop including puppet::self related classes

Instead, just individually set the 'puppetmaster'
hiera variable (*not* the ldap variable!) and clean
up certs. This uses base::puppet and ssl certs at
the standard location of /var/lib/puppet/ssl rather
than the crazy puppet::self with its matrix of
'where is my ssl certificate?" game

Bug: T120159
Change-Id: I54502f130f76bd32bf42fa6ea913d597c89b7304
---
M manifests/role/tools.pp
1 file changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index ffdfae5..254a49b 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -1,14 +1,10 @@
 # Roles for Kubernetes and co on Tool Labs
 class role::toollabs::etcd {
-include role::toollabs::puppet::client
-
 # To deny access to etcd - atm the kubernetes master
 # and etcd will be on the same host, so ok to just deny
 # access to everyone else
 include base::firewall
 include toollabs::infrastructure
-
-include role::toollabs::puppet::client
 
 include etcd
 
@@ -19,7 +15,6 @@
 }
 
 class role::toollabs::docker::registry {
-include role::toollabs::puppet::client
 include ::toollabs::infrastructure
 
 require role::labs::lvm::srv
@@ -34,16 +29,7 @@
 include ::toollabs::puppetmaster
 }
 
-class role::toollabs::puppet::client(
-$puppetmaster,
-) {
-class { '::puppet::self::client':
-server => $puppetmaster,
-}
-}
-
 class role::toollabs::k8s::master {
-include role::toollabs::puppet::client
 # This requires that etcd is on the same host
 # And is not HA. Will re-evaluate when it is HA
 
@@ -77,7 +63,6 @@
 }
 
 class role::toollabs::k8s::worker {
-include role::toollabs::puppet::client
 # NOTE: No base::firewall!
 # ferm and kube-proxy will conflict
 
@@ -106,7 +91,6 @@
 }
 
 class role::toollabs::k8s::webproxy {
-include role::toollabs::puppet::client
 
 $master_host = hiera('k8s_master')
 $etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]), 
':2379'), 'https://'), ',')
@@ -131,7 +115,6 @@
 }
 
 class role::toollabs::k8s::bastion {
-include role::toollabs::puppet::client
 
 # kubectl and things
 include k8s::client

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

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

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

[MediaWiki-commits] [Gerrit] jsub: Raise default memory allocation to 400M - change (labs/toollabs)

2015-12-05 Thread Zhuyifei1999 (Code Review)

Zhuyifei1999 has uploaded a new change for review.

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

Change subject: jsub: Raise default memory allocation to 400M
..

jsub: Raise default memory allocation to 400M

jstart & qcronsub are also affected due to being symlinks to jsub

Bug: T120517
Change-Id: I9595011c3a67f40dcc9086164529fa3226593477
---
M jobutils/bin/jsub
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/62/257062/1

diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index 7af0280..43609bd 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -30,7 +30,7 @@
 );
 my %qsargs;
 my @args;
-my $memory = memparse_kb('256M');
+my $memory = memparse_kb('400M');
 my $once = 0;
 my $stderr = 0;
 my $continuous = 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9595011c3a67f40dcc9086164529fa3226593477
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999 

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

[MediaWiki-commits] [Gerrit] Update ReCaptcha folder - change (mediawiki...ConfirmEdit)

2015-12-05 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Update ReCaptcha folder
..

Update ReCaptcha folder

Update recaptchalib.php file. There are some modifications to keep it
working with this extension otherwise it would have broke the extension.

* Source code = https://github.com/google/recaptcha/tree/1.0.0

The source code repo was changed and is now located at
https://github.com/google/recaptcha/

Change-Id: I740d3970f3be2a29db14a9ae40157337e121839c
---
M ReCaptcha/ReCaptcha.class.php
M ReCaptcha/i18n/en.json
M ReCaptcha/recaptchalib.php
M includes/ConfirmEditHooks.php
4 files changed, 106 insertions(+), 227 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/63/257063/1

diff --git a/ReCaptcha/ReCaptcha.class.php b/ReCaptcha/ReCaptcha.class.php
index 8532afe..b08c7e6 100644
--- a/ReCaptcha/ReCaptcha.class.php
+++ b/ReCaptcha/ReCaptcha.class.php
@@ -19,7 +19,7 @@
 
return Html::inlineScript(
$js
-   ) . recaptcha_get_html( $wgReCaptchaPublicKey, 
$this->recaptcha_error, $useHttps );
+   ) . ReCaptcha( $wgReCaptchaPublicKey, $this->recaptcha_error, 
$useHttps );
}
 
/**
@@ -47,14 +47,14 @@
 
$ip = $wgRequest->getIP();
 
-   $recaptcha_response = recaptcha_check_answer(
+   $recaptchaResponse = verifyResponse(
$wgReCaptchaPrivateKey,
$ip,
$challenge,
$response
);
 
-   if ( !$recaptcha_response->is_valid ) {
+   if ( !$recaptchaResponse->is_valid ) {
$this->recaptcha_error = $recaptcha_response->error;
return false;
}
diff --git a/ReCaptcha/i18n/en.json b/ReCaptcha/i18n/en.json
index 7119dd7..2d934b5 100644
--- a/ReCaptcha/i18n/en.json
+++ b/ReCaptcha/i18n/en.json
@@ -3,7 +3,7 @@
"authors": []
},
"recaptcha-desc": "reCAPTCHA module for Confirm Edit",
-   "recaptcha-edit": "To protect the wiki against automated edit spam, we 
kindly ask you to type the two words you see in the box below:",
+   "recaptcha-edit": "To protect the wiki against automated edit spam, we 
kindly ask you to type the words you see in the box below:",
"recaptcha-addurl": "Your edit includes new external links. To protect 
the wiki against automated spam, we kindly ask you to type the two words you 
see in the box below:",
"recaptcha-badlogin": "To protect the wiki against automated password 
cracking, we kindly ask you to type the two words you see in the box below:",
"recaptcha-createaccount": "To protect the wiki against automated 
account creation, we kindly ask you to type the two words you see in the box 
below:",
diff --git a/ReCaptcha/recaptchalib.php b/ReCaptcha/recaptchalib.php
index a04f567..98b5719 100644
--- a/ReCaptcha/recaptchalib.php
+++ b/ReCaptcha/recaptchalib.php
@@ -2,16 +2,14 @@
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *- Documentation and latest version
- *  http://recaptcha.net/plugins/php/
+ *  https://developers.google.com/recaptcha/docs/php
  *- Get a reCAPTCHA API Key
  *  https://www.google.com/recaptcha/admin/create
  *- Discussion group
- *  http://groups.google.com/group/recaptcha
+ *  https://groups.google.com/group/recaptcha
  *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
+ * @copyright Copyright (c) 2014, Google Inc.
+ * @link  https://www.google.com/recaptcha
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to 
deal
@@ -33,242 +31,123 @@
  */
 
 /**
- * The reCAPTCHA server URL's
+ * A ReCaptchaResponse is returned from checkAnswer().
  */
+class ReCaptchaResponse {
+public $success;
+public $errorCodes;
+public $error;
+}
+
+static $_signupUrl = "https://www.google.com/recaptcha/admin;;
+static $_siteVerifyUrl = "https://www.google.com/recaptcha/api/siteverify?;;
+static $_version = "php_1.0";
+
 define( "RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api; );
 define( "RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api; 
);
 define( "RECAPTCHA_VERIFY_SERVER", "www.google.com" );
 
 /**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
+ * Constructor.
+ *
+ * @param string $secret shared secret between site and ReCAPTCHA server.
  */
-function _recaptcha_qsencode ( $data ) {
-$req = "";
-foreach ( $data as $key => $value )
-$req .=

[MediaWiki-commits] [Gerrit] wmflib: fixes for ordered_yaml - change (operations/puppet)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: wmflib: fixes for ordered_yaml
..


wmflib: fixes for ordered_yaml

* Don't turn strings into booleans/integers. If the structure to convert
  contains "true" as a string, it would be converted to a boolean. The same
  applies for a string with an integer or a float. This seems a bad idea. For
  example, when specifying the "true" command, we get the "true" boolean. Or
  when we put "0100" as a PIN code, we get 64 instead.
* Fix boolean handling in ordered_yaml. Whatever the value to produce is "true"
  or "false", only "true" is outputted. Output the appropriate value instead.

Bug: T120533
Change-Id: I973ea8d10988485aa312a57c00c88681caa32a71
---
M modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb 
b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
index 64973f4..b5996a7 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
@@ -5,7 +5,7 @@
 # === Examples
 #
 #   # Render a Puppet hash as a configuration file:
-#   $options = { 'useGraphite' => true, 'minVal' => '0.1' }
+#   $options = { 'useGraphite' => true, 'minVal' => 0.1 }
 #   file { '/etc/kibana/config.yaml':
 # content => ordered_yaml($options),
 #   }
@@ -25,12 +25,10 @@
   map.sort.each { |p| yield p }
 end
 value.sort.reduce(map) { |h, (k, v)| h[k] = sort_keys_recursive(v); h }
-  when 'true', 'false'
-value == 'true'
   when :undef
 nil
   else
-value.include?('.') ? Float(value) : Integer(value) rescue value
+value
   end
 end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I973ea8d10988485aa312a57c00c88681caa32a71
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move questions about namespace 8 messages to Phabricator too - change (translatewiki)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Move questions about namespace 8 messages to Phabricator too
..


Move questions about namespace 8 messages to Phabricator too

Bug: T120461
Change-Id: I7df954e96153b1cd9abf7785527fa0d872e3f2f1
---
M TranslateSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/TranslateSettings.php b/TranslateSettings.php
index 66d6166..38ee6c3 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -222,8 +222,8 @@
 $wgTranslateMessageNamespaces[] = NS_MEDIAWIKI;
 $wgMessagesDirs['MediawikiInstaller'] = "$IP/includes/installer/i18n";
 $wgTranslateSupportUrlNamespace[NS_MEDIAWIKI] = array(
-   'page' => 'Translating_talk:MediaWiki',
-   'params' => $lqtParams,
+   'url' => "$phabUrl?projects=i18n,MediaWiki-General-or-Unknown",
+   'params' => $phabParams,
 );
 
 # No longer in use.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7df954e96153b1cd9abf7785527fa0d872e3f2f1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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] Revert "wmflib: fixes for ordered_yaml" - change (operations/puppet)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Revert "wmflib: fixes for ordered_yaml"
..

Revert "wmflib: fixes for ordered_yaml"

This reverts commit 6a46f47a29af51e262003856ea42a002c166cc09.

Change-Id: I1dc3dbb6b510805858e045dff6751794b8ecca4c
---
M modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb 
b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
index b5996a7..64973f4 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
@@ -5,7 +5,7 @@
 # === Examples
 #
 #   # Render a Puppet hash as a configuration file:
-#   $options = { 'useGraphite' => true, 'minVal' => 0.1 }
+#   $options = { 'useGraphite' => true, 'minVal' => '0.1' }
 #   file { '/etc/kibana/config.yaml':
 # content => ordered_yaml($options),
 #   }
@@ -25,10 +25,12 @@
   map.sort.each { |p| yield p }
 end
 value.sort.reduce(map) { |h, (k, v)| h[k] = sort_keys_recursive(v); h }
+  when 'true', 'false'
+value == 'true'
   when :undef
 nil
   else
-value
+value.include?('.') ? Float(value) : Integer(value) rescue value
   end
 end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dc3dbb6b510805858e045dff6751794b8ecca4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Revert "wmflib: fixes for ordered_yaml" - change (operations/puppet)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Revert "wmflib: fixes for ordered_yaml"
..


Revert "wmflib: fixes for ordered_yaml"

This reverts commit 6a46f47a29af51e262003856ea42a002c166cc09.

Change-Id: I1dc3dbb6b510805858e045dff6751794b8ecca4c
---
M modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb 
b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
index b5996a7..64973f4 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
@@ -5,7 +5,7 @@
 # === Examples
 #
 #   # Render a Puppet hash as a configuration file:
-#   $options = { 'useGraphite' => true, 'minVal' => 0.1 }
+#   $options = { 'useGraphite' => true, 'minVal' => '0.1' }
 #   file { '/etc/kibana/config.yaml':
 # content => ordered_yaml($options),
 #   }
@@ -25,10 +25,12 @@
   map.sort.each { |p| yield p }
 end
 value.sort.reduce(map) { |h, (k, v)| h[k] = sort_keys_recursive(v); h }
+  when 'true', 'false'
+value == 'true'
   when :undef
 nil
   else
-value
+value.include?('.') ? Float(value) : Integer(value) rescue value
   end
 end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dc3dbb6b510805858e045dff6751794b8ecca4c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Add basic special page tests - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Add basic special page tests
..

Add basic special page tests

Change-Id: I2211bcf266ee969e64ad0b12ad3f33c961c74dbd
---
M ExtensionDistributor.hooks.php
M extension.json
R src/api/ApiListExtDistBranches.php
R src/api/ApiListExtDistRepos.php
R src/providers/ExtDistProvider.php
R src/providers/GerritExtDistProvider.php
R src/providers/GithubExtDistProvider.php
R src/specials/SpecialBaseDistributor.php
R src/specials/SpecialExtensionDistributor.php
R src/specials/SpecialSkinDistributor.php
A test/specials/SpecialExtensionDistributorTest.php
A test/specials/SpecialSkinDistributorTest.php
12 files changed, 78 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor 
refs/changes/64/257064/1

diff --git a/ExtensionDistributor.hooks.php b/ExtensionDistributor.hooks.php
index 9d696d0..bbb512e 100644
--- a/ExtensionDistributor.hooks.php
+++ b/ExtensionDistributor.hooks.php
@@ -20,4 +20,31 @@
 
return true;
}
+
+   /**
+* Handler for UnitTestsList hook.
+* @see http://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
+* @param &$files Array of unit test files
+* @return bool true in all cases
+*/
+   public static function onUnitTestsList( &$files ) {
+   // @codeCoverageIgnoreStart
+   $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . 
'/test/' );
+
+   /**
+* @var SplFileInfo $fileInfo
+*/
+   $ourFiles = array();
+   foreach ( new RecursiveIteratorIterator( $directoryIterator ) 
as $fileInfo ) {
+   if ( substr( $fileInfo->getFilename(), -8 ) === 
'Test.php' ) {
+   $ourFiles[] = $fileInfo->getPathname();
+   }
+   }
+
+   $files = array_merge( $files, $ourFiles );
+
+   return true;
+   // @codeCoverageIgnoreEnd
+   }
+
 }
diff --git a/extension.json b/extension.json
index aa96b51..93bbd98 100644
--- a/extension.json
+++ b/extension.json
@@ -36,6 +36,9 @@
"Hooks": {
"APIQuerySiteInfoGeneralInfo": [

"ExtensionDistributorHooks::onAPIQuerySiteInfoGeneralInfo"
+   ],
+   "UnitTestsList": [
+   "ExtensionDistributorHooks::onUnitTestsList"
]
},
"SpecialPages": {
@@ -44,14 +47,14 @@
},
"AutoloadClasses": {
"ExtensionDistributorHooks": "ExtensionDistributor.hooks.php",
-   "SpecialBaseDistributor": "specials/SpecialBaseDistributor.php",
-   "SpecialExtensionDistributor": 
"specials/SpecialExtensionDistributor.php",
-   "SpecialSkinDistributor": "specials/SpecialSkinDistributor.php",
-   "ExtDistProvider": "providers/ExtDistProvider.php",
-   "GerritExtDistProvider": "providers/GerritExtDistProvider.php",
-   "GithubExtDistProvider": "providers/GithubExtDistProvider.php",
-   "ApiListExtDistRepos": "api/ApiListExtDistRepos.php",
-   "ApiListExtDistBranches": "api/ApiListExtDistBranches.php"
+   "SpecialBaseDistributor": 
"src/specials/SpecialBaseDistributor.php",
+   "SpecialExtensionDistributor": 
"src/specials/SpecialExtensionDistributor.php",
+   "SpecialSkinDistributor": 
"src/specials/SpecialSkinDistributor.php",
+   "ExtDistProvider": "src/providers/ExtDistProvider.php",
+   "GerritExtDistProvider": 
"src/providers/GerritExtDistProvider.php",
+   "GithubExtDistProvider": 
"src/providers/GithubExtDistProvider.php",
+   "ApiListExtDistRepos": "src/api/ApiListExtDistRepos.php",
+   "ApiListExtDistBranches": "src/api/ApiListExtDistBranches.php"
},
"ResourceModules": {
"ext.extensiondistributor.special.styles": {
diff --git a/api/ApiListExtDistBranches.php b/src/api/ApiListExtDistBranches.php
similarity index 100%
rename from api/ApiListExtDistBranches.php
rename to src/api/ApiListExtDistBranches.php
diff --git a/api/ApiListExtDistRepos.php b/src/api/ApiListExtDistRepos.php
similarity index 100%
rename from api/ApiListExtDistRepos.php
rename to src/api/ApiListExtDistRepos.php
diff --git a/providers/ExtDistProvider.php b/src/providers/ExtDistProvider.php
similarity index 100%
rename from providers/ExtDistProvider.php
rename to src/providers/ExtDistProvider.php
diff --git a/providers/GerritExtDistProvider.php 
b/src/providers/GerritExtDistProvider.php
similarity index 100%
rename from providers/GerritExtDistProvider.php
rename to src/providers/GerritExtDistProvider.php
diff --git a/providers/GithubExtDistProvider.php

[MediaWiki-commits] [Gerrit] Display Feedback field only at the last step - change (mediawiki...MathSearch)

2015-12-05 Thread Physikerwelt (Code Review)

Physikerwelt has submitted this change and it was merged.

Change subject: Display Feedback field only at the last step
..


Display Feedback field only at the last step

* As suggested in the dry-run of the Form.

Change-Id: Ifda48a779904e5aec9b33f36f91f263627cc9a79
---
M includes/MlpEvalForm.php
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/includes/MlpEvalForm.php b/includes/MlpEvalForm.php
index c6441cb..ba94561 100644
--- a/includes/MlpEvalForm.php
+++ b/includes/MlpEvalForm.php
@@ -139,10 +139,12 @@
'required' => false,
);
break;
+   case SpecialMlpEval::STEP_FINISHED:
+   $formDescriptor['feedback'] = array(
+   'type' => 'text',
+   );
+   break;
}
-   $formDescriptor['feedback'] = array(
-   'type' => 'text',
-   );
$formDescriptor['submit-info'] = array(
'type' => 'info',
// 'label-message' => 'math-lp-submit-info-label',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda48a779904e5aec9b33f36f91f263627cc9a79
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Dyiop 
Gerrit-Reviewer: Hcohl 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Whyameri 

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

[MediaWiki-commits] [Gerrit] Balance brackets in en.json - change (mediawiki...Echo)

2015-12-05 Thread Sbisson (Code Review)

Sbisson has uploaded a new change for review.

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

Change subject: Balance brackets in en.json
..

Balance brackets in en.json

The problem was introduced by I1cd7caa7bfe811bab89a0c6950c1aeaf1739aac6

Change-Id: I81def611127f0f438764f8aea19e7f2d5c47d969
---
M i18n/en.json
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/67/257067/1

diff --git a/i18n/en.json b/i18n/en.json
index 0fb7cf5..204a0f3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -67,10 +67,10 @@
"notification-add-talkpage-topic2": "[[User:$1|$1]] 
{{GENDER:$1|posted}} a new topic \"$2\" on [[$3]].",
"notification-add-talkpage-topic-yours2": "[[User:$1|$1]] 
{{GENDER:$1|sent}} you a message: \"[[$3#$2|$2]]\".",
"notification-add-comment-yours2": "[[User:$1|$1]] 
{{GENDER:$1|commented}} on \"[[$3#$2|$2]]\" on your talk page.",
-   "notification-mention": "[[User:$1|$1]] {{GENDER:$1|mentioned}} 
{{GENDER:$6|you}}} on the $5 talk page in \"[[:$3#$2|$4]]\".",
-   "notification-header-mention": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}}} on the $3 talk page in \"$4\".",
-   "notification-mention-nosection": "[[User:$1|$1]] 
{{GENDER:$1|mentioned}} {{GENDER:$4|you}}} on the [[:$3|$2 talk page]].",
-   "notification-header-mention-nosection": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}}} on the [[:$4|$3 talk page]].",
+   "notification-mention": "[[User:$1|$1]] {{GENDER:$1|mentioned}} 
{{GENDER:$6|you}} on the $5 talk page in \"[[:$3#$2|$4]]\".",
+   "notification-header-mention": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}} on the $3 talk page in \"$4\".",
+   "notification-mention-nosection": "[[User:$1|$1]] 
{{GENDER:$1|mentioned}} {{GENDER:$4|you}} on the [[:$3|$2 talk page]].",
+   "notification-header-mention-nosection": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}} on the [[:$4|$3 talk page]].",
"notification-user-rights": "Your user rights 
[[Special:Log/rights/$1|were {{GENDER:$1|changed}}]] by [[User:$1|$1]]. $2. 
[[Special:ListGroupRights|Learn more]]",
"notification-header-user-rights": "Your user rights were 
{{GENDER:$2|changed}} by $1. $3.",
"notification-user-rights-add": "You are now a member of 
{{PLURAL:$2|this group|these groups}}: $1",
@@ -90,8 +90,8 @@
"notification-page-linked-email-batch-body": "$2 was 
{{GENDER:$1|linked}} from $3.",
"notification-reverted-email-subject2": "Your {{PLURAL:$3|edit 
was|edits were}} {{GENDER:$1|reverted}} on {{SITENAME}}",
"notification-reverted-email-batch-body2": "Your {{PLURAL:$3|edit on $2 
has been|edits on $2 have been}} {{GENDER:$1|reverted}} by $1.",
-   "notification-mention-email-subject": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$2|you}}} on {{SITENAME}}",
-   "notification-mention-email-batch-body": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$5|you}}} on the $4 talk page in \"$3\".",
+   "notification-mention-email-subject": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$2|you}} on {{SITENAME}}",
+   "notification-mention-email-batch-body": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$5|you}} on the $4 talk page in \"$3\".",
"notification-mention-nosection-email-batch-body": "$1 
{{GENDER:$1|mentioned}} you on the $2 talk page.",
"notification-user-rights-email-subject": "Your user rights have 
changed on {{SITENAME}}",
"notification-user-rights-email-batch-body": "Your user rights were 
{{GENDER:$1|changed}} by $1. $2.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81def611127f0f438764f8aea19e7f2d5c47d969
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

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

[MediaWiki-commits] [Gerrit] Disable accept filters for HTTP on canary app servers - change (operations/puppet)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Disable accept filters for HTTP on canary app servers
..


Disable accept filters for HTTP on canary app servers

Prequel to full deployment.

Bug: T119372
Bug: T113151
Change-Id: I4266ab015cceefd9562c86063ca8776852d5c6f0
---
M manifests/role/mediawiki.pp
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index fd12760..720b57f 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -176,6 +176,13 @@
 # include the deployment scripts because mwscript can occasionally be 
useful
 # here: T112174
 include scap::scripts
+
+# Test of 'AcceptFilter http none' prior to full deployment
+# see https://gerrit.wikimedia.org/r/#/c/256968/
+apache::conf { 'acceptfilter_http_none':
+priority => 1,
+content  => "AcceptFilter http none\n",
+}
 }
 
 # Ditto, for api
@@ -183,6 +190,13 @@
 # salt -G 'canary:api_appserver' will select servers with this role.'
 salt::grain { 'canary': value => 'api_appserver' }
 include role::mediawiki::appserver::api
+
+# Test of 'AcceptFilter http none' prior to full deployment
+# see https://gerrit.wikimedia.org/r/#/c/256968/
+apache::conf { 'acceptfilter_http_none':
+priority => 1,
+content  => "AcceptFilter http none\n",
+}
 }
 
 # mediawiki maintenance scripts

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4266ab015cceefd9562c86063ca8776852d5c6f0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Correct spelling of Special namespace in Pashto - change (mediawiki/core)

2015-12-05 Thread Purodha (Code Review)

Purodha has uploaded a new change for review.

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

Change subject: Correct spelling of Special namespace in Pashto
..

Correct spelling of Special namespace in Pashto

The Pasho namespace name was spelt 'ځانګړی ' but 'ځانگړی ' is correct.
(one charater is different)
The misspelling is kept as an alias for the time being as a safety
measure so as to not break anything.

Bug: T119796
Change-Id: I79f38063f22d46541c423fc415144f3ba7b4d61e
---
M languages/messages/MessagesPs.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/257070/1

diff --git a/languages/messages/MessagesPs.php 
b/languages/messages/MessagesPs.php
index df393a6..cf2dc3b 100644
--- a/languages/messages/MessagesPs.php
+++ b/languages/messages/MessagesPs.php
@@ -15,7 +15,7 @@
 
 $namespaceNames = array(
NS_MEDIA=> 'رسنۍ',
-   NS_SPECIAL  => 'ځانګړی',
+   NS_SPECIAL  => 'ځانگړی ',
NS_TALK => 'خبرې_اترې',
NS_USER => 'کارن',
NS_USER_TALK=> 'د_کارن_خبرې_اترې',
@@ -33,6 +33,7 @@
 );
 
 $namespaceAliases = array(
+   'ځﺎﻧګړی' => NS_SPECIAL,
'کارونکی' => NS_USER,
'د_کارونکي_خبرې_اترې' => NS_USER_TALK,
'انځور' => NS_FILE,

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

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

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

[MediaWiki-commits] [Gerrit] Improve some i18n messages - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Improve some i18n messages
..

Improve some i18n messages

Bug: T71195
Change-Id: Ib34e47b8f457484a169bcaba52a0ed5f63b37d95
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index bc897ca..837c7cc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,8 +20,8 @@
"extdist-no-versions-extensions": "The selected extension ($1) is not 
available in any version!",
"extdist-no-versions-skins": "The selected skin ($1) is not available 
in any version!",
"extdist-submit-version": "Continue",
-   "extdist-created-extensions": "A snapshot of version $2 of the 
$1 extension for MediaWiki $3 has been created. Your download 
should start automatically in 5 seconds.\n\nThe URL for this snapshot 
is:\n:$4\nIt may be used for immediate download to a server, but please do not 
bookmark it, since the contents will not be updated, and it may be deleted at a 
later date.\n\nThe tar archive should be extracted into your extensions 
directory. For example, on a unix-like OS:\n\n\ntar -xzf $5 -C 
/var/www/mediawiki/extensions\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the extensions 
directory on the server.\n\nAfter you have extracted the files, you will need 
to register the extension in LocalSettings.php. The extension documentation 
should have instructions on how to do this.\n\nIf you have any questions about 
this extension distribution system, please go to [[Extension 
talk:ExtensionDistributor]].",
-   "extdist-created-skins": "A snapshot of version $2 of the 
$1 skin for MediaWiki $3 has been created. Your download should 
start automatically in 5 seconds.\n\nThe URL for this snapshot is:\n:$4\nIt may 
be used for immediate download to a server, but please do not bookmark it, 
since the contents will not be updated, and it may be deleted at a later 
date.\n\nThe tar archive should be extracted into your skins directory. For 
example, on a unix-like OS:\n\n\ntar -xzf $5 -C 
/var/www/mediawiki/skins\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the skins 
directory on the server.\n\nAfter you have extracted the files, you will need 
to register the skin in LocalSettings.php. The skin documentation should have 
instructions on how to do this.\n\nIf you have any questions about this skin 
distribution system, please go to [[Extension talk:ExtensionDistributor]].",
+   "extdist-created-extensions": "A snapshot of version $2 of the 
$1 extension for MediaWiki $3 has been created. Your download 
should start automatically in 5 seconds.\n\nThe URL for this snapshot 
is:\n:$4\nYou can use this link to download the extension on any computer, but 
please do not bookmark it, since its contents will not be updated, and it may 
be deleted at a later date.\n\nYou should extract the tar archive's contents 
into the extensions directory of your MediaWiki installation. For example, on a 
Unix-like OS:\n\n\ntar -xzf $5 -C 
/var/www/mediawiki/extensions\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the extensions 
directory on the server.\n\nAfter you have extracted the files, you will need 
to register the extension in LocalSettings.php. The extension documentation 
should have instructions on how to do this.\n\nIf you have any questions about 
this extension distribution system, please go to [[Extension 
talk:ExtensionDistributor]].",
+   "extdist-created-skins": "A snapshot of version $2 of the 
$1 skin for MediaWiki $3 has been created. Your download should 
start automatically in 5 seconds.\n\nThe URL for this snapshot is:\n:$4\nYou 
can use this link to download the skin on any computer, but please do not 
bookmark it, since its contents will not be updated, and it may be deleted at a 
later date.\n\nYou should extract the tar archive's contents into the skins 
directory of your MediaWiki installation. For example, on a Unixn\ntar 
-xzf $5 -C /var/www/mediawiki/skins\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload

[MediaWiki-commits] [Gerrit] Fix phpdoc of wfArrayToCgi - change (mediawiki/core)

2015-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Fix phpdoc of wfArrayToCgi
..

Fix phpdoc of wfArrayToCgi

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/257074/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 43b936b..d17a55d 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -458,12 +458,12 @@
 }
 
 /**
- * This function takes two arrays as input, and returns a CGI-style string, 
e.g.
+ * This function takes one or two arrays as input, and returns a CGI-style 
string, e.g.
  * "days=7=100". Options in the first array override options in the 
second.
  * Options set to null or false will not be output.
  *
  * @param array $array1 ( String|Array )
- * @param array $array2 ( String|Array )
+ * @param array|null $array2 ( String|Array )
  * @param string $prefix
  * @return string
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87db5c251310f6f56f0ec47cbb7f034ed43c31ac
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] Gerrit: use Diffusion for repo browsing (again) - change (operations/puppet)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Gerrit: use Diffusion for repo browsing (again)
..


Gerrit: use Diffusion for repo browsing (again)

Previously done 21e8d0d2 and reverted 6f9eb844. This is now with less
%2F. Slashes are dumb. Urlencoded ones doubly so.

This reverts commit 6f9eb844ef8e1b4fb8b349dea824dc8fc852fd27.

Bug: T110607
Change-Id: I68314313d7755be2e1c46fd2444503039ee77576
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 7 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Chad: Looks good to me, but someone else must approve
  Rush: Looks good to me, but someone else must approve
  20after4: Looks good to me, but someone else must approve



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 28678f9..bfaba07 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -59,14 +59,15 @@
 [cache "accounts_byname"]
 maxAge = 7 days
 [gitweb]
-url = https://git.wikimedia.org
+url = https://phabricator.wikimedia.org
 type = custom
-revision = /commit/${project}/${commit}
-project = /summary/${project}
-branch = /log/${project}/${branch}
-filehistory = /blob/${project}/${branch}/${file}
-linkname = gitblit
+revision = /r/revision/${project};${commit}
+project = /r/project/${project}
+branch = /r/branch/${project};${branch}
+filehistory = /r/browse/${project};${branch};${file}
+linkname = diffusion
 linkDrafts = false
+urlEncode = false
 [user]
 email = ger...@wikimedia.org
 [commentlink "changeid"]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68314313d7755be2e1c46fd2444503039ee77576
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Retrieve PopularList directly from graphite if configured - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Retrieve PopularList directly from graphite if configured
..


Retrieve PopularList directly from graphite if configured

This change introduces a new setting $wgExtDistGraphiteRenderApi
which should point to a render URL for a graphite
instance that the installation of MediaWiki sends statsd
data to. On Wikimedia sites, this will be set to
"https://graphite.wikimedia.org/render;.

On special page load a graphite call will be made
requesting the top downloads of the given type.

This list will be cached for 1 day.

If no graphite API is configured we fall back to the
popular list globals. And if those are not set / empty
we don't display a list.

Bug: T120340
Bug: T120339
Change-Id: I00e59daaf6060371244b6b7d429f9d639138fbd7
---
M extension.json
M includes/specials/SpecialBaseDistributor.php
M includes/specials/SpecialExtensionDistributor.php
M includes/specials/SpecialSkinDistributor.php
A includes/stats/ExtDistGraphiteStats.php
5 files changed, 120 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5cf586e..0122ea5 100644
--- a/extension.json
+++ b/extension.json
@@ -18,6 +18,7 @@
"ExtDistSnapshotRefs": [],
"ExtDistDefaultSnapshot": "master",
"ExtDistCandidateSnapshot": false,
+   "ExtDistGraphiteRanderApi": null,
"ExtDistPopularExtList": [],
"ExtDistPopularSkinList": []
},
@@ -54,7 +55,8 @@
"GerritExtDistProvider": 
"includes/providers/GerritExtDistProvider.php",
"GithubExtDistProvider": 
"includes/providers/GithubExtDistProvider.php",
"ApiListExtDistRepos": "includes/api/ApiListExtDistRepos.php",
-   "ApiListExtDistBranches": 
"includes/api/ApiListExtDistBranches.php"
+   "ApiListExtDistBranches": 
"includes/api/ApiListExtDistBranches.php",
+   "ExtDistGraphiteStats": 
"includes/stats/ExtDistGraphiteStats.php"
},
"ResourceModules": {
"ext.extensiondistributor.special.styles": {
diff --git a/includes/specials/SpecialBaseDistributor.php 
b/includes/specials/SpecialBaseDistributor.php
index 5c0348c..bd4016b 100644
--- a/includes/specials/SpecialBaseDistributor.php
+++ b/includes/specials/SpecialBaseDistributor.php
@@ -335,5 +335,17 @@
 *
 * @return string[]|bool
 */
-   abstract protected function getPopularList();
+   protected function getPopularList() {
+   return $this->getGraphiteStats()->getPopularList( $this->type );
+   }
+
+   /**
+* @return ExtDistGraphiteStats
+*/
+   protected function getGraphiteStats() {
+   $stats = new ExtDistGraphiteStats();
+   $stats->setLogger( $this->logger );
+   return $stats;
+   }
+
 }
diff --git a/includes/specials/SpecialExtensionDistributor.php 
b/includes/specials/SpecialExtensionDistributor.php
index 3f08484..ea5d551 100644
--- a/includes/specials/SpecialExtensionDistributor.php
+++ b/includes/specials/SpecialExtensionDistributor.php
@@ -16,6 +16,11 @@
protected function getPopularList() {
global $wgExtDistPopularExtList;
 
+   $list = parent::getPopularList();
+   if ( $list ) {
+   return $list;
+   }
+
return $wgExtDistPopularExtList ?: false;
}
 }
diff --git a/includes/specials/SpecialSkinDistributor.php 
b/includes/specials/SpecialSkinDistributor.php
index 885fa83..7d067d6 100644
--- a/includes/specials/SpecialSkinDistributor.php
+++ b/includes/specials/SpecialSkinDistributor.php
@@ -14,6 +14,11 @@
protected function getPopularList() {
global $wgExtDistPopularSkinList;
 
+   $list = parent::getPopularList();
+   if ( $list ) {
+   return $list;
+   }
+
return $wgExtDistPopularSkinList ?: false;
}
 }
diff --git a/includes/stats/ExtDistGraphiteStats.php 
b/includes/stats/ExtDistGraphiteStats.php
new file mode 100644
index 000..f63d1be
--- /dev/null
+++ b/includes/stats/ExtDistGraphiteStats.php
@@ -0,0 +1,94 @@
+logger = $logger;
+   }
+
+   /**
+* @param string $type 'extensions' or 'skins'
+*
+* TODO we need some way to limit the number of extensions returning?
+*
+* @returns array|bool array of extensions in order of popularity or 
false on failure
+*/
+   public function getPopularList( $type ) {
+   global $wgExtDistGraphiteRenderApi, $wgServerName;
+   if ( !$wgExtDistGraphiteRenderApi ) {
+   return false;
+   }
+
+   $cacheKey = wfMemcKey( 'extdist',

[MediaWiki-commits] [Gerrit] Roll out RESTBase usage to Android Beta app: 10% - change (mediawiki...MobileApp)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Roll out RESTBase usage to Android Beta app: 10%
..


Roll out RESTBase usage to Android Beta app: 10%

Added config value for restbaseBetaPercent. Initially set to 10%.
Valid values are [0, 100].

Bug: T118965
Change-Id: I5de7276e28ddbe1b4e220b16d2bf1cfec7daab75
---
M config/config.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/config/config.json b/config/config.json
index eabe4f4..1c31381 100644
--- a/config/config.json
+++ b/config/config.json
@@ -3,5 +3,6 @@
 "eventLogSampleRate": 0,
 "disableFullTextSearch": false,
 "searchLogSampleRate": 100,
-"tocLogSampleRate": 100
+"tocLogSampleRate": 100,
+"restbaseBetaPercent": 10
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5de7276e28ddbe1b4e220b16d2bf1cfec7daab75
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP retrieval direct from graphite. - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: WIP retrieval direct from graphite.
..

WIP retrieval direct from graphite.

Some TODOs in the code.

TODO - the result of the api call should be CACHED!!!

etc.

DO NOT MERGE!

Change-Id: I00e59daaf6060371244b6b7d429f9d639138fbd7
---
M extension.json
M src/specials/SpecialExtensionDistributor.php
A src/stats/GraphiteStats.php
3 files changed, 56 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index 93bbd98..6a064d3 100644
--- a/extension.json
+++ b/extension.json
@@ -18,6 +18,7 @@
"ExtDistSnapshotRefs": [],
"ExtDistDefaultSnapshot": "master",
"ExtDistCandidateSnapshot": false,
+   "ExtDistGraphiteRanderApi": null,
"ExtDistPopularExtList": [],
"ExtDistPopularSkinList": []
},
@@ -54,7 +55,8 @@
"GerritExtDistProvider": 
"src/providers/GerritExtDistProvider.php",
"GithubExtDistProvider": 
"src/providers/GithubExtDistProvider.php",
"ApiListExtDistRepos": "src/api/ApiListExtDistRepos.php",
-   "ApiListExtDistBranches": "src/api/ApiListExtDistBranches.php"
+   "ApiListExtDistBranches": "src/api/ApiListExtDistBranches.php",
+   "GraphiteStats": "src/stats/GraphiteStats.php"
},
"ResourceModules": {
"ext.extensiondistributor.special.styles": {
diff --git a/src/specials/SpecialExtensionDistributor.php 
b/src/specials/SpecialExtensionDistributor.php
index 3f08484..f5277c6 100644
--- a/src/specials/SpecialExtensionDistributor.php
+++ b/src/specials/SpecialExtensionDistributor.php
@@ -15,7 +15,10 @@
 
protected function getPopularList() {
global $wgExtDistPopularExtList;
-
-   return $wgExtDistPopularExtList ?: false;
+   $stats = new GraphiteStats();
+   $list = $stats->getPopularList( $this->type );
+   if ( $list === null ){
+   return $wgExtDistPopularExtList ?: false;
+   }
}
 }
diff --git a/src/stats/GraphiteStats.php b/src/stats/GraphiteStats.php
new file mode 100644
index 000..a3c9685
--- /dev/null
+++ b/src/stats/GraphiteStats.php
@@ -0,0 +1,48 @@
+ 'sortByMaxima(groupByNode(summarize(' . 
$metric . ',"4w","sum",true),3,"sum"))',
+   'format' => 'json',
+   'from' => '-4w',
+   'until' => 'now',
+   );
+
+   // TODO user agent
+   $url = $wgExtDistGraphiteRenderApi . '/?' . http_build_query( 
$requestParams );
+
+   $req = MWHttpRequest::factory( $url );
+   $status = $req->execute();
+   if ( !$status->isOK() ) {
+   // TODO log failure
+   return null;
+   }
+
+   $info = wfObjectToArray( FormatJson::decode( 
$req->getContent(), true ), true );
+
+   $popularList = array();
+   foreach ( $info as $dataSet ) {
+   $popularList[] = $dataSet['target'];
+   }
+   return $popularList;
+   }
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00e59daaf6060371244b6b7d429f9d639138fbd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
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] RelatedArticles load after half window scroll - change (mediawiki...RelatedArticles)

2015-12-05 Thread Sumit (Code Review)

Sumit has uploaded a new change for review.

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

Change subject: RelatedArticles load after half window scroll
..

RelatedArticles load after half window scroll

Only triggers RelatedArticles module load and query after user has scrolled
through half the document height.

Bug: T116838
Change-Id: If290988fb7cc187cad37dd4a8a2c4f38abed9bb9
---
M resources/ext.relatedArticles.readMore.bootstrap/index.js
1 file changed, 18 insertions(+), 11 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles 
refs/changes/69/257069/1

diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js 
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index 3cd056e..ff72cd6 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -9,24 +9,31 @@
mw.config.get( 'wgRelatedArticlesOnlyUseCirrusSearch' )
),
LIMIT = 3;
-
if (
config.wgNamespaceNumber === 0 &&
!config.wgIsMainPage &&
// any skin except minerva stable
( config.skin !== 'minerva' || config.wgMFMode === 'beta' )
) {
-   $.when(
-   // Note we load dependencies here rather than 
ResourceLoader
-   // to avoid PHP exceptions when Cards not installed
-   // which should never happen given the if statement.
-   mw.loader.using( [ 'ext.cards', 
'ext.relatedArticles.readMore' ] ),
-   relatedPages.getForCurrentPage( LIMIT )
-   ).done( function ( _, pages ) {
-   if ( pages.length ) {
-   mw.track( 'ext.relatedArticles.init', pages );
+   config.relatedPagesShown = false;
+   // load related articles after half article read
+   $( window ).on( 'scroll', $.debounce( 100, function() {
+   if ( $( window ).scrollTop() > $( document ).height() / 
2 &&
+   config.relatedPagesShown === false ) {
+   $.when(
+   // Note we load dependencies here 
rather than ResourceLoader
+   // to avoid PHP exceptions when Cards 
not installed
+   // which should never happen given the 
if statement.
+   mw.loader.using( [ 'ext.cards', 
'ext.relatedArticles.readMore' ] ),
+   relatedPages.getForCurrentPage( LIMIT )
+   ).done( function ( _, pages ) {
+   if ( pages.length ) {
+   mw.track( 
'ext.relatedArticles.init', pages );
+   }
+   } );
+   config.relatedPagesShown = true;
}
-   } );
+   } ) );
}
 
 }( jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If290988fb7cc187cad37dd4a8a2c4f38abed9bb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: dev
Gerrit-Owner: Sumit 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (73810c1) - change (mediawiki...VisualEditor)

2015-12-05 Thread jenkins-bot (Code Review)

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

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


Update VE core submodule to master (73810c1)

New changes:
d8b91db Forward-delete at end of document shouldn't do anything
dd3fed5 Localisation updates from https://translatewiki.net.
f199ce4 Limit the height of desktop-context popups
94920c0 Remove unused title properties from toolbar dialogs
e8321da LinearDeleteKeyHandler: cope better with aliens

Change-Id: I997b7f391b5f623f0d02fba9b8a9e7cf834b2735
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index d6f2d75..73810c1 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit d6f2d75b6c67f7b103938a63b81efdfa5d6e6883
+Subproject commit 73810c1ea751325efdebceeba3c1e37511178489

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I997b7f391b5f623f0d02fba9b8a9e7cf834b2735
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve some i18n messages - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Improve some i18n messages
..


Improve some i18n messages

Bug: T71195
Change-Id: Ib34e47b8f457484a169bcaba52a0ed5f63b37d95
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index bc897ca..837c7cc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,8 +20,8 @@
"extdist-no-versions-extensions": "The selected extension ($1) is not 
available in any version!",
"extdist-no-versions-skins": "The selected skin ($1) is not available 
in any version!",
"extdist-submit-version": "Continue",
-   "extdist-created-extensions": "A snapshot of version $2 of the 
$1 extension for MediaWiki $3 has been created. Your download 
should start automatically in 5 seconds.\n\nThe URL for this snapshot 
is:\n:$4\nIt may be used for immediate download to a server, but please do not 
bookmark it, since the contents will not be updated, and it may be deleted at a 
later date.\n\nThe tar archive should be extracted into your extensions 
directory. For example, on a unix-like OS:\n\n\ntar -xzf $5 -C 
/var/www/mediawiki/extensions\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the extensions 
directory on the server.\n\nAfter you have extracted the files, you will need 
to register the extension in LocalSettings.php. The extension documentation 
should have instructions on how to do this.\n\nIf you have any questions about 
this extension distribution system, please go to [[Extension 
talk:ExtensionDistributor]].",
-   "extdist-created-skins": "A snapshot of version $2 of the 
$1 skin for MediaWiki $3 has been created. Your download should 
start automatically in 5 seconds.\n\nThe URL for this snapshot is:\n:$4\nIt may 
be used for immediate download to a server, but please do not bookmark it, 
since the contents will not be updated, and it may be deleted at a later 
date.\n\nThe tar archive should be extracted into your skins directory. For 
example, on a unix-like OS:\n\n\ntar -xzf $5 -C 
/var/www/mediawiki/skins\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the skins 
directory on the server.\n\nAfter you have extracted the files, you will need 
to register the skin in LocalSettings.php. The skin documentation should have 
instructions on how to do this.\n\nIf you have any questions about this skin 
distribution system, please go to [[Extension talk:ExtensionDistributor]].",
+   "extdist-created-extensions": "A snapshot of version $2 of the 
$1 extension for MediaWiki $3 has been created. Your download 
should start automatically in 5 seconds.\n\nThe URL for this snapshot 
is:\n:$4\nYou can use this link to download the extension on any computer, but 
please do not bookmark it, since its contents will not be updated, and it may 
be deleted at a later date.\n\nYou should extract the tar archive's contents 
into the extensions directory of your MediaWiki installation. For example, on a 
Unix-like OS:\n\n\ntar -xzf $5 -C 
/var/www/mediawiki/extensions\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the extensions 
directory on the server.\n\nAfter you have extracted the files, you will need 
to register the extension in LocalSettings.php. The extension documentation 
should have instructions on how to do this.\n\nIf you have any questions about 
this extension distribution system, please go to [[Extension 
talk:ExtensionDistributor]].",
+   "extdist-created-skins": "A snapshot of version $2 of the 
$1 skin for MediaWiki $3 has been created. Your download should 
start automatically in 5 seconds.\n\nThe URL for this snapshot is:\n:$4\nYou 
can use this link to download the skin on any computer, but please do not 
bookmark it, since its contents will not be updated, and it may be deleted at a 
later date.\n\nYou should extract the tar archive's contents into the skins 
directory of your MediaWiki installation. For example, on a Unixn\ntar 
-xzf $5 -C /var/www/mediawiki/skins\n\n\nOn Windows, you can use 
[http://www.7-zip.org/ 7-zip] to extract the files.\n\nIf your wiki is on a 
remote server, extract the files to a temporary directory on your local 
computer, and then upload '''all''' of the extracted files to the skins 
directory on the

[MediaWiki-commits] [Gerrit] Improve wording of the UI - change (mediawiki...MathSearch)

2015-12-05 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Improve wording of the UI
..

Improve wording of the UI

* Based on suggestions from the pre-evaluation of the user form

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/66/257066/1

diff --git a/i18n/en.json b/i18n/en.json
index d11672b..693a0d2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -51,7 +51,7 @@
"math-lp-3-assessment-option-2": "the input is ok but has minor 
problems",
"math-lp-3-assessment-option-3": "the input has major problems",
"math-lp-3-problems-label": "The following problems exit",
-   "math-lp-3-problems-option-1": "missed to use the LaTeX text mode for 
words ($x>0 implies that x+1>0$ instead of $x>0\\text{ implies that } x+1>0$)",
+   "math-lp-3-problems-option-1": "missed to use the LaTeX text mode for 
words ($x>0 implies that x+1>0$ instead of $x>0\\text{ implies that 
} x+1>0$)",
"math-lp-3-problems-option-2": "spacing problems ($\\int f(x) dx$ 
rather than $\\int f(x)\\, dx$",
"math-lp-3-problems-option-3": "Multi letter function names (usage of 
$sin$ rather than $\\sin$)",
"math-lp-3-problems-option-4": "Redefinition of predefined concepts 
($\\operatorname{sin} rather than \\sin or $\\mathbb{R}$ rather than 
$\\reals$)",

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

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

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

[MediaWiki-commits] [Gerrit] Display Feedback field only at the last step - change (mediawiki...MathSearch)

2015-12-05 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Display Feedback field only at the last step
..

Display Feedback field only at the last step

* As suggested in the dry-run of the Form.

Change-Id: Ifda48a779904e5aec9b33f36f91f263627cc9a79
---
M includes/MlpEvalForm.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/65/257065/1

diff --git a/includes/MlpEvalForm.php b/includes/MlpEvalForm.php
index c6441cb..ba94561 100644
--- a/includes/MlpEvalForm.php
+++ b/includes/MlpEvalForm.php
@@ -139,10 +139,12 @@
'required' => false,
);
break;
+   case SpecialMlpEval::STEP_FINISHED:
+   $formDescriptor['feedback'] = array(
+   'type' => 'text',
+   );
+   break;
}
-   $formDescriptor['feedback'] = array(
-   'type' => 'text',
-   );
$formDescriptor['submit-info'] = array(
'type' => 'info',
// 'label-message' => 'math-lp-submit-info-label',

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

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

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

[MediaWiki-commits] [Gerrit] Add maint script for forcing a stat cache purge - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Add maint script for forcing a stat cache purge
..

Add maint script for forcing a stat cache purge

Change-Id: Iec028a09574b687e63286725ead5128061545ac8
---
A maintenance/purgeCachedStats.php
1 file changed, 39 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/purgeCachedStats.php b/maintenance/purgeCachedStats.php
new file mode 100644
index 000..c102c0c
--- /dev/null
+++ b/maintenance/purgeCachedStats.php
@@ -0,0 +1,39 @@
+mDescription = "Purge cached ExtensionDistributor stats";
+   }
+
+   public function execute() {
+   $cacheKeys = array(
+   wfMemcKey( 'ExtensionDistributor', 'GraphiteStats', 
'extensions', 'PopularList' ),
+   wfMemcKey( 'ExtensionDistributor', 'GraphiteStats', 
'skins', 'PopularList' ),
+   );
+
+   $cache = wfGetCache( CACHE_ANYTHING );
+
+   foreach ( $cacheKeys as $key ) {
+   $success = $cache->delete( $key );
+   if ( $success ) {
+   $this->output( "Purged $key\n" );
+   } else {
+   $this->output( "Failed to purge $key\n" );
+   }
+   }
+   $this->output( "Done.\n" );
+   }
+
+}
+
+$maintClass = "PurgeCachedStats";
+require_once( RUN_MAINTENANCE_IF_MAIN );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec028a09574b687e63286725ead5128061545ac8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
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] Syncronize VisualEditor: 6318460..ff63158 - change (mediawiki/extensions)

2015-12-05 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 6318460..ff63158
..


Syncronize VisualEditor: 6318460..ff63158

Change-Id: Ic225991d0d2f9d3b19939600ed31cf4f2444171d
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 6318460..ff63158 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 63184600d4dda13be3b15cf7990056624ce16749
+Subproject commit ff631581a89cc801b62c4e9551773d432bce73ac

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic225991d0d2f9d3b19939600ed31cf4f2444171d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6318460..ff63158 - change (mediawiki/extensions)

2015-12-05 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 6318460..ff63158
..

Syncronize VisualEditor: 6318460..ff63158

Change-Id: Ic225991d0d2f9d3b19939600ed31cf4f2444171d
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 6318460..ff63158 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 63184600d4dda13be3b15cf7990056624ce16749
+Subproject commit ff631581a89cc801b62c4e9551773d432bce73ac

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic225991d0d2f9d3b19939600ed31cf4f2444171d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add basic special page tests - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add basic special page tests
..


Add basic special page tests

Change-Id: I2211bcf266ee969e64ad0b12ad3f33c961c74dbd
---
M ExtensionDistributor.hooks.php
M extension.json
R includes/api/ApiListExtDistBranches.php
R includes/api/ApiListExtDistRepos.php
R includes/providers/ExtDistProvider.php
R includes/providers/GerritExtDistProvider.php
R includes/providers/GithubExtDistProvider.php
R includes/specials/SpecialBaseDistributor.php
R includes/specials/SpecialExtensionDistributor.php
R includes/specials/SpecialSkinDistributor.php
A tests/specials/SpecialExtensionDistributorTest.php
A tests/specials/SpecialSkinDistributorTest.php
12 files changed, 78 insertions(+), 8 deletions(-)

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



diff --git a/ExtensionDistributor.hooks.php b/ExtensionDistributor.hooks.php
index 9d696d0..ca15773 100644
--- a/ExtensionDistributor.hooks.php
+++ b/ExtensionDistributor.hooks.php
@@ -20,4 +20,31 @@
 
return true;
}
+
+   /**
+* Handler for UnitTestsList hook.
+* @see http://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
+* @param &$files Array of unit test files
+* @return bool true in all cases
+*/
+   public static function onUnitTestsList( &$files ) {
+   // @codeCoverageIgnoreStart
+   $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . 
'/tests/' );
+
+   /**
+* @var SplFileInfo $fileInfo
+*/
+   $ourFiles = array();
+   foreach ( new RecursiveIteratorIterator( $directoryIterator ) 
as $fileInfo ) {
+   if ( substr( $fileInfo->getFilename(), -8 ) === 
'Test.php' ) {
+   $ourFiles[] = $fileInfo->getPathname();
+   }
+   }
+
+   $files = array_merge( $files, $ourFiles );
+
+   return true;
+   // @codeCoverageIgnoreEnd
+   }
+
 }
diff --git a/extension.json b/extension.json
index aa96b51..5cf586e 100644
--- a/extension.json
+++ b/extension.json
@@ -36,6 +36,9 @@
"Hooks": {
"APIQuerySiteInfoGeneralInfo": [

"ExtensionDistributorHooks::onAPIQuerySiteInfoGeneralInfo"
+   ],
+   "UnitTestsList": [
+   "ExtensionDistributorHooks::onUnitTestsList"
]
},
"SpecialPages": {
@@ -44,14 +47,14 @@
},
"AutoloadClasses": {
"ExtensionDistributorHooks": "ExtensionDistributor.hooks.php",
-   "SpecialBaseDistributor": "specials/SpecialBaseDistributor.php",
-   "SpecialExtensionDistributor": 
"specials/SpecialExtensionDistributor.php",
-   "SpecialSkinDistributor": "specials/SpecialSkinDistributor.php",
-   "ExtDistProvider": "providers/ExtDistProvider.php",
-   "GerritExtDistProvider": "providers/GerritExtDistProvider.php",
-   "GithubExtDistProvider": "providers/GithubExtDistProvider.php",
-   "ApiListExtDistRepos": "api/ApiListExtDistRepos.php",
-   "ApiListExtDistBranches": "api/ApiListExtDistBranches.php"
+   "SpecialBaseDistributor": 
"includes/specials/SpecialBaseDistributor.php",
+   "SpecialExtensionDistributor": 
"includes/specials/SpecialExtensionDistributor.php",
+   "SpecialSkinDistributor": 
"includes/specials/SpecialSkinDistributor.php",
+   "ExtDistProvider": "includes/providers/ExtDistProvider.php",
+   "GerritExtDistProvider": 
"includes/providers/GerritExtDistProvider.php",
+   "GithubExtDistProvider": 
"includes/providers/GithubExtDistProvider.php",
+   "ApiListExtDistRepos": "includes/api/ApiListExtDistRepos.php",
+   "ApiListExtDistBranches": 
"includes/api/ApiListExtDistBranches.php"
},
"ResourceModules": {
"ext.extensiondistributor.special.styles": {
diff --git a/api/ApiListExtDistBranches.php 
b/includes/api/ApiListExtDistBranches.php
similarity index 100%
rename from api/ApiListExtDistBranches.php
rename to includes/api/ApiListExtDistBranches.php
diff --git a/api/ApiListExtDistRepos.php b/includes/api/ApiListExtDistRepos.php
similarity index 100%
rename from api/ApiListExtDistRepos.php
rename to includes/api/ApiListExtDistRepos.php
diff --git a/providers/ExtDistProvider.php 
b/includes/providers/ExtDistProvider.php
similarity index 100%
rename from providers/ExtDistProvider.php
rename to includes/providers/ExtDistProvider.php
diff --git a/providers/GerritExtDistProvider.php 
b/includes/providers/GerritExtDistProvider.php
similarity index 100%
rename from providers/GerritExtDistProvider.php
rename to includes/providers/GerritExtDistProvider.php

[MediaWiki-commits] [Gerrit] wmflib: fixes for ordered_yaml - change (operations/puppet)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: wmflib: fixes for ordered_yaml
..

wmflib: fixes for ordered_yaml

* Don't turn strings into booleans/integers. If the structure to convert
  contains "true" as a string, it would be converted to a boolean. The same
  applies for a string with an integer or a float. This seems a bad idea. For
  example, when specifying the "true" command, we get the "true" boolean. Or
  when we put "0100" as a PIN code, we get 64 instead.
* Fix boolean handling in ordered_yaml. Whatever the value to produce is "true"
  or "false", only "true" is outputted. Output the appropriate value instead.

Change-Id: I973ea8d10988485aa312a57c00c88681caa32a71
---
M modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/257075/1

diff --git a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb 
b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
index 64973f4..b5996a7 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
@@ -5,7 +5,7 @@
 # === Examples
 #
 #   # Render a Puppet hash as a configuration file:
-#   $options = { 'useGraphite' => true, 'minVal' => '0.1' }
+#   $options = { 'useGraphite' => true, 'minVal' => 0.1 }
 #   file { '/etc/kibana/config.yaml':
 # content => ordered_yaml($options),
 #   }
@@ -25,12 +25,10 @@
   map.sort.each { |p| yield p }
 end
 value.sort.reduce(map) { |h, (k, v)| h[k] = sort_keys_recursive(v); h }
-  when 'true', 'false'
-value == 'true'
   when :undef
 nil
   else
-value.include?('.') ? Float(value) : Integer(value) rescue value
+value
   end
 end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I973ea8d10988485aa312a57c00c88681caa32a71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Add jobqueue-labs.php to noc - change (operations/mediawiki-config)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add jobqueue-labs.php to noc
..


Add jobqueue-labs.php to noc

Change-Id: If75f2b05618bf52d3cce5f47d83340796b008a3b
---
A docroot/noc/conf/jobqueue-labs.php.txt
M docroot/noc/createTxtFileSymlinks.sh
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/docroot/noc/conf/jobqueue-labs.php.txt 
b/docroot/noc/conf/jobqueue-labs.php.txt
new file mode 12
index 000..a310412
--- /dev/null
+++ b/docroot/noc/conf/jobqueue-labs.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/jobqueue-labs.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index d496dd6..47cbfd0 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -20,6 +20,7 @@
filebackend.php
flaggedrevs.php
jobqueue-eqiad.php
+   jobqueue-labs.php
LegalContactPages.php
AffComContactPages.php
liquidthreads.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If75f2b05618bf52d3cce5f47d83340796b008a3b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Krinkle 
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] Don't do a wfWaitForSlave() call on every row in refreshMess... - change (mediawiki...WikimediaMaintenance)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Don't do a wfWaitForSlave() call on every row in 
refreshMessageBlobs.php
..


Don't do a wfWaitForSlave() call on every row in refreshMessageBlobs.php

Bug: T120240
Change-Id: I9df2bb68a7d5f4b0d73a03cc3bbf9b086c3e103d
(cherry picked from commit be2656aa77b108ab53a260e4f9b79bbec8625862)
---
M refreshMessageBlobs.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/refreshMessageBlobs.php b/refreshMessageBlobs.php
index bb9d44c..91f2906 100644
--- a/refreshMessageBlobs.php
+++ b/refreshMessageBlobs.php
@@ -27,6 +27,7 @@
array( 'ORDER BY' => 'mr_lang' )
);
$prevLang = false;
+   $rows = 0;
foreach ( $res as $row ) {
# Check modification time for this language
if ( !isset( $langModTime[$row->mr_lang] ) ) {
@@ -66,8 +67,11 @@
),
__METHOD__
);
-   wfWaitForSlaves();
+   if ( ++$rows % 1000 == 0 ) {
+   wfWaitForSlaves();
+   }
}
+   wfWaitForSlaves();
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9df2bb68a7d5f4b0d73a03cc3bbf9b086c3e103d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.27.0-wmf.7
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Krinkle 
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] Disable PasswordCannotBePopular for sysop and bureaucrat - change (operations/mediawiki-config)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Disable PasswordCannotBePopular for sysop and bureaucrat
..


Disable PasswordCannotBePopular for sysop and bureaucrat

Needs communication to projects before enabling...

Change-Id: I4064c9ae006ffb5fdb0a74e11f5300284258ef2d
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0e189c0..c5c4d11 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -327,6 +327,11 @@
$wgPasswordPolicy['policies']['bot']['MinimalPasswordLength'] = 1;
 }
 
+// Temporarily disable PasswordCannotBePopular policies until communicated.
+unset( $wgPasswordPolicy['policies']['bureaucrat']['PasswordCannotBePopular'] 
);
+unset( $wgPasswordPolicy['policies']['sysop']['PasswordCannotBePopular'] );
+
+
 if ( PHP_SAPI === 'cli' ) {
$wgShowExceptionDetails = true;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4064c9ae006ffb5fdb0a74e11f5300284258ef2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
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] Set manifest_version in extension.json - change (mediawiki...ImportArticles)

2015-12-05 Thread Cblair91 (Code Review)

Cblair91 has submitted this change and it was merged.

Change subject: Set manifest_version in extension.json
..


Set manifest_version in extension.json

Bug: T100745
Change-Id: I2c95403d1929aed02b7e291cb9447080e949e894
---
M extension.json
1 file changed, 37 insertions(+), 36 deletions(-)

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



diff --git a/extension.json b/extension.json
index 13ef06d..7d6263b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,36 +1,37 @@
-{
-   "name": "ImportArticles",
-   "version": "1.3",
-   "author": "Kris Blair (Cblair91)",
-   "descriptionmsg": "importarticles-desc",
-   "license-name": "GPL-3.0",
-   "type": "other",
-   "MessagesDirs": {
-   "ImportArticles": [
-   "i18n"
-   ]
-   },
-   "ExtensionMessagesFiles": {
-   "ImportArticles": "ImportArticles.i18n.php"
-   },
-   "AutoloadClasses": {
-   "ImportArticles": "ImportArticles.hooks.php"
-   },
-   "ResourceModules": {
-   "ext.importarticles": {
-   "scripts": [
-   "resources/importarticles.js"
-   ],
-   "dependencies": []
-   }
-   },
-   "ResourceFileModulePaths": {
-   "localBasePath": "",
-   "remoteExtPath": "ImportArticles"
-   },
-   "Hooks": {
-   "BeforePageDisplay": [
-   "ImportArticles::onBeforePageDisplay"
-   ]
-   }
-}
\ No newline at end of file
+{
+   "name": "ImportArticles",
+   "version": "1.3",
+   "author": "Kris Blair (Cblair91)",
+   "descriptionmsg": "importarticles-desc",
+   "license-name": "GPL-3.0",
+   "type": "other",
+   "MessagesDirs": {
+   "ImportArticles": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "ImportArticles": "ImportArticles.i18n.php"
+   },
+   "AutoloadClasses": {
+   "ImportArticles": "ImportArticles.hooks.php"
+   },
+   "ResourceModules": {
+   "ext.importarticles": {
+   "scripts": [
+   "resources/importarticles.js"
+   ],
+   "dependencies": []
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteExtPath": "ImportArticles"
+   },
+   "Hooks": {
+   "BeforePageDisplay": [
+   "ImportArticles::onBeforePageDisplay"
+   ]
+   },
+   "manifest_version": 1
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c95403d1929aed02b7e291cb9447080e949e894
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImportArticles
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Cblair91 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set $wgExtDistGraphiteRenderApi - change (operations/mediawiki-config)

2015-12-05 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Set $wgExtDistGraphiteRenderApi
..

Set $wgExtDistGraphiteRenderApi

Introduced in 8eabd5527005a16, will automatically fetch a list of
popular extensions/skins from graphite and display them.

And remove the old and now non-existent EventLogging configuration
option.

Bug: T120339
Change-Id: Ie041c5ec49b23cdd7fb5de127b076f9eb96e87f4
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c5c4d11..39def2d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -776,8 +776,8 @@
'REL1_19',
);
 
-   // track downloads
-   $wgExtDistUseEventLogging = true;
+   // Use Graphite for popular list
+   $wgExtDistGraphiteRenderApi = 'https://graphite.wikimedia.org/render';
 }
 
 if ( $wmgUseGlobalBlocking ) {

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

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

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

[MediaWiki-commits] [Gerrit] Fix some FileRepo IDEA errors - change (mediawiki/core)

2015-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has submitted this change and it was merged.

Change subject: Fix some FileRepo IDEA errors
..


Fix some FileRepo IDEA errors

Change-Id: Ia30d82c9ce27503182d95cd9a3f23d80743e7364
---
M includes/filerepo/FileRepo.php
1 file changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 647dbec..15007af 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -123,13 +123,13 @@
/** @var bool Whether all zones should be private (e.g. private wiki 
repo) */
protected $isPrivate;
 
-   /**
-* Factory functions for creating new files
-* Override these in the base class
-*/
+   /** @var array callable Override these in the base class */
protected $fileFactory = array( 'UnregisteredLocalFile', 'newFromTitle' 
);
+   /** @var array callable|bool Override these in the base class */
protected $oldFileFactory = false;
+   /** @var array callable|bool Override these in the base class */
protected $fileFactoryKey = false;
+   /** @var array callable|bool Override these in the base class */
protected $oldFileFactoryKey = false;
 
/**
@@ -1031,8 +1031,10 @@
$headers = array( 'Content-Disposition' => 
$triple[2] );
} elseif ( is_array( $triple[2] ) && isset( 
$triple[2]['headers'] ) ) {
$headers = $triple[2]['headers'];
+   } else {
+   $headers = array();
}
-   // @fixme: $headers might not be defined
+
$operations[] = array(
'op' => FileBackend::isStoragePath( $src ) ? 
'copy' : 'store',
'src' => $src,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia30d82c9ce27503182d95cd9a3f23d80743e7364
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
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] Fix View tests not running during CI - change (mediawiki...Wikibase)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix View tests not running during CI
..


Fix View tests not running during CI

I noticed that I get weird class not found errors when trying to run
the ItemViewTest and PropertyViewTest. Both extend the abstract
EntityViewTest, which could not be found. You can see the reason here.

Change-Id: I05ee22b8bbb02910c5db963df4e966388a54ea28
---
M composer.json
M view/tests/phpunit/ClaimHtmlGeneratorTest.php
M view/tests/phpunit/EmptyEditSectionGeneratorTest.php
M view/tests/phpunit/EntityTermsViewTest.php
M view/tests/phpunit/EntityViewFactoryTest.php
M view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
M view/tests/phpunit/EntityViewTest.php
M view/tests/phpunit/ItemViewTest.php
M view/tests/phpunit/Module/TemplateModuleTest.php
M view/tests/phpunit/PropertyViewTest.php
M view/tests/phpunit/SiteLinksViewTest.php
M view/tests/phpunit/SnakHtmlGeneratorTest.php
M view/tests/phpunit/StatementGroupListViewTest.php
M view/tests/phpunit/StatementSectionsViewTest.php
M view/tests/phpunit/Template/TemplateFactoryTest.php
M view/tests/phpunit/Template/TemplateRegistryTest.php
M view/tests/phpunit/Template/TemplateTest.php
M view/tests/phpunit/TextInjectorTest.php
M view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
19 files changed, 19 insertions(+), 18 deletions(-)

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



diff --git a/composer.json b/composer.json
index 038a918..5bf6e7a 100644
--- a/composer.json
+++ b/composer.json
@@ -69,6 +69,7 @@
],
"psr-4": {
"Wikibase\\View\\": "view/src",
+   "Wikibase\\View\\Tests\\": "view/tests/phpunit",
"Wikimedia\\Purtle\\": "purtle/src",
"Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit"
}
diff --git a/view/tests/phpunit/ClaimHtmlGeneratorTest.php 
b/view/tests/phpunit/ClaimHtmlGeneratorTest.php
index 5c25f46..b3f5dc4 100644
--- a/view/tests/phpunit/ClaimHtmlGeneratorTest.php
+++ b/view/tests/phpunit/ClaimHtmlGeneratorTest.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/256710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I05ee22b8bbb02910c5db963df4e966388a54ea28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Adrian Lang 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jonas Kress (WMDE) 
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] Allow specifying '*' as the family for usernames - change (pywikibot/core)

2015-12-05 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Allow specifying '*' as the family for usernames
..

Allow specifying '*' as the family for usernames

We already allow it for the language code, now accept it for family
names too.

Bug: T120334
Change-Id: I64ba1ce5a08c5db69b9b32868653950dc065ae03
---
M pywikibot/__init__.py
1 file changed, 19 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/65/257165/1

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 343f1bb..7829f03 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -613,11 +613,25 @@
 
 # config.usernames is initialised with a dict for each family name
 family_name = str(fam)
-if family_name in config.usernames:
-user = user or config.usernames[family_name].get(code) \
-or config.usernames[family_name].get('*')
-sysop = sysop or config.sysopnames[family_name].get(code) \
-or config.sysopnames[family_name].get('*')
+
+def lookup_username(data, family_name, code):
+"""
+Lookup a username from user-config.py.
+
+Resolution order:
+1. usernames[family][code]
+2. usernames[family][*]
+3. usernames[*][code]
+4. usernames[*][*]
+"""
+code_list = data.get(family_name) or data.get('*')
+if code_list:
+return code_list.get(code) or code_list.get('*')
+
+return None
+
+user = user or lookup_username(config.usernames, family_name, code)
+sysop = sysop or lookup_username(config.sysopnames, family_name, code)
 
 if not isinstance(interface, type):
 # If it isnt a class, assume it is a string

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

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

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

[MediaWiki-commits] [Gerrit] Remove obsolete category links code - change (mediawiki/core)

2015-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove obsolete category links code
..

Remove obsolete category links code

* These calls and methods should no longer be needed
* Follow-up to 6dedffc2d7f8

Change-Id: Iff121263610117112c84edb5e575f039456d1ac8
---
M includes/deferred/LinksUpdate.php
M includes/jobqueue/jobs/RefreshLinksJob.php
2 files changed, 0 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/257166/1

diff --git a/includes/deferred/LinksUpdate.php 
b/includes/deferred/LinksUpdate.php
index f9d7e9c..755a7cd 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -61,9 +61,6 @@
/** @var bool Whether to queue jobs for recursive updates */
public $mRecursive;
 
-   /** @var bool Whether this job was triggered by a recursive update job 
*/
-   private $mTriggeredRecursive;
-
/** @var Revision Revision for which this update has been triggered */
private $mRevision;
 
@@ -866,15 +863,6 @@
 */
public function getImages() {
return $this->mImages;
-   }
-
-   /**
-* Set this object as being triggered by a recursive LinksUpdate
-*
-* @since 1.27
-*/
-   public function setTriggeredRecursive() {
-   $this->mTriggeredRecursive = true;
}
 
/**
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php 
b/includes/jobqueue/jobs/RefreshLinksJob.php
index fa3278d..0314352 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -229,30 +229,6 @@
$parserOutput
);
 
-   foreach ( $updates as $key => $update ) {
-   // FIXME: move category change RC stuff to a separate 
update.
-   // RC entry addition aborts if edits where since made, 
which is not necessary.
-   // It's also an SoC violation for links update code to 
care about RC.
-   if ( $update instanceof LinksUpdate ) {
-   if ( !empty( 
$this->params['triggeredRecursive'] ) ) {
-   $update->setTriggeredRecursive();
-   }
-   if ( !empty( $this->params['triggeringUser'] ) 
) {
-   $userInfo = 
$this->params['triggeringUser'];
-   if ( $userInfo['userId'] ) {
-   $user = User::newFromId( 
$userInfo['userId'] );
-   } else {
-   // Anonymous, use the username
-   $user = User::newFromName( 
$userInfo['userName'], false );
-   }
-   $update->setTriggeringUser( $user );
-   }
-   if ( !empty( 
$this->params['triggeringRevisionId'] ) ) {
-   $update->setRevision( $revision );
-   }
-   }
-   }
-
$latestNow = $page->lockAndGetLatest();
if ( !$latestNow || $revision->getId() != $latestNow ) {
// Do not clobber over newer updates with older ones. 
If all jobs where FIFO and

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff121263610117112c84edb5e575f039456d1ac8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Imported Upstream version 0.7.4 - change (operations...bloomd)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Imported Upstream version 0.7.4
..

Imported Upstream version 0.7.4

no check, no libev

Bug: T120544
Change-Id: I54d4e6eb166814cd8cb5485c6eb3332a1de9bee9
---
A .clang_complete
A .gitignore
A .travis.yml
A CHANGELOG.mdown
A LICENSE
A README.md
A SConstruct
A TODO.mdown
A Vagrantfile
A bench.c
A deps/inih/LICENSE.txt
A deps/inih/README.txt
A deps/inih/ini.c
A deps/inih/ini.h
A deps/murmurhash/MurmurHash3.cpp
A deps/murmurhash/MurmurHash3.h
A deps/spookyhash/spooky.cpp
A deps/spookyhash/spooky.h
A integ/__init__.py
A integ/test_integ.py
A src/bloomd/art.c
A src/bloomd/art.h
A src/bloomd/background.c
A src/bloomd/background.h
A src/bloomd/barrier.c
A src/bloomd/barrier.h
A src/bloomd/bloomd.c
A src/bloomd/config.c
A src/bloomd/config.h
A src/bloomd/conn_handler.c
A src/bloomd/conn_handler.h
A src/bloomd/filter.c
A src/bloomd/filter.h
A src/bloomd/filter_manager.c
A src/bloomd/filter_manager.h
A src/bloomd/handler_constants.c
A src/bloomd/networking.c
A src/bloomd/networking.h
A src/bloomd/spinlock.h
A src/bloomd/type_compat.h
A src/libbloom/bitmap.c
A src/libbloom/bitmap.h
A src/libbloom/bloom.c
A src/libbloom/bloom.h
A src/libbloom/sbf.c
A src/libbloom/sbf.h
A tests/bloomd/runner.c
A tests/bloomd/test_art.c
A tests/bloomd/test_config.c
A tests/bloomd/test_filter.c
A tests/bloomd/test_filtmgr.c
A tests/libbloom/runner.c
A tests/libbloom/test_bitmap.c
A tests/libbloom/test_bloom.c
A tests/libbloom/test_sbf.c
A tests/words.txt
56 files changed, 249,962 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/bloomd 
refs/changes/67/257167/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54d4e6eb166814cd8cb5485c6eb3332a1de9bee9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/bloomd
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] import debian directory - change (operations...bloomd)

2015-12-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: import debian directory
..

import debian directory

Change-Id: I0273e18a3f1c6a12cd2b43ca335bfe2db574070d
---
A debian/README.source
A debian/bloomd.conf
A debian/bloomd.init
A debian/bloomd.service
A debian/bloomd.upstart
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/install
A debian/patches/001-dynamically-link-libev-if-available.patch
A debian/patches/series
A debian/postinst
A debian/rules
A debian/source/format
16 files changed, 323 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/bloomd 
refs/changes/68/257168/1

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..01a318a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+bloomd for Debian
+-
+
+bundled dependencies check and libev have been removed from deps/ and Debian's
+packages are used instead during build.
+
+ -- Ori Livneh   Sat, 05 Dec 2015 21:16:14 +
+
diff --git a/debian/bloomd.conf b/debian/bloomd.conf
new file mode 100644
index 000..4e1f89e
--- /dev/null
+++ b/debian/bloomd.conf
@@ -0,0 +1,4 @@
+[bloomd]
+tcp_port = 8673
+in_memory = 1
+log_level = INFO
diff --git a/debian/bloomd.init b/debian/bloomd.init
new file mode 100644
index 000..b2adc63
--- /dev/null
+++ b/debian/bloomd.init
@@ -0,0 +1,128 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:  bloomd
+# Required-Start:$remote_fs $syslog $network
+# Required-Stop: $remote_fs $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: C statsd daemon
+### END INIT INFO
+
+# Author: Ori Livneh 
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="C statsd daemon"
+NAME=bloomd
+DAEMON=/usr/bin/$NAME
+DAEMON_ARGS="-f /etc/bloomd.conf"
+DAEMON_USER="bloomd"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+   # Return
+   #   0 if daemon has been started
+   #   1 if daemon was already running
+   #   2 if daemon could not be started
+   start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
+   --chuid $DAEMON_USER --exec $DAEMON --test > /dev/null \
+   || return 1
+   start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
+   --chuid $DAEMON_USER --background --exec $DAEMON -- 
$DAEMON_ARGS \
+   || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+   # Return
+   #   0 if daemon has been stopped
+   #   1 if daemon was already stopped
+   #   2 if daemon could not be stopped
+   #   other if a failure occurred
+   start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile 
$PIDFILE \
+   --user $DAEMON_USER --name $NAME
+   RETVAL="$?"
+   [ "$RETVAL" = 2 ] && return 2
+   # Wait for children to finish too if this is a daemon that forks
+   # and if the daemon is only ever run from this initscript.
+   # If the above conditions are not satisfied then add some other code
+   # that waits for the process to drop all resources that could be
+   # needed by services started subsequently.  A last resort is to
+   # sleep for some time.
+   start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 \
+   --user $DAEMON_USER --exec $DAEMON
+   [ "$?" = 2 ] && return 2
+   # Many daemons don't delete their pidfiles when they exit.
+   rm -f $PIDFILE
+   return "$RETVAL"
+}
+
+case "$1" in
+  start)
+   [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+   do_start
+   case "$?" in
+   0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+   2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+   esac
+   ;;
+  stop)
+   [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+   do_stop
+   case "$?" in
+   0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+   2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+   esac
+   ;;
+  status)
+   status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+   ;;
+  restart|force-reload)
+   log_daemon_msg "Restarting $DESC" "$NAME"
+

[MediaWiki-commits] [Gerrit] Deduplicate input i Special:Contributions - change (mediawiki/core)

2015-12-05 Thread Ltrlg (Code Review)

Ltrlg has uploaded a new change for review.

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

Change subject: Deduplicate input i Special:Contributions
..

Deduplicate input i Special:Contributions

Bug: T120542
Change-Id: I129bf2cf826439b873c3bf590f784ea24ab6181d
---
M includes/specials/SpecialContributions.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 5f7c587..71d2b23 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -465,7 +465,8 @@
'month',
'topOnly',
'newOnly',
-   'associated'
+   'associated',
+   'tagfilter'
);
 
foreach ( $this->opts as $name => $value ) {

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-12-05T10:00:01+0000 - change (mediawiki...Wikidata)

2015-12-05 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-12-05T10:00:01+
..

New Wikidata Build - 2015-12-05T10:00:01+

Change-Id: Iab7a5515f80d7f8b1a5e08d126929505826208bb
---
M composer.lock
M extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
M extensions/ExternalValidation/tests/phpunit/Specials/SpecialCrossCheckTest.php
M 
extensions/ExternalValidation/tests/phpunit/Specials/SpecialExternalDbsTest.php
M extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/includes/modules/SiteModule.php
M 
extensions/Wikibase/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
M extensions/Wikibase/client/tests/phpunit/includes/api/ApiClientInfoTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/specials/SpecialPagesWithBadgesTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/specials/SpecialUnconnectedPagesTest.php
M extensions/Wikibase/lib/includes/SettingsArray.php
M extensions/Wikibase/lib/includes/changes/DiffChange.php
M extensions/Wikibase/lib/includes/store/EntityStore.php
M extensions/Wikibase/lib/includes/store/StorageException.php
M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilder.php
M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
D extensions/Wikibase/lib/tests/phpunit/specials/SpecialPageTestBase.php
M 
extensions/Wikibase/lib/tests/phpunit/store/CachingEntityRevisionLookupTest.php
M extensions/Wikibase/purtle/src/N3RdfWriterBase.php
M extensions/Wikibase/purtle/src/NTriplesRdfWriter.php
M extensions/Wikibase/purtle/src/RdfWriter.php
M extensions/Wikibase/purtle/src/TurtleRdfWriter.php
M extensions/Wikibase/purtle/src/XmlRdfWriter.php
M extensions/Wikibase/purtle/tests/phpunit/N3QuoterTest.php
M extensions/Wikibase/repo/includes/BabelUserLanguageLookup.php
M extensions/Wikibase/repo/includes/ChangeDispatcher.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOp.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpAliases.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpDescription.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpException.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpLabel.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpMainSnak.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifier.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReference.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpRemoveStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpSiteLink.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatementRank.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOps.php
R extensions/Wikibase/repo/includes/Interactors/TermIndexSearchInteractor.php
R extensions/Wikibase/repo/includes/Interactors/TermSearchInteractor.php
R extensions/Wikibase/repo/includes/Interactors/TermSearchResult.php
M extensions/Wikibase/repo/includes/ItemDisambiguation.php
M extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/repo/includes/actions/HistoryEntityAction.php
M extensions/Wikibase/repo/includes/api/EntitySearchHelper.php
M extensions/Wikibase/repo/includes/specials/SpecialItemDisambiguation.php
M extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
M extensions/Wikibase/repo/includes/store/sql/EntityPerPageBuilder.php
M extensions/Wikibase/repo/includes/store/sql/TermSearchKeyBuilder.php
M extensions/Wikibase/repo/includes/store/sql/WikiPageEntityRedirectLookup.php
M extensions/Wikibase/repo/maintenance/createBlacklistedItems.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
M

[MediaWiki-commits] [Gerrit] Avoid confusing use of 'administrator' - change (mediawiki/core)

2015-12-05 Thread Purodha (Code Review)

Purodha has uploaded a new change for review.

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

Change subject: Avoid confusing use of 'administrator'
..

Avoid confusing use of 'administrator'

'administrator' is generally understood as a role in the wiki.
Messages dealing with different roles must avoid the word so
as to not mislead less educated users, even if it would be
usually used in general speech and in non-wiki-contexts.

Bug: T103884
Change-Id: Iddadfe2d8c4ecd458ebda00b0d049ed9ce2181c8
---
M languages/i18n/en.json
M languages/i18n/qqq.json
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 32e9b00..c87eae8 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -319,7 +319,7 @@
"laggedslavemode": "Warning: Page may not contain 
recent updates.",
"readonly": "Database locked",
"enterlockreason": "Enter a reason for the lock, including an estimate 
of when the lock will be released",
-   "readonlytext": "The database is currently locked to new entries and 
other modifications, probably for routine database maintenance, after which it 
will be back to normal.\n\nThe administrator who locked it offered this 
explanation: $1",
+   "readonlytext": "The database is currently locked to new entries and 
other modifications, probably for routine database maintenance, after which it 
will be back to normal.\n\nThe person who locked it offered this explanation: 
$1",
"missing-article": "The database did not find the text of a page that 
it should have found, named \"$1\" $2.\n\nThis is usually caused by following 
an outdated diff or history link to a page that has been deleted.\n\nIf this is 
not the case, you may have found a bug in the software.\nPlease report this to 
an [[Special:ListUsers/sysop|administrator]], making note of the URL.",
"missingarticle-rev": "(revision#: $1)",
"missingarticle-diff": "(Diff: $1, $2)",
@@ -376,7 +376,7 @@
"mypreferencesprotected": "You do not have permission to edit your 
preferences.",
"ns-specialprotected": "Special pages cannot be edited.",
"titleprotected": "This title has been protected from creation by 
[[User:$1|$1]].\nThe reason given is \"$2\".",
-   "filereadonlyerror": "Unable to modify the file \"$1\" because the file 
repository \"$2\" is in read-only mode.\n\nThe administrator who locked it 
offered this explanation: \"$3\".",
+   "filereadonlyerror": "Unable to modify the file \"$1\" because the file 
repository \"$2\" is in read-only mode.\n\nThe person who locked it offered 
this explanation: \"$3\".",
"invalidtitle-knownnamespace": "Invalid title with namespace \"$2\" and 
text \"$3\"",
"invalidtitle-unknownnamespace": "Invalid title with unknown namespace 
number $1 and text \"$2\"",
"exception-nologin": "Not logged in",
@@ -675,7 +675,7 @@
"editpage-cannot-use-custom-model": "The content model of this page 
cannot be changed.",
"longpage-hint": "-",
"longpageerror": "Error: The text you have submitted is 
{{PLURAL:$1|one kilobyte|$1 kilobytes}} long, which is longer than the maximum 
of {{PLURAL:$2|one kilobyte|$2 kilobytes}}.\nIt cannot be saved.",
-   "readonlywarning": "Warning: The database has been locked for 
maintenance, so you will not be able to save your edits right 
now.\nYou may wish to copy and paste your text into a text file and 
save it for later.\n\nThe administrator who locked it offered this explanation: 
$1",
+   "readonlywarning": "Warning: The database has been locked for 
maintenance, so you will not be able to save your edits right 
now.\nYou may wish to copy and paste your text into a text file and 
save it for later.\n\nThe person who locked it offered this explanation: $1",
"protectedpagewarning": "Warning: This page has been protected 
so that only users with administrator privileges can edit it.\nThe 
latest log entry is provided below for reference:",
"semiprotectedpagewarning": "Note: This page has been 
protected so that only registered users can edit it.\nThe latest log entry is 
provided below for reference:",
"cascadeprotectedwarning": "Warning: This page has 
been protected so that only users with administrator privileges can edit it 
because it is transcluded in the following cascade-protected 
{{PLURAL:$1|page|pages}}:",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 15538e6..b4e9fad 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -493,7 +493,7 @@
"laggedslavemode": "Used as warning when getting the timestamp of the 
latest version, if in LaggedSlaveMode.",
"readonly": "Used as title of error message when database is locked.",
"enterlockreason": "For

[MediaWiki-commits] [Gerrit] Version 1.4: extension registration support & modernization - change (mediawiki...LookupUser)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Version 1.4: extension registration support & modernization
..


Version 1.4: extension registration support & modernization

* Moved hooked function into the LookupUserPage class from the PHP setup file
* Globals -> RequestContext
* Removed old PHP i18n file

Change-Id: I056e747c96dc6d7225c8f19f5a30a60b4abbe5b2
---
M LookupUser.body.php
D LookupUser.i18n.php
M LookupUser.php
A extension.json
4 files changed, 109 insertions(+), 113 deletions(-)

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



diff --git a/LookupUser.body.php b/LookupUser.body.php
index a773622..2844f59 100644
--- a/LookupUser.body.php
+++ b/LookupUser.body.php
@@ -14,21 +14,19 @@
}
 
function getDescription() {
-   return wfMsg( 'lookupuser' );
+   return $this->msg( 'lookupuser' )->text();
}
 
/**
 * Show the special page
 *
-* @param $subpage Mixed: parameter passed to the page or null
+* @param mixed|null $subpage Parameter passed to the page (user name 
or email address)
 */
public function execute( $subpage ) {
-   global $wgRequest, $wgUser;
-
$this->setHeaders();
 
# If the user doesn't have the required 'lookupuser' 
permission, display an error
-   if ( !$wgUser->isAllowed( 'lookupuser' ) ) {
+   if ( !$this->getUser()->isAllowed( 'lookupuser' ) ) {
$this->displayRestrictionError();
return;
}
@@ -36,33 +34,34 @@
if ( $subpage ) {
$target = $subpage;
} else {
-   $target = $wgRequest->getText( 'target' );
+   $target = $this->getRequest()->getText( 'target' );
}
 
$this->showForm( $target );
 
if ( $target ) {
-   $emailUser = $wgRequest->getText( 'email_user' );
+   $emailUser = $this->getRequest()->getText( 'email_user' 
);
$this->showInfo( $target, $emailUser );
}
}
 
/**
 * Show the LookupUser form
-* @param $target Mixed: user whose info we're about to look up
+* @param mixed $target User whose info we're about to look up
 */
function showForm( $target ) {
-   global $wgScript, $wgOut;
-   $title = htmlspecialchars( 
$this->getPageTitle()->getPrefixedText() );
-   $action = htmlspecialchars( $wgScript );
-   $target = htmlspecialchars( $target );
-   $ok = wfMsg( 'go' );
-   $username = wfMsg( 'username' );
-   $inputformtop = wfMsg( 'lookupuser' );
+   global $wgScript;
 
-   $wgOut->addWikiMsg( 'lookupuser-intro' );
+   $title = htmlspecialchars( 
$this->getPageTitle()->getPrefixedText(), ENT_QUOTES );
+   $action = htmlspecialchars( $wgScript, ENT_QUOTES );
+   $target = htmlspecialchars( $target, ENT_QUOTES );
+   $ok = $this->msg( 'go' )->text();
+   $username = $this->msg( 'username' )->text();
+   $inputformtop = $this->msg( 'lookupuser' )->text();
 
-   $wgOut->addHTML( <addWikiMsg( 'lookupuser-intro' );
+
+   $this->getOutput()->addHTML( <<
 $inputformtop
 
@@ -82,20 +81,23 @@
 
/**
 * Retrieves and shows the gathered info to the user
-* @param $target Mixed: user whose info we're looking up
-* @param $emailUser String: e-mail address (like exam...@example.com)
+* @param mixed $target User whose info we're looking up
+* @param string $emailUser E-mail address (like exam...@example.com)
 */
function showInfo( $target, $emailUser = '' ) {
-   global $wgOut, $wgLang, $wgScript;
+   global $wgScript;
+
+   $lang = $this->getLanguage();
+   $out = $this->getOutput();
 
$count = 0;
$users = array();
$userTarget = '';
 
// Look for @ in username
-   if( strpos( $target, '@' ) !== false ) {
+   if ( strpos( $target, '@' ) !== false ) {
// Find username by email
-   $emailUser = htmlspecialchars( $emailUser );
+   $emailUser = htmlspecialchars( $emailUser, ENT_QUOTES );
$dbr = wfGetDB( DB_SLAVE );
 
$res = $dbr->select(
@@ -106,11 +108,11 @@
);
 
$loop = 0;
-   foreach( $res as $row ) {
-   if( $loop === 0 ) {
+

[MediaWiki-commits] [Gerrit] WIP add new boards, add widgets to any board - change (wikimedia...dash)

2015-12-05 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP add new boards, add widgets to any board
..

WIP add new boards, add widgets to any board

Library now adds widgets to the last board displayed (and indicates
which board you're adding to)

Library 'Add' buttons are in the correct state for the current board.

TODO: style add button, confirm stuff works, error handling for dupe
board names.
Also associate this with a Phab task.

Change-Id: I21d892d01c439cb53f8e230c3ebce602227c3425
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
4 files changed, 67 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/79/257079/1

diff --git a/src/components/app-content/app-content.html 
b/src/components/app-content/app-content.html
index 12def48..653c70a 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -25,13 +25,14 @@


Widget Template Library
+   Adding widgets to: 





-   Add to my board
-Added.
+   Add to my board
+Added.



diff --git a/src/components/app-content/app-content.js 
b/src/components/app-content/app-content.js
index bfdae60..7958fdb 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -16,6 +16,15 @@
self.welcome= ko.observable('');
self.widgetTemplates= ko.observableArray();
self.widgetInstances= ko.observableArray();
+   self.currentBoardWidgets= ko.computed( function() {
+   var widgets = [];
+   if ( self.displayedBoard() ) {
+   $.each( self.displayedBoard().widgets, 
function( idx, widget ) {
+   widgets[widget.widgetId] = true;
+   } );
+   }
+   return widgets;
+   } );
 
$.get( '/user/info', function( userInfo ) {
if ( userInfo && !userInfo.error ) {
@@ -40,28 +49,23 @@
contentType: 'application/json; 
charset=UTF-8',
data: JSON.stringify( {
widgetId: event.id,
-   displayName: 'My ' + event.displayName,
-   isShared: false
+   displayName: 'My ' + 
event.displayName,
+   isShared: false
} ),
success: function( data ) {
$.ajax( {
method: 'POST',
-   url: '/board/' + 
self.userdata().defaultBoard + '/widgets',
-   contentType: 'application/json; 
charset=UTF-8',
-   data: JSON.stringify( {
-   instanceId: data.id
-   } ),
-   success: function( stuff ) {
-   //change the look of 
the add widget button
-   $( '#add-widget-' + 
event.id ).hide();
-   $( '#saved-widget-' + 
event.id ).removeClass( 'hide' );
-   //refresh the displayed 
board
-   if ( parseInt( 
self.displayedBoard().id, 10 ) === self.userdata().defaultBoard ) {
-   $.get( 'board/' 
+ self.userdata().defaultBoard, function( moredata ){
+   url: '/board/' + 
self.displayedBoard().id + '/widgets',
+

[MediaWiki-commits] [Gerrit] Fix PHPDoc for getTimeAndDelay() - change (mediawiki/core)

2015-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fix PHPDoc for getTimeAndDelay()
..

Fix PHPDoc for getTimeAndDelay()

Change-Id: I7e5b368d13489afec6df56cdc3e71c2e60e07e20
---
M includes/utils/UIDGenerator.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/257084/1

diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index 6171d58..e2de900 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -429,6 +429,7 @@
 * @param string $lockFile Name of a local lock file
 * @param int $clockSeqSize The number of possible clock sequence values
 * @param int $counterSize The number of possible counter values
+* @param int $offsetSize The number of possible offset values
 * @return array (result of UIDGenerator::millitime(), counter, clock 
sequence)
 * @throws RuntimeException
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e5b368d13489afec6df56cdc3e71c2e60e07e20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Add maint script for forcing a stat cache purge - change (mediawiki...ExtensionDistributor)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add maint script for forcing a stat cache purge
..


Add maint script for forcing a stat cache purge

Change-Id: Iec028a09574b687e63286725ead5128061545ac8
---
M includes/stats/ExtDistGraphiteStats.php
A maintenance/purgeCachedStats.php
2 files changed, 56 insertions(+), 1 deletion(-)

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



diff --git a/includes/stats/ExtDistGraphiteStats.php 
b/includes/stats/ExtDistGraphiteStats.php
index f63d1be..e37418a 100644
--- a/includes/stats/ExtDistGraphiteStats.php
+++ b/includes/stats/ExtDistGraphiteStats.php
@@ -39,7 +39,7 @@
return false;
}
 
-   $cacheKey = wfMemcKey( 'extdist', 'ExtDistGraphiteStats', 
$type, 'PopularList' );
+   $cacheKey = $this->getCacheKey( $type );
$cache = wfGetCache( CACHE_ANYTHING );
 
$cachedValue = $cache->get( $cacheKey );
@@ -91,4 +91,27 @@
return $popularList;
}
 
+   /**
+* @param string $type
+*
+* @return string
+*/
+   private function getCacheKey( $type ) {
+   return wfMemcKey( 'extdist', 'GraphiteStats', $type, 
'PopularList' );
+   }
+
+   public function clearCache() {
+   $cache = wfGetCache( CACHE_ANYTHING );
+   $typesToClear = array(
+   ExtDistProvider::EXTENSIONS,
+   ExtDistProvider::SKINS
+   );
+   foreach ( $typesToClear as $type ) {
+   $success = $cache->delete( $this->getCacheKey( $type ) 
);
+   if ( !$success ) {
+   $this->logger->error( "Failed to clear 
PopularList cache for $type" );
+   }
+   }
+   }
+
 }
diff --git a/maintenance/purgeCachedStats.php b/maintenance/purgeCachedStats.php
new file mode 100644
index 000..8f7f287
--- /dev/null
+++ b/maintenance/purgeCachedStats.php
@@ -0,0 +1,32 @@
+mDescription = "Purge cached ExtensionDistributor stats";
+   }
+
+   public function execute() {
+   $graphiteStats = new ExtDistGraphiteStats();
+   $graphiteStats->setLogger( LoggerFactory::getInstance( 
'ExtensionDistributor' ) );
+   $graphiteStats->clearCache();
+   $this->output( "Done.\n" );
+   }
+
+}
+
+$maintClass = "ExtDistPurgeCachedStats";
+require_once( RUN_MAINTENANCE_IF_MAIN );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec028a09574b687e63286725ead5128061545ac8
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
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] Add UUIDv1 function to UIDGenerator - change (mediawiki/core)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Add UUIDv1 function to UIDGenerator
..


Add UUIDv1 function to UIDGenerator

* Added some more unit tests.

Change-Id: Ieb7e66b1319df2e9c6da1518cc9539f276da1838
---
M includes/utils/UIDGenerator.php
M tests/phpunit/includes/utils/UIDGeneratorTest.php
2 files changed, 172 insertions(+), 20 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index 10e4334..468ab4a 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -37,6 +37,7 @@
 
protected $lockFile88; // string; local file path
protected $lockFile128; // string; local file path
+   protected $lockFileUUID; // string; local file path
 
/** @var array */
protected $fileHandles = array(); // cache file handles
@@ -79,6 +80,7 @@
// This is dealt with by initializing the clock sequence number 
and counters randomly.
$this->lockFile88 = wfTempDir() . '/mw-' . __CLASS__ . 
'-UID-88';
$this->lockFile128 = wfTempDir() . '/mw-' . __CLASS__ . 
'-UID-128';
+   $this->lockFileUUID = wfTempDir() . '/mw-' . __CLASS__ . 
'-UUID-128';
}
 
/**
@@ -114,18 +116,25 @@
Assert::parameter( $base >= 2, '$base', 'must be >= 2' );
 
$gen = self::singleton();
-   $time = $gen->getTimestampAndDelay( 'lockFile88', 1, 1024 );
-
-   return Wikimedia\base_convert( $gen->getTimestampedID88( $time 
), 2, $base );
+   $info = $gen->getTimeAndDelay( 'lockFile88', 1, 1024, 1024 );
+   $info['offsetCounter'] = $info['offsetCounter'] % 1024;
+   return Wikimedia\base_convert( $gen->getTimestampedID88( $info 
), 2, $base );
}
 
/**
-* @param array $info (UIDGenerator::millitime(), counter, clock 
sequence)
+* @param array $info The result of UIDGenerator::getTimeAndDelay() or
+*  a plain (UIDGenerator::millitime(), counter, clock sequence) array.
 * @return string 88 bits
 * @throws RuntimeException
 */
protected function getTimestampedID88( array $info ) {
-   list( $time, $counter ) = $info;
+   if ( isset( $info['time'] ) ) {
+   $time = $info['time'];
+   $counter = $info['offsetCounter'];
+   } else {
+   $time = $info[0];
+   $counter = $info[1];
+   }
// Take the 46 MSBs of "milliseconds since epoch"
$id_bin = $this->millisecondsSinceEpochBinary( $time );
// Add a 10 bit counter resulting in 56 bits total
@@ -160,19 +169,29 @@
Assert::parameter( $base >= 2, '$base', 'must be >= 2' );
 
$gen = self::singleton();
-   $time = $gen->getTimestampAndDelay( 'lockFile128', 16384, 
1048576 );
+   $info = $gen->getTimeAndDelay( 'lockFile128', 16384, 1048576, 
1048576 );
+   $info['offsetCounter'] = $info['offsetCounter'] % 1048576;
 
-   return Wikimedia\base_convert( $gen->getTimestampedID128( $time 
), 2, $base );
+   return Wikimedia\base_convert( $gen->getTimestampedID128( $info 
), 2, $base );
}
 
/**
-* @param array $info (UIDGenerator::millitime(), counter, clock 
sequence)
+* @param array $info The result of UIDGenerator::getTimeAndDelay() or
+*  a plain (UIDGenerator::millitime(), counter, clock sequence) array.
 * @return string 128 bits
 * @throws RuntimeException
 */
protected function getTimestampedID128( array $info ) {
-   list( $time, $counter, $clkSeq ) = $info;
-   // Take the 46 MSBs of "milliseconds since epoch"
+   if ( isset( $info['time'] ) ) {
+   $time = $info['time'];
+   $counter = $info['offsetCounter'];
+   $clkSeq = $info['clkSeq'];
+   } else {
+   $time = $info[0];
+   $counter = $info[1];
+   $clkSeq = $info[2];
+   }
+   // Take the 46 bits of "milliseconds since epoch"
$id_bin = $this->millisecondsSinceEpochBinary( $time );
// Add a 20 bit counter resulting in 66 bits total
$id_bin .= str_pad( decbin( $counter ), 20, '0', STR_PAD_LEFT );
@@ -186,6 +205,74 @@
}
 
return $id_bin;
+   }
+
+   /**
+* Return an RFC4122 compliant v1 UUID
+*
+* @return string
+* @throws RuntimeException
+* @since 1.27
+*/
+   public static function newUUIDv1() {
+

[MediaWiki-commits] [Gerrit] Balance brackets in en.json - change (mediawiki...Echo)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Balance brackets in en.json
..


Balance brackets in en.json

The problem was introduced by I1cd7caa7bfe811bab89a0c6950c1aeaf1739aac6

Change-Id: I81def611127f0f438764f8aea19e7f2d5c47d969
---
M i18n/en.json
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 0fb7cf5..204a0f3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -67,10 +67,10 @@
"notification-add-talkpage-topic2": "[[User:$1|$1]] 
{{GENDER:$1|posted}} a new topic \"$2\" on [[$3]].",
"notification-add-talkpage-topic-yours2": "[[User:$1|$1]] 
{{GENDER:$1|sent}} you a message: \"[[$3#$2|$2]]\".",
"notification-add-comment-yours2": "[[User:$1|$1]] 
{{GENDER:$1|commented}} on \"[[$3#$2|$2]]\" on your talk page.",
-   "notification-mention": "[[User:$1|$1]] {{GENDER:$1|mentioned}} 
{{GENDER:$6|you}}} on the $5 talk page in \"[[:$3#$2|$4]]\".",
-   "notification-header-mention": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}}} on the $3 talk page in \"$4\".",
-   "notification-mention-nosection": "[[User:$1|$1]] 
{{GENDER:$1|mentioned}} {{GENDER:$4|you}}} on the [[:$3|$2 talk page]].",
-   "notification-header-mention-nosection": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}}} on the [[:$4|$3 talk page]].",
+   "notification-mention": "[[User:$1|$1]] {{GENDER:$1|mentioned}} 
{{GENDER:$6|you}} on the $5 talk page in \"[[:$3#$2|$4]]\".",
+   "notification-header-mention": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}} on the $3 talk page in \"$4\".",
+   "notification-mention-nosection": "[[User:$1|$1]] 
{{GENDER:$1|mentioned}} {{GENDER:$4|you}} on the [[:$3|$2 talk page]].",
+   "notification-header-mention-nosection": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}} on the [[:$4|$3 talk page]].",
"notification-user-rights": "Your user rights 
[[Special:Log/rights/$1|were {{GENDER:$1|changed}}]] by [[User:$1|$1]]. $2. 
[[Special:ListGroupRights|Learn more]]",
"notification-header-user-rights": "Your user rights were 
{{GENDER:$2|changed}} by $1. $3.",
"notification-user-rights-add": "You are now a member of 
{{PLURAL:$2|this group|these groups}}: $1",
@@ -90,8 +90,8 @@
"notification-page-linked-email-batch-body": "$2 was 
{{GENDER:$1|linked}} from $3.",
"notification-reverted-email-subject2": "Your {{PLURAL:$3|edit 
was|edits were}} {{GENDER:$1|reverted}} on {{SITENAME}}",
"notification-reverted-email-batch-body2": "Your {{PLURAL:$3|edit on $2 
has been|edits on $2 have been}} {{GENDER:$1|reverted}} by $1.",
-   "notification-mention-email-subject": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$2|you}}} on {{SITENAME}}",
-   "notification-mention-email-batch-body": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$5|you}}} on the $4 talk page in \"$3\".",
+   "notification-mention-email-subject": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$2|you}} on {{SITENAME}}",
+   "notification-mention-email-batch-body": "$1 {{GENDER:$1|mentioned}} 
{{GENDER:$5|you}} on the $4 talk page in \"$3\".",
"notification-mention-nosection-email-batch-body": "$1 
{{GENDER:$1|mentioned}} you on the $2 talk page.",
"notification-user-rights-email-subject": "Your user rights have 
changed on {{SITENAME}}",
"notification-user-rights-email-batch-body": "Your user rights were 
{{GENDER:$1|changed}} by $1. $2.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81def611127f0f438764f8aea19e7f2d5c47d969
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Nemo bis 
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] Fix mobile.toast styles in desktop skins - change (mediawiki...MobileFrontend)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix mobile.toast styles in desktop skins
..


Fix mobile.toast styles in desktop skins

Bug: T120367
Change-Id: I76246eb430b1f9580c7f8dfba91deb5d734ffb68
---
M includes/Resources.php
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index 59905e7..e13546b 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -894,8 +894,8 @@
'scripts' => array(
'resources/mobile.toast/toast.js',
),
-   'styles' => array(
-   'resources/mobile.toast/toast.less',
+   'skinStyles' => array(
+   'minerva' => 'resources/mobile.toast/toast.less',
),
),
 
@@ -1675,5 +1675,3 @@
'resources/mobile.special.history.styles/default.less',
),
 );
-
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76246eb430b1f9580c7f8dfba91deb5d734ffb68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
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] New Wikidata Build - 2015-12-05T10:00:01+0000 - change (mediawiki...Wikidata)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: New Wikidata Build - 2015-12-05T10:00:01+
..


New Wikidata Build - 2015-12-05T10:00:01+

Change-Id: Iab7a5515f80d7f8b1a5e08d126929505826208bb
---
M composer.lock
M extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php
M extensions/ExternalValidation/tests/phpunit/Specials/SpecialCrossCheckTest.php
M 
extensions/ExternalValidation/tests/phpunit/Specials/SpecialExternalDbsTest.php
M extensions/Wikibase/client/includes/Changes/AffectedPagesFinder.php
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/includes/modules/SiteModule.php
M 
extensions/Wikibase/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
M extensions/Wikibase/client/tests/phpunit/includes/api/ApiClientInfoTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/specials/SpecialPagesWithBadgesTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/specials/SpecialUnconnectedPagesTest.php
M extensions/Wikibase/lib/includes/SettingsArray.php
M extensions/Wikibase/lib/includes/changes/DiffChange.php
M extensions/Wikibase/lib/includes/store/EntityStore.php
M extensions/Wikibase/lib/includes/store/StorageException.php
M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilder.php
M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainFactoryTest.php
M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php
D extensions/Wikibase/lib/tests/phpunit/specials/SpecialPageTestBase.php
M 
extensions/Wikibase/lib/tests/phpunit/store/CachingEntityRevisionLookupTest.php
M extensions/Wikibase/purtle/src/N3RdfWriterBase.php
M extensions/Wikibase/purtle/src/NTriplesRdfWriter.php
M extensions/Wikibase/purtle/src/RdfWriter.php
M extensions/Wikibase/purtle/src/TurtleRdfWriter.php
M extensions/Wikibase/purtle/src/XmlRdfWriter.php
M extensions/Wikibase/purtle/tests/phpunit/N3QuoterTest.php
M extensions/Wikibase/repo/includes/BabelUserLanguageLookup.php
M extensions/Wikibase/repo/includes/ChangeDispatcher.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOp.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpAliases.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpDescription.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpException.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpLabel.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpMainSnak.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifier.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReference.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpRemoveStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpSiteLink.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatementRank.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOps.php
R extensions/Wikibase/repo/includes/Interactors/TermIndexSearchInteractor.php
R extensions/Wikibase/repo/includes/Interactors/TermSearchInteractor.php
R extensions/Wikibase/repo/includes/Interactors/TermSearchResult.php
M extensions/Wikibase/repo/includes/ItemDisambiguation.php
M extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/repo/includes/actions/HistoryEntityAction.php
M extensions/Wikibase/repo/includes/api/EntitySearchHelper.php
M extensions/Wikibase/repo/includes/specials/SpecialItemDisambiguation.php
M extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
M extensions/Wikibase/repo/includes/store/sql/EntityPerPageBuilder.php
M extensions/Wikibase/repo/includes/store/sql/TermSearchKeyBuilder.php
M extensions/Wikibase/repo/includes/store/sql/WikiPageEntityRedirectLookup.php
M extensions/Wikibase/repo/maintenance/createBlacklistedItems.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
R

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ff63158..db13a4d - change (mediawiki/extensions)

2015-12-05 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: ff63158..db13a4d
..


Syncronize VisualEditor: ff63158..db13a4d

Change-Id: Idd532d3d5d1853c0ed8a4d2ff33bc16727968c9f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index ff63158..db13a4d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit ff631581a89cc801b62c4e9551773d432bce73ac
+Subproject commit db13a4d43ad2b26b534bbf4de30045168a782f20

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd532d3d5d1853c0ed8a4d2ff33bc16727968c9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ff63158..db13a4d - change (mediawiki/extensions)

2015-12-05 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: ff63158..db13a4d
..

Syncronize VisualEditor: ff63158..db13a4d

Change-Id: Idd532d3d5d1853c0ed8a4d2ff33bc16727968c9f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/64/257164/1

diff --git a/VisualEditor b/VisualEditor
index ff63158..db13a4d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit ff631581a89cc801b62c4e9551773d432bce73ac
+Subproject commit db13a4d43ad2b26b534bbf4de30045168a782f20

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd532d3d5d1853c0ed8a4d2ff33bc16727968c9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] WIP Groupings and stacked bar charts for X-by-Y - change (wikimedia...dash)

2015-12-05 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP Groupings and stacked bar charts for X-by-Y
..

WIP Groupings and stacked bar charts for X-by-Y

...finally have the 'by-Y' part of it for more than just time.
FIXME: don't need second pass, can use multiple 'x' arrays
Also, colors are ugly.
Also, is there a phab thing for this yet?

Change-Id: Ie55423132ad6ac74ff06c2afcc2aa419a768ffac
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
3 files changed, 139 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/78/257078/1

diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 77369a4..2dcbfc6 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -108,16 +108,43 @@
 
};
 
-   self.processData = function( rawdata, timescale, timestamp ){
+   self.processData = function( rawdata, timescale, grouping, 
timestamp ){
 
var timeWord = ( timescale === 'Day' ? 'Dai' : 
timescale ) + 'ly',
-   totals = [ timeWord + ' Total'],
-   counts = [ timeWord + ' Count'],
+   totals,
+   counts,
+   isGrouped = ( grouping && grouping !== '' ),
+   groupValue,
+   groupValues,
+   groupedTotals,
+   groupedCounts,
+   totalGroupNames,
+   countGroupNames,
+   totalName,
+   countName,
+   usedDates = [],
xs = [ 'x' ],
defaultYear = new Date().getFullYear(),
defaultMonth = new Date().getMonth() + 1,
tempDate, timeFormat, now = new Date( timestamp 
);
-   
+
+   if ( isGrouped ) {
+   // distinct values of the group column
+   groupValues = [];
+   // for c3 to stack totals with totals and 
counts with counts
+   totalGroupNames = [];
+   countGroupNames = [];
+   // these two are populated in the first pass 
with e.g.
+   // groupedTotals['US']['2015-12-02 15'] = 123.45
+   groupedTotals = [];
+   groupedCounts = [];
+   // these will be populated in a second pass
+   totals = [];
+   counts = [];
+   } else {
+   totals = [timeWord + ' Total'];
+   counts = [timeWord + ' Count'];
+   }
// coerce UTC into the default timezone.  Comparing 
offset values
// so we only have to adjust 'now', not each data point
now.setHours( now.getHours() + now.getTimezoneOffset() 
/ 60 );
@@ -131,17 +158,58 @@
if ( year < 2004 || new Date( year, month - 1, 
day, hour ) > now ) {
return;
}
-   totals.push( dataPoint.usd_total );
-   counts.push( dataPoint.donations );
-
+   
tempDate = year + '-';
tempDate += zeroPad( month ) + '-';
tempDate += zeroPad( day );
tempDate += ' ' + zeroPad( hour );
 
-   xs.push( tempDate );
+   if ( !usedDates[tempDate] ){
+   xs.push( tempDate );
+   usedDates[tempDate] = true;
+   }
+   if ( isGrouped ) {
+   groupValue = dataPoint[grouping];
+   if ( !totals[groupValue] ) {
+   groupValues.push( groupValue );
+   totalName = groupValue + ' ' + 
timeWord + ' Total';
+   totals[groupValue] = 
[totalName];
+   groupedTotals[groupValue] = [];
+   totalGroupNames.push(

[MediaWiki-commits] [Gerrit] registration: Remove type validation for "config" items - change (mediawiki/core)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: registration: Remove type validation for "config" items
..


registration: Remove type validation for "config" items

The type list was missing "number" for doubles, but since we allow *all*
types of variables, don't even bother checking types.

Bug: T120507
Change-Id: I10626f5764f49d4f96a3cc35a27c890905a71bfe
---
M docs/extension.schema.json
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index dde4fa1..b635467 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -711,7 +711,6 @@
},
"patternProperties": {

"^[a-zA-Z_\u007f-\u00ff][a-zA-Z0-9_\u007f-\u00ff]*$": {
-   "type": ["object", "array", "string", 
"integer", "null", "boolean"],
"properties": {
"_merge_strategy": {
"type": "string",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10626f5764f49d4f96a3cc35a27c890905a71bfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Waldir 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix IDEA error in intervalsSinceGregorianBinary() - change (mediawiki/core)

2015-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fix IDEA error in intervalsSinceGregorianBinary()
..

Fix IDEA error in intervalsSinceGregorianBinary()

Change-Id: Icc90a3050d5d918176dfbb88636a4d9b742fd4b0
---
M includes/utils/UIDGenerator.php
A maintenance/dev/includesÐrequire-php.sh
A maintenance/dev/includesÐrouter.php
3 files changed, 112 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/257081/1

diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index 468ab4a..f286f83 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -551,10 +551,11 @@
 * @throws RuntimeException
 */
protected function intervalsSinceGregorianBinary( array $time, $delta = 
0 ) {
+   /** @var int[] $time */
list( $sec, $msec ) = $time;
$offset = '1221929280';
if ( PHP_INT_SIZE >= 8 ) { // 64 bit integers
-   $ts = ( 1000 * $sec + $msec ) * 1 + $offset + 
$delta;
+   $ts = ( 1000 * $sec + $msec ) * 1 + (int)$offset + 
$delta;
$id_bin = str_pad( decbin( $ts % pow( 2, 60 ) ), 60, 
'0', STR_PAD_LEFT );
} elseif ( extension_loaded( 'gmp' ) ) {
$ts = gmp_add( gmp_mul( (string) $sec, '1000' ), 
(string) $msec ); // ms
diff --git "a/maintenance/dev/includes\303\220require-php.sh" 
"b/maintenance/dev/includes\303\220require-php.sh"
new file mode 100644
index 000..470e6eb
--- /dev/null
+++ "b/maintenance/dev/includes\303\220require-php.sh"
@@ -0,0 +1,8 @@
+# Include-able script to require that we have a known php binary we can execute
+
+. "$DEV/includes/php.sh"
+
+if [ "x$PHP" == "x" -o ! -x "$PHP" ]; then
+   echo "Local copy of PHP is not installed"
+   exit 1
+fi
diff --git "a/maintenance/dev/includes\303\220router.php" 
"b/maintenance/dev/includes\303\220router.php"
new file mode 100644
index 000..97c8954
--- /dev/null
+++ "b/maintenance/dev/includes\303\220router.php"
@@ -0,0 +1,102 @@
+http://www.php.net/manual/en/features.commandline.webserver.php
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+if ( PHP_SAPI != 'cli-server' ) {
+   die( "This script can only be run by php's cli-server sapi." );
+}
+
+ini_set( 'display_errors', 1 );
+error_reporting( E_ALL );
+
+if ( isset( $_SERVER["SCRIPT_FILENAME"] ) ) {
+   # Known resource, sometimes a script sometimes a file
+   $file = $_SERVER["SCRIPT_FILENAME"];
+} elseif ( isset( $_SERVER["SCRIPT_NAME"] ) ) {
+   # Usually unknown, document root relative rather than absolute
+   # Happens with some cases like /wiki/File:Image.png
+   if ( is_readable( $_SERVER['DOCUMENT_ROOT'] . $_SERVER["SCRIPT_NAME"] ) 
) {
+   # Just in case this actually IS a file, set it here
+   $file = $_SERVER['DOCUMENT_ROOT'] . $_SERVER["SCRIPT_NAME"];
+   } else {
+   # Otherwise let's pretend that this is supposed to go to 
index.php
+   $file = $_SERVER['DOCUMENT_ROOT'] . '/index.php';
+   }
+} else {
+   # Meh, we'll just give up
+   return false;
+}
+
+# And now do handling for that $file
+
+if ( !is_readable( $file ) ) {
+   # Let the server throw the error if it doesn't exist
+   return false;
+}
+$ext = pathinfo( $file, PATHINFO_EXTENSION );
+if ( $ext == 'php' || $ext == 'php5' ) {
+   # Execute php files
+   # We use require and return true here because when you return false
+   # the php webserver will discard post data and things like login
+   # will not function in the dev environment.
+   require $file;
+
+   return true;
+}
+$mime = false;
+$lines = explode( "\n", file_get_contents( "includes/mime.types" ) );
+foreach ( $lines as $line ) {
+   $exts = explode( " ", $line );
+   $mime = array_shift( $exts );
+   if ( in_array( $ext, $exts ) ) {
+   break; # this is the right value for $mime
+   }
+   $mime = false;
+}
+if ( !$mime ) {
+   $basename =

[MediaWiki-commits] [Gerrit] Fix IDEA error in intervalsSinceGregorianBinary() - change (mediawiki/core)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix IDEA error in intervalsSinceGregorianBinary()
..


Fix IDEA error in intervalsSinceGregorianBinary()

Change-Id: Icc90a3050d5d918176dfbb88636a4d9b742fd4b0
---
M includes/utils/UIDGenerator.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index 468ab4a..6171d58 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -554,7 +554,7 @@
list( $sec, $msec ) = $time;
$offset = '1221929280';
if ( PHP_INT_SIZE >= 8 ) { // 64 bit integers
-   $ts = ( 1000 * $sec + $msec ) * 1 + $offset + 
$delta;
+   $ts = ( 1000 * $sec + $msec ) * 1 + (int)$offset + 
$delta;
$id_bin = str_pad( decbin( $ts % pow( 2, 60 ) ), 60, 
'0', STR_PAD_LEFT );
} elseif ( extension_loaded( 'gmp' ) ) {
$ts = gmp_add( gmp_mul( (string) $sec, '1000' ), 
(string) $msec ); // ms

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc90a3050d5d918176dfbb88636a4d9b742fd4b0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] SpecialContributions: Fix whitespace in tagfilter - change (mediawiki/core)

2015-12-05 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: SpecialContributions: Fix whitespace in tagfilter
..

SpecialContributions: Fix whitespace in tagfilter

Removing the first element of an array, and using it as a label, doesn't make
much sense, if the array will be imploded using a whitespace to add a whitespace
between both array parts.

Instead of writing:
Tag filter:

this will result in the expected output:
Tag filter: 

Change-Id: Ifc9de7cc6ab380fcff435fcd0410963e72ef6203
---
M includes/specials/SpecialContributions.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/257170/1

diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 5f7c587..9a1eb83 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -481,7 +481,7 @@
$filterSelection = Html::rawElement(
'td',
array(),
-   array_shift( $tagFilter ) . implode( '', 
$tagFilter )
+   implode( '', $tagFilter )
);
} else {
$filterSelection = Html::rawElement( 'td', array( 
'colspan' => 2 ), '' );

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

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

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

[MediaWiki-commits] [Gerrit] Deduplicate input in Special:Contributions - change (mediawiki/core)

2015-12-05 Thread jenkins-bot (Code Review)

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

Change subject: Deduplicate input in Special:Contributions
..


Deduplicate input in Special:Contributions

Bug: T120542
Change-Id: I129bf2cf826439b873c3bf590f784ea24ab6181d
---
M includes/specials/SpecialContributions.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 5f7c587..71d2b23 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -465,7 +465,8 @@
'month',
'topOnly',
'newOnly',
-   'associated'
+   'associated',
+   'tagfilter'
);
 
foreach ( $this->opts as $name => $value ) {

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

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

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

60 matches

Mail list logo