date:20140127

[MediaWiki-commits] [Gerrit] Make abstract Config class truly implementation-agnostic - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Make abstract Config class truly implementation-agnostic
..

Make abstract Config class truly implementation-agnostic

Some corrections to I13baec0b6 ("Config: Add Config and GlobalConfig classes"):

* Remove $prefix args from Config::set and ::get. The idea of having an
  abstract Config class is to abstract some notion of configuration data from
  the particular way in which it is currently implemented (global variables).
  So the abstract base class has no business dealing with variable name
  prefixes.
* Rename GlobalConfig to GlobalVarConfig, which makes it clearer that it isn't
  referring to the scope of the configuration value, but to the scope of the
  variable name which provides it.
* Removed Config::factory. One of the things we discussed at the summit was the
  possibility of different extensions providing configuration data by different
  means on a single MediaWiki instance, so the notion of a single, canonical
  $wgConfigClass doesn't make sense.
* The fact that the unit test didn't care to check the Status object returned
  by the setter is a good indication that the design needs to be rethought.
  What's wrong with true / false? Do we really suppose that Config::set callers
  need to have rich information about why attempting to set a configuration
  variable failed?

Change-Id: I5a5857fcfa07598ba4ce9ae5bbb4ce54a567d31e
---
M includes/AutoLoader.php
M includes/config/Config.php
R includes/config/GlobalVarConfig.php
M tests/phpunit/includes/config/GlobalConfigTest.php
4 files changed, 14 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/109850/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 00191c3..f8597a7 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -407,7 +407,7 @@
 
# includes/config
'Config' => 'includes/config/Config.php',
-   'GlobalConfig' => 'includes/config/GlobalConfig.php',
+   'GlobalVarConfig' => 'includes/config/GlobalVarConfig.php',
 
# includes/content
'AbstractContent' => 'includes/content/AbstractContent.php',
diff --git a/includes/config/Config.php b/includes/config/Config.php
index 067b1e4..b11381e 100644
--- a/includes/config/Config.php
+++ b/includes/config/Config.php
@@ -29,31 +29,13 @@
 abstract class Config {
 
/**
-* @param string $name configuration variable name without prefix
-* @param string $prefix of the variable name
-* @return mixed
+* @param string $name Name of configuration option
 */
-   abstract public function get( $name, $prefix = 'wg' );
+   abstract public function get( $name );
 
/**
-* @param string $name configuration variable name without prefix
-* @param mixed $value to set
-* @param string $prefix of the variable name
-* @return Status object indicating success or failure
+* @param string $name Name of configuration option
+* @param mixed $value Value to set
 */
-   abstract public function set( $name, $value, $prefix = 'wg' );
-
-   /**
-* @param string|null $type class name for Config object,
-*uses $wgConfigClass if not provided
-* @return Config
-*/
-   public static function factory( $type = null ) {
-   if ( !$type ) {
-   global $wgConfigClass;
-   $type = $wgConfigClass;
-   }
-
-   return new $type;
-   }
+   abstract public function set( $name, $value );
 }
diff --git a/includes/config/GlobalConfig.php 
b/includes/config/GlobalVarConfig.php
similarity index 88%
rename from includes/config/GlobalConfig.php
rename to includes/config/GlobalVarConfig.php
index 1b1cd89..725f820 100644
--- a/includes/config/GlobalConfig.php
+++ b/includes/config/GlobalVarConfig.php
@@ -25,20 +25,20 @@
  *
  * @since 1.23
  */
-class GlobalConfig extends Config {
+class GlobalVarConfig extends Config {
 
/**
 * @see Config::get
 */
public function get( $name, $prefix = 'wg' ) {
-   return $GLOBALS[$prefix . $name];
+   return $GLOBALS[ $prefix . $name ];
}
 
/**
 * @see Config::set
 */
public function set( $name, $value, $prefix = 'wg' ) {
-   $GLOBALS[$prefix . $name] = $value;
-   return Status::newGood();
+   $GLOBALS[ $prefix . $name ] = $value;
+   return true;
}
 }
diff --git a/tests/phpunit/includes/config/GlobalConfigTest.php 
b/tests/phpunit/includes/config/GlobalConfigTest.php
index b605a46..859089c 100644
--- a/tests/phpunit/includes/config/GlobalConfigTest.php
+++ b/tests/phpunit/includes/config/GlobalConfigTest.php
@@ -1,13

[MediaWiki-commits] [Gerrit] emery: remove one udp2log logger. - change (operations/puppet)

2014-01-27 Thread Matanya (Code Review)

Matanya has uploaded a new change for review.

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

Change subject: emery: remove one udp2log logger.
..

emery: remove one udp2log logger.

RT #6143 says:
Not using them for anything now, no. If the existing logs can be easily
preserved, I would prefer to have access to them for retrospective
analysis. But if it's any degree of hassle, dump 'em.

Thanks for checking,
Jonathan

Change-Id: I50fd18aa805034e18eb38e2657eeecf042a9e575
---
M templates/udp2log/filters.emery.erb
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/109849/1

diff --git a/templates/udp2log/filters.emery.erb 
b/templates/udp2log/filters.emery.erb
index 8673cf5..e219834 100644
--- a/templates/udp2log/filters.emery.erb
+++ b/templates/udp2log/filters.emery.erb
@@ -15,9 +15,6 @@
 ### GLAM NARA / National Archives - RT 2212
 pipe 10 /usr/bin/udp-filter -F '\t' -p _NARA_ -g -b country >> <%= 
log_directory %>/glam_nara.tsv.log
 
-### Teahouse filters
-pipe 10 /usr/bin/udp-filter -F '\t' -d en.wikipedia.org -p 
/wiki/Wikipedia:Teahouse >> <%= log_directory %>/teahouse.tsv.log
-
 ### Arabic Wikipedia Banner Pages - Siko Bouterse , 
Haitham Shammaa 
 pipe 10 /usr/bin/udp-filter -F '\t' -d ar.wikipedia.org -p 
'/wiki/%D9%88%D9%8A%D9%83%D9%8A%D8%A8%D9%8A%D8%AF%D9%8A%D8%A7:%D8%A8%D9%88%D8%A7%D8%A8%D8%A9_%D8%A7%D9%84%D9%85%D8%B4%D8%A7%D8%B1%D9%83%D8%A9'
 >> <%= log_directory %>/arabic-banner.tsv.log
 

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

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

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

[MediaWiki-commits] [Gerrit] Add VisualEditor timing data reporter - change (operations/puppet)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Add VisualEditor timing data reporter
..

Add VisualEditor timing data reporter

This is a copy-paste job, based on navtiming.py. This sort of barefaced code
duplication is something I try to avoid, so I tried extending EventLogging's
plugin architecture to cover the use-case of simple metric reporting modules in
Id8596535c. But I'm not convinced I got the design right, so I am reluctant to
merge that change. So instead, this.

Change-Id: I5838ff77458eff4080e5bcff526ead410b6795d5
---
M manifests/role/webperf.pp
A modules/webperf/files/ve.py
A modules/webperf/manifests/ve.pp
A modules/webperf/templates/ve.conf.erb
4 files changed, 108 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/webperf.pp b/manifests/role/webperf.pp
index 38543f4..607f296 100644
--- a/manifests/role/webperf.pp
+++ b/manifests/role/webperf.pp
@@ -14,6 +14,13 @@
 statsd_host => $statsd_host,
 }
 
+# Report VisualEditor performance measurements to Graphite.
+# See 
+class { '::webperf::ve':
+endpoint=> 'tcp://vanadium.eqiad.wmnet:8600',
+statsd_host => $statsd_host,
+}
+
 # Provisions a service which gather stats about static assets count
 # and size using a headless browser instance. Stats are forwarded to
 # Ganglia using gmetric.
diff --git a/modules/webperf/files/ve.py b/modules/webperf/files/ve.py
new file mode 100644
index 000..66fefeb
--- /dev/null
+++ b/modules/webperf/files/ve.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+import sys
+reload(sys)
+sys.setdefaultencoding("utf-8")
+
+import argparse
+import logging
+import socket
+
+import zmq
+
+
+ap = argparse.ArgumentParser(description='PerfData StatsD module')
+ap.add_argument('endpoint', help='URI of EventLogging endpoint')
+ap.add_argument('--statsd-host', default='localhost',
+type=socket.gethostbyname)
+ap.add_argument('--statsd-port', default=8125, type=int)
+args = ap.parse_args()
+
+ctx = zmq.Context()
+zsock = ctx.socket(zmq.SUB)
+zsock.hwm = 3000
+zsock.linger = 0
+zsock.connect(args.endpoint)
+zsock.subscribe = b''
+
+addr = args.statsd_host, args.statsd_port
+sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
+for meta in iter(zsock.recv_json, ''):
+if meta['revision'] == 7254808:
+for point in meta['event']['points'].split(','):
+stat = point.replace('=', ':') + '|ms'
+sock.sendto(stat.encode('utf-8'), addr)
diff --git a/modules/webperf/manifests/ve.pp b/modules/webperf/manifests/ve.pp
new file mode 100644
index 000..2d5f555
--- /dev/null
+++ b/modules/webperf/manifests/ve.pp
@@ -0,0 +1,41 @@
+# == Class: webperf::ve
+#
+# Captures VisualEditor timing data and sends it to StatsD.
+#
+# === Parameters
+#
+# [*endpoint*]
+#   URI of EventLogging event publisher to subscribe to.
+#   Example: 'tcp://eventlogging.corp.org:8600'.
+#
+# [*statsd_host*]
+#   Write stats to this StatsD instance. Default: '127.0.0.1'.
+#
+# [*statsd_port*]
+#   Write stats to this StatsD instance. Default: 8125.
+#
+class webperf::ve(
+$endpoint,
+$statsd_host = '127.0.0.1',
+$statsd_port = 8125,
+) {
+include ::webperf
+
+file { '/srv/webperf/ve.py':
+source => 'puppet:///modules/webperf/ve.py',
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0755',
+notify => Service['ve'],
+}
+
+file { '/etc/init/ve.conf':
+content => template('webperf/ve.conf.erb'),
+notify  => Service['ve'],
+}
+
+service { 've':
+ensure   => running,
+provider => upstart,
+}
+}
diff --git a/modules/webperf/templates/ve.conf.erb 
b/modules/webperf/templates/ve.conf.erb
new file mode 100644
index 000..3c204ed
--- /dev/null
+++ b/modules/webperf/templates/ve.conf.erb
@@ -0,0 +1,24 @@
+# navtiming
+#
+# This is an Upstart job configuration file for a Graphite metric module for
+# NavigationTiming events. For more information, see:
+# https://meta.wikimedia.org/wiki/Schema:NavigationTiming
+# http://www.mediawiki.org/wiki/Extension:NavigationTiming
+#
+# This file is managed by Puppet.
+#
+description "VisualEditor Graphite module"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+
+setuid webperf
+setgid webperf
+
+respawn
+respawn limit 15 5
+
+chdir /srv/webperf
+exec /usr/bin/python /srv/webperf/ve.py \
+<%= @endpoint %> \
+--statsd-host <%= @statsd_host %> \
+--statsd-port <%= @statsd_port %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5838ff7

[MediaWiki-commits] [Gerrit] MediaWiki API for fetching machine translations - change (mediawiki...ContentTranslation)

2014-01-27 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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

Change subject: MediaWiki API for fetching machine translations
..

MediaWiki API for fetching machine translations

Change-Id: I8f920cddf6f454f69b2e3e6247fb4c18219d3e19
---
A api/ApiContentTranslationGetMt.php
1 file changed, 61 insertions(+), 0 deletions(-)


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

diff --git a/api/ApiContentTranslationGetMt.php 
b/api/ApiContentTranslationGetMt.php
new file mode 100644
index 000..64620bd
--- /dev/null
+++ b/api/ApiContentTranslationGetMt.php
@@ -0,0 +1,61 @@
+extractRequestParams();
+   $sourceLang = $params['sourceLang'];
+   $targetLang = $params['targetLang'];
+   $sourceText = $params['sourceText'];
+
+   $targetText = $this->getMt( $sourceLang, $targetLang, 
$sourceText );
+   $result = array(
+   'result' => 'success',
+   'targetText' => $targetText,
+   );
+   $this->getResult()->addValue( null, $this->getModuleName(), 
$result );
+   }
+
+   protected function getMt( $sourceLang, $targetLang, $text ) {
+   global $wgContentTranslationServerURL, 
$wgContentTranslationServerTimeout;
+   $req = MWHttpRequest::factory( wfAppendQuery(
+   $wgContentTranslationServerURL,
+   array(
+   'sourceLang' => $sourceLang,
+   'targetLang' => $targetLang,
+   'text' => $text,
+   )
+   ),
+   array(
+   method => 'GET',
+   timeout => $wgContentTranslationServerTimeout,
+   )
+   );
+   $status = $req->execute();
+   if ( $status->isOK() ) {
+   $content = $req->getContent();
+   } elseif ( $status->isGood() ) {
+   $this->dieUsage(
+   $req->getContent(),
+   'contenttranslationserver-http-' .  
$req->getStatus()
+   );
+   } elseif ( $errors = $status->getErrorsByType( 'error' ) ) {
+   $error = $errors[0];
+   $code = $error['message'];
+   if ( count( $error['params'] ) ) {
+   $message = $error['params'][0];
+   } else {
+   $message = 'MWHttpRequest error';
+   }
+   $this->dieUsage( $message, 'contenttranslationserver-' 
. $code );
+   }
+   return $content;
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f920cddf6f454f69b2e3e6247fb4c18219d3e19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Divec 

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

[MediaWiki-commits] [Gerrit] skin: Remove the id "anonlogin" and merge pt-anonlogin with ... - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: skin: Remove the id "anonlogin" and merge pt-anonlogin with 
pt-login
..


skin: Remove the id "anonlogin" and merge pt-anonlogin with pt-login

This was used as an alternative id for the login link in the
personal tools at the top right for ShowIPinHeader context.

This seems to have been inherited since the days of the
PHPTal-based skins (at least git-blame shows their presence back
in Brion's rewrite of the skin in november 2004).

I've asked several maintainers about this and nobody could figure
out why it would need a different id. After all, whenever the
user sees the login link it means they are using the wiki as an
anonymous user.

My best guess is that this was meant to allow the ability to
style the login differently when the (anonymous) user has
already made an edit (or if we init a session for other reasons).

This is also what toggles the anon userlinks are shown (i.e. the
links to the IP userpage and talkpage), but I see no evidence of
this, and in any case it would be better to change the class of
the whole personal tools div instead of changing the IDs.

Change-Id: Ib3445934853db5361c3c6fecfe75623b0b921400
---
M includes/SkinTemplate.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/dictionary/mediawiki.dic
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
M skins/CologneBlue.php
7 files changed, 5 insertions(+), 18 deletions(-)

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



diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 18e36ba..35183ce 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -722,7 +722,6 @@
: 'login';
$is_signup = $request->getText( 'type' ) == 'signup';
 
-   $login_id = $this->showIPinHeader() ? 'anonlogin' : 
'login';
$login_url = array(
'text' => $this->msg( $loginlink )->text(),
'href' => self::makeSpecialUrl( 'Userlogin', 
$returnto ),
@@ -756,7 +755,7 @@
$personal_urls['createaccount'] = 
$createaccount_url;
}
 
-   $personal_urls[$login_id] = $login_url;
+   $personal_urls['login'] = $login_url;
}
 
wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title, 
$this ) );
diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 9e68ef2..1c4f760 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3659,7 +3659,6 @@
 'accesskey-pt-watchlist'=> 'l', # do not translate or 
duplicate this message to other languages
 'accesskey-pt-mycontris'=> 'y', # do not translate or 
duplicate this message to other languages
 'accesskey-pt-login'=> 'o', # do not translate or 
duplicate this message to other languages
-'accesskey-pt-anonlogin'=> 'o', # do not translate or 
duplicate this message to other languages
 'accesskey-pt-logout'   => '', # do not translate or duplicate 
this message to other languages
 'accesskey-ca-talk' => 't', # do not translate or 
duplicate this message to other languages
 'accesskey-ca-edit' => 'e', # do not translate or 
duplicate this message to other languages
@@ -3729,7 +3728,6 @@
 'tooltip-pt-watchlist'=> 'A list of pages you are monitoring 
for changes',
 'tooltip-pt-mycontris'=> 'A list of your contributions',
 'tooltip-pt-login'=> 'You are encouraged to log in; 
however, it is not mandatory',
-'tooltip-pt-anonlogin'=> 'You are encouraged to log in; 
however, it is not mandatory',
 'tooltip-pt-logout'   => 'Log out',
 'tooltip-ca-talk' => 'Discussion about the content page',
 'tooltip-ca-edit' => 'You can edit this page. Please use 
the preview button before saving',
diff --git a/languages/messages/MessagesQqq.php 
b/languages/messages/MessagesQqq.php
index 361bd8d..d70de05 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1294,8 +1294,8 @@
 
 See also:
 * {{msg-mw|Login}}
-* {{msg-mw|Accesskey-pt-anonlogin}}
-* {{msg-mw|Tooltip-pt-anonlogin}}
+* {{msg-mw|Accesskey-pt-login}}
+* {{msg-mw|Tooltip-pt-login}}
 {{Identical|Log in}}",
 'nav-login-createaccount' => "Shown to anonymous users in the upper right 
corner of the page. When you can't create an account, the message 
{{msg-mw|login}} is shown.
 {{Identical|Log in / create account}}",
@@ -7528,12 +7528,6 @@
 * {{msg

[MediaWiki-commits] [Gerrit] Config: Add Config and GlobalConfig classes - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Config: Add Config and GlobalConfig classes
..


Config: Add Config and GlobalConfig classes

Allows configuration options to be fetched from context.

Only one implementation, GlobalConfig, is provided, which
simply returns $GLOBALS[$name]. There can be more classes
in the future, possibly a database-based one. For convinience
the "wg" prefix is automatically added.

Ironically, this adds the $wgConfigClass global variable
which is used to determine which implementation of Config
to use by default.

The ContextSource getConfig and setConfig methods were introduced
in I23194d1ba (1.23), but have no uses in Gerrit, so they can safely
be re-purposed.

Change-Id: I13baec0b6d4ea7badf20b9c5f9b40846348838e4
---
M includes/AutoLoader.php
M includes/DefaultSettings.php
A includes/config/Config.php
A includes/config/GlobalConfig.php
M includes/context/ContextSource.php
M includes/context/DerivativeContext.php
M includes/context/IContextSource.php
M includes/context/RequestContext.php
A tests/phpunit/includes/config/GlobalConfigTest.php
9 files changed, 164 insertions(+), 13 deletions(-)

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



diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 91fa55f..d4b2aa5 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -405,6 +405,10 @@
'RedisConnectionPool' => 'includes/clientpool/RedisConnectionPool.php',
'RedisConnRef' => 'includes/clientpool/RedisConnectionPool.php',
 
+   # includes/config
+   'Config' => 'includes/config/Config.php',
+   'GlobalConfig' => 'includes/config/GlobalConfig.php',
+
# includes/content
'AbstractContent' => 'includes/content/AbstractContent.php',
'ContentHandler' => 'includes/content/ContentHandler.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 11b4ef6..96cfdfe 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -60,6 +60,13 @@
 $wgConf = new SiteConfiguration;
 
 /**
+ * Class name to use for accessing Config.
+ * Currently only 'GlobalConfig' is available
+ * @since 1.23
+ */
+$wgConfigClass = 'GlobalConfig';
+
+/**
  * MediaWiki version number
  * @since 1.2
  */
diff --git a/includes/config/Config.php b/includes/config/Config.php
new file mode 100644
index 000..067b1e4
--- /dev/null
+++ b/includes/config/Config.php
@@ -0,0 +1,59 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Abstract class for get settings for
+ *
+ * @since 1.23
+ */
+
+abstract class Config {
+
+   /**
+* @param string $name configuration variable name without prefix
+* @param string $prefix of the variable name
+* @return mixed
+*/
+   abstract public function get( $name, $prefix = 'wg' );
+
+   /**
+* @param string $name configuration variable name without prefix
+* @param mixed $value to set
+* @param string $prefix of the variable name
+* @return Status object indicating success or failure
+*/
+   abstract public function set( $name, $value, $prefix = 'wg' );
+
+   /**
+* @param string|null $type class name for Config object,
+*uses $wgConfigClass if not provided
+* @return Config
+*/
+   public static function factory( $type = null ) {
+   if ( !$type ) {
+   global $wgConfigClass;
+   $type = $wgConfigClass;
+   }
+
+   return new $type;
+   }
+}
diff --git a/includes/config/GlobalConfig.php b/includes/config/GlobalConfig.php
new file mode 100644
index 000..1b1cd89
--- /dev/null
+++ b/includes/config/GlobalConfig.php
@@ -0,0 +1,44 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Accesses configuration settings from $GLOBALS
+ *
+ * @since 1.23
+ */
+class GlobalConfig extends Config {
+
+   /**
+* @see Config::get
+*/
+   public function get( $name, $prefix = 'wg' ) {
+   return $GLOBALS[$prefix . $name];
+   }
+
+   /**
+* @see Config::set
+*/
+   public function set( $name, $value, $prefix = 'wg' ) {
+   $GLOBALS[$prefix . $name] = $value;
+   return Status::newGood();
+   }
+}
diff --git a/includes/context/ContextSource.php 
b/includes/context/ContextSource.php
index 186b8e6..9bc416d 100644
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -60,10 +60,10 @@
}
 
/**
-* Get the SiteConfiguration object
+* Get the Config object
 *
 * @since 1.23
-* @return SiteConfiguration
+* @return Config
 */
public function getConfig() {
return $this->getContext()->getConfig();
diff --git

[MediaWiki-commits] [Gerrit] Support structured logging. - change (mediawiki...parsoid)

2014-01-27 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Support structured logging.
..

Support structured logging.

Parameters to log method can be objects; add fields of objects are passed
to log method as structured data fields.  A plain string `s` is handled as
`{ msg: s }` and an Error instance `e` is treated as if it were the object
`{ msg: e.toString(), stack: e.stack }`.  A function parameter is evaluated.

Move some code around to show the interface to the customizable log method
more clearly.

Bug: 49762
Change-Id: I0bbda2bdc476aacdbb8afaa1d29332cf962d25d3
---
M lib/mediawiki.parser.environment.js
1 file changed, 63 insertions(+), 36 deletions(-)


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

diff --git a/lib/mediawiki.parser.environment.js 
b/lib/mediawiki.parser.environment.js
index adf7f92..e732289 100644
--- a/lib/mediawiki.parser.environment.js
+++ b/lib/mediawiki.parser.environment.js
@@ -550,67 +550,94 @@
 
 MWParserEnvironment.prototype.log = function (logType) {
// XXX this should be configurable, so we can log to syslog, etc.
-   var log = function(msg) { console.warn(msg); };
+   var log = function(logType, loc, data) {
+   var msg = '';
+   if (loc) {
+   msg += logType + ' in ' + loc.iwp + ':' + loc.name;
+   if (loc.revid) {
+   msg += ' with oldid ' + loc.revid;
+   }
+   msg += '\n';
+   }
+   msg += data.msg;
+   if (data.longMsg) { msg += '\n' + data.longMsg; }
+   if (data.stack) { msg += '\n' + data.stack; }
+   if (/^(error|fatal)(\/|$)/.test(logType)) {
+   console.error('ERROR:', msg);
+   } else if (/^(warning)(\/|$)/.test(logType)) {
+   console.warn(msg);
+   } else {
+   console.log(msg);
+   }
+   };
// XXX this should be configurable.
var includeStackTrace = /^(error|fatal)(\/|$)/.test(logType) ||
/(^|\/)stacktrace(\/|$)/.test(logType);
// XXX this should be configurable.
var shouldAnnounceLocation = /^(error|warning)(\/|$)/.test(logType);
 
-   // returns an object with two fields, "msg" (for the message, if any)
-   // and "stack" (for the stack trace, if any)
+   // returns an object with three fields, "msg" (for the message, if any),
+   // "stack" (for the stack trace, if any), and "data" (an object with
+   // custom log data fields, if any)
var flatten = function(o, topLevel) {
-   var f, msg, stack;
+   var f, msg, longMsg;
if ( Array.isArray(o) && topLevel ) {
// flatten components, but no longer in a top-level 
context.
f = o.map(function(oo) { return flatten(oo); });
-   // join all the messages with spaces between them.
-   msg = f.map(function(oo) { return oo.msg; }).join(' ');
-   // use the stack of the first item in the array with a 
stack
-   stack = f.reduce(function(prev, oo) {
-   return prev || oo.stack;
-   }, undefined);
-   return { msg: msg, stack: stack };
+   // join all the messages with spaces or newlines 
between them.
+   var tobool = function(x) { return !!x; };
+   msg = f.map(function(oo) { return oo.msg; 
}).filter(tobool).
+   join(' ');
+   longMsg = f.map(function(oo) { return oo.longMsg; 
}).filter(tobool).
+   join('\n');
+   // merge all custom fields
+   f = f.reduce(function(prev, oo) {
+   return Object.assign(prev, oo);
+   }, {});
+   return Object.assign(f, {
+   msg: msg,
+   longMsg: longMsg
+   });
} else if (o instanceof Error) {
-   return { msg: o.toString(), stack: o.stack };
+   f = { msg: o.toString(), stack: o.stack };
+   if (o.hasOwnProperty('data')) {
+   // pull custom fields out of Error.data
+   f = Object.assign(f, o.data);
+   }
+   return f;
} else if (typeof(o)==='function') {
f = flatten(o());
-   return { msg: f.msg, stack: o.stack || f.stack };
+   if (o.hasOwnPrope

[MediaWiki-commits] [Gerrit] Remove useless/unused "use" statements - change (mediawiki...Flow)

2014-01-27 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Remove useless/unused "use" statements
..

Remove useless/unused "use" statements

Change-Id: I858893d2f91346c15060eac85af713c2f89d8234
---
M FlowActions.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/FlowActions.php b/FlowActions.php
index ffd890b..dd18eda 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -5,10 +5,8 @@
 use Flow\Model\UUID;
 use Flow\RevisionActionPermissions;
 use Flow\Log\Logger;
-use Flow\Block\Block;
 use Flow\Templating;
 use Flow\Container;
-use \Message;
 
 /**
  * Flow actions: key => value map with key being the action name.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I858893d2f91346c15060eac85af713c2f89d8234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] WIP: Add Wikipedia Zero detection and GUI features. - change (apps...wikipedia)

2014-01-27 Thread Dr0ptp4kt (Code Review)

Dr0ptp4kt has uploaded a new change for review.

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

Change subject: WIP: Add Wikipedia Zero detection and GUI features.
..

WIP: Add Wikipedia Zero detection and GUI features.

* If on Wikipedia Zero participating carrier, toast and update chrome.
* When W0 status off, toast and update chrome.
* Update search bar as appropriate.
* Intercept offsite links, but offer setting to opt out of feature.
* This version uses uniform English ON / OFF verbiage.
* Future: Align on i18n approach.
* Future: iterate on how to show carrier baner TEXT from i18n system.

Change-Id: Ibf19061e7a265a12aaeeea6ebe2cfcf41259eed1
---
M wikipedia/res/layout/fragment_search.xml
M wikipedia/res/values/preference_keys.xml
M wikipedia/res/values/strings.xml
M wikipedia/res/xml/preferences.xml
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
A wikipedia/src/main/java/org/wikipedia/events/StartScreenLoadedEvent.java
A 
wikipedia/src/main/java/org/wikipedia/events/WikipediaZeroInterstitialEvent.java
A 
wikipedia/src/main/java/org/wikipedia/events/WikipediaZeroStateChangeEvent.java
M wikipedia/src/main/java/org/wikipedia/networking/ConnectionChangeReceiver.java
M wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
M wikipedia/src/main/java/org/wikipedia/zero/WikipediaZeroTask.java
13 files changed, 304 insertions(+), 46 deletions(-)


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

diff --git a/wikipedia/res/layout/fragment_search.xml 
b/wikipedia/res/layout/fragment_search.xml
index a9562d7..7b3b102 100644
--- a/wikipedia/res/layout/fragment_search.xml
+++ b/wikipedia/res/layout/fragment_search.xml
@@ -1,12 +1,14 @@
 
 
 http://schemas.android.com/apk/res/android";
+  android:id="@+id/search_bar_container"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="48dp"
   android:background="@android:color/background_light"
 >
 
 
 
 
 content_language
+zero_warn_when_leaving
 
\ No newline at end of file
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 51329b1..0a940ee 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -58,7 +58,18 @@
 
 Repeat words from above
 Enter captcha
+General
 
 Wikipedia Zero On (No Data 
Charges)
 Wikipedia Zero OFF (STANDARD DATA 
CHARGES MAY APPLY)
+Search Wikipedia Zero
+Warn if leaving Wikipedia 
Zero
+Wikipedia Zero FAQ 
(wikimediafoundation.org)
+https://wikimediafoundation.org/wiki/Wikipedia_Zero_App_FAQ
+Wikipedia Zero
+Leaving Wikipedia Zero
+Continue to external site? 
Standard data charges may apply.
+Continue
+Cancel
+Settings
 
\ No newline at end of file
diff --git a/wikipedia/res/xml/preferences.xml 
b/wikipedia/res/xml/preferences.xml
index 58a14df..116c462 100644
--- a/wikipedia/res/xml/preferences.xml
+++ b/wikipedia/res/xml/preferences.xml
@@ -1,8 +1,22 @@
 
 
 http://schemas.android.com/apk/res/android";>
-
+
+
+
+
+
+
+
+
+
 
\ No newline at end of file
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java 
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 6c7b4a1..c5764c9 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -2,7 +2,9 @@
 
 import android.app.Application;
 import android.content.Context;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.webkit.WebView;
@@ -18,6 +20,7 @@
 import org.wikipedia.data.DBOpenHelper;
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.history.HistoryEntryPersister;
+import org.wikipedia.networking.ConnectionChangeReceiver;
 import org.wikipedia.pageimages.PageImage;
 import org.wikipedia.pageimages.PageImagePersister;
 import org.wikipedia.savedpages.SavedPage;
@@ -44,10 +47,13 @@
 public static long MEDIUM_ANIMATION_DURATION;
 
 public static String PREFERENCE_CONTENT_LANGUAGE;
+public static String PREFERENCE_ZERO_INTERSTITIAL;
 
 public static float SCREEN_DENSITY;
 // Reload in onCreate to override
 public static String PROTOCOL = "https";
+
+private ConnectionChangeReceiver connChangeReceiver;
 
 @Override
 public void onCreate() {
@@ -61,6 +67,7 @@
 SCREEN_DENSITY = getResources().getDisplayMetrics().density;
 
 PREFERENCE_CONTENT_LANGUAGE = 
getResources().

[MediaWiki-commits] [Gerrit] Add last_active_date column to the orgs table - change (mediawiki...EducationProgram)

2014-01-27 Thread AndyRussG (Code Review)

AndyRussG has uploaded a new change for review.

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

Change subject: Add last_active_date column to the orgs table
..

Add last_active_date column to the orgs table

Change-Id: I2154eff85aec1ede78f2e65b739c65fc0dad215f
---
M EducationProgram.hooks.php
M includes/tables/Orgs.php
A sql/AddOrgLastActiveDate.sql
M sql/EducationProgram.sql
M tests/phpunit/rows/OrgTest.php
5 files changed, 18 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/43/109843/1

diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index 2560679..20116e6 100644
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -59,6 +59,13 @@
'ep_upc_user_courseid_role',
__DIR__ . '/sql/rename_upc_index.sql'
);
+
+   $updater->addExtensionField(
+   'ep_orgs',
+   'org_last_active_date',
+   __DIR__ . '/sql/AddOrgLastActiveDate.sql'
+   );
+
return true;
}
 
diff --git a/includes/tables/Orgs.php b/includes/tables/Orgs.php
index 46e92f7..46d6786 100644
--- a/includes/tables/Orgs.php
+++ b/includes/tables/Orgs.php
@@ -61,6 +61,7 @@
'ca_count' => 'int',
'oa_count' => 'int',
'courses' => 'array',
+   'last_active_date' => 'str', // TS_MW
 
'touched' => 'str', // TS_MW
);
@@ -84,6 +85,7 @@
'ca_count' => 0,
'oa_count' => 0,
'courses' => array(),
+   'last_active_date' => '0',
);
}
 
diff --git a/sql/AddOrgLastActiveDate.sql b/sql/AddOrgLastActiveDate.sql
new file mode 100644
index 000..6e96d64
--- /dev/null
+++ b/sql/AddOrgLastActiveDate.sql
@@ -0,0 +1,6 @@
+-- Patch for theep_orgs table.
+-- Licence: GNU GPL v2+
+-- Author: Andrew Green < agr...@wikimedia.org >
+
+ALTER TABLE /*_*/ep_orgs
+   ADD COLUMN org_last_active_date varbinary(14) NOT NULL; -- Projected 
end date of last course
\ No newline at end of file
diff --git a/sql/EducationProgram.sql b/sql/EducationProgram.sql
index 073ca00..d800821 100644
--- a/sql/EducationProgram.sql
+++ b/sql/EducationProgram.sql
@@ -11,13 +11,14 @@
   org_countryVARCHAR(255)NOT NULL, -- Name of the 
country where the org is located
 
   -- Summary fields - cahing data or computations on data stored elswhere
-  org_active TINYINT unsignedNOT NULL, -- If the org has 
any active courses
+  org_active TINYINT unsignedNOT NULL, -- Deprecated - if 
the org has any active courses
   org_course_count   SMALLINT unsigned   NOT NULL, -- Amount of courses
   org_instructor_count   SMALLINT unsigned   NOT NULL, -- Amount of 
instructors
   org_oa_count   INT unsignedNOT NULL, -- Amount of online 
ambassadors
   org_ca_count   INT unsignedNOT NULL, -- Amount of campus 
ambassadors
   org_student_count  INT unsignedNOT NULL, -- Amount of 
students
   org_coursesBLOBNOT NULL, -- The ids of the 
courses (linking ep_courses.course_id)
+  org_last_active_date   varbinary(14)   NOT NULL, -- Projected end 
date of last course
 
   org_touchedvarbinary(14)   NOT NULL -- Time of the last 
modification
 ) /*$wgDBTableOptions*/;
diff --git a/tests/phpunit/rows/OrgTest.php b/tests/phpunit/rows/OrgTest.php
index 873c327..b576c61 100644
--- a/tests/phpunit/rows/OrgTest.php
+++ b/tests/phpunit/rows/OrgTest.php
@@ -62,6 +62,7 @@
'ca_count' => 0,
'oa_count' => 0,
'courses' => array(),
+   'last_active_date' => '20140127070312',
),
false
) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2154eff85aec1ede78f2e65b739c65fc0dad215f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] depool db1040 for schema changes - change (operations/mediawiki-config)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: depool db1040 for schema changes
..


depool db1040 for schema changes

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 49f2146..0e15b4a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -115,7 +115,7 @@
'db1004'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager
'db1011'   => 400,
'db1020'   => 400,
-   'db1040'   => 400,
+   # schema changes 'db1040'   => 400,
),
's5' => array(
'db1058'   => 0,

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

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

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

[MediaWiki-commits] [Gerrit] depool db1040 for schema changes - change (operations/mediawiki-config)

2014-01-27 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: depool db1040 for schema changes
..

depool db1040 for schema changes

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 49f2146..0e15b4a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -115,7 +115,7 @@
'db1004'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager
'db1011'   => 400,
'db1020'   => 400,
-   'db1040'   => 400,
+   # schema changes 'db1040'   => 400,
),
's5' => array(
'db1058'   => 0,

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

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

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

[MediaWiki-commits] [Gerrit] tcpircbot: allow 'channels' to be either a string or an array - change (operations/puppet)

2014-01-27 Thread Ori.livneh (Code Review)

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

Change subject: tcpircbot: allow 'channels' to be either a string or an array
..


tcpircbot: allow 'channels' to be either a string or an array

'channels' can be a single channel specified as a string.

Change-Id: I61caa435c88fcd72c1469281ba51fa2f0e07f0e2
---
M modules/tcpircbot/manifests/instance.pp
M modules/tcpircbot/templates/tcpircbot.json.erb
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/tcpircbot/manifests/instance.pp 
b/modules/tcpircbot/manifests/instance.pp
index 9fad01b..0b14bfa 100644
--- a/modules/tcpircbot/manifests/instance.pp
+++ b/modules/tcpircbot/manifests/instance.pp
@@ -84,7 +84,7 @@
 service { "tcpircbot-${title}":
 ensure=> running,
 provider  => 'upstart',
-subscribe => File["/etc/init/tcpircbot-${title}.conf"],
+subscribe => File["/etc/init/tcpircbot-${title}.conf", 
"${tcpircbot::dir}/${title}.json"],
 require   => [
 Package['python-irclib'],
 File["${tcpircbot::dir}/${title}.json"],
diff --git a/modules/tcpircbot/templates/tcpircbot.json.erb 
b/modules/tcpircbot/templates/tcpircbot.json.erb
index 4d2b1fd..fab6d36 100755
--- a/modules/tcpircbot/templates/tcpircbot.json.erb
+++ b/modules/tcpircbot/templates/tcpircbot.json.erb
@@ -1,13 +1,13 @@
 {
 "irc": {
-"channels": <%= @channels.to_pson %>,
+"channels": <%= Array(@channels).to_pson %>,
 "network": ["<%= @server_host %>", <%= @server_port %>, "<%= @nickname 
%>:<%= @password %>"],
 <% if @ssl %>"ssl": true,<% end %>
 "nickname": "<%= @nickname %>"
 },
 "tcp": {
 "max_clients": <%= @max_clients %>,
-<% if @cidr %>"cidr": <%= @cidr.is_a?(Array) ? @cidr.to_pson : 
[@cidr].to_pson %>,<% end %>
+<% if @cidr %>"cidr": <%= Array(@cidr).to_pson %>,<% end %>
 "port": <%= @listen_port %>
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61caa435c88fcd72c1469281ba51fa2f0e07f0e2
Gerrit-PatchSet: 4
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] Support structured logging. - change (mediawiki...parsoid)

2014-01-27 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Support structured logging.
..

Support structured logging.

Collect 'data' field in flatten helper to allow log clients to add custom
structured data fields to their log messages.

Move some code around to make it more obvious that the customizable log
method can take the type, location, short and long messages and custom
data separately in order to drive a structured log backend.

For example, with the GELF log format (http://www.graylog2.org/about/gelf)
we would generate GELF fields as follows:

version / host / timestamp: generated by backend

short_message / full_message: passed explicitly to internal log() method.

level / facility / line / file: generated from slash-delimited logType
and/or loc parameter.

_: generated from the 'data' object passed to internal log() method.

Bug: 49762
Change-Id: I558fd44b9fdeacc153c9147b770a3a6f4bbe8537
---
M lib/mediawiki.parser.environment.js
1 file changed, 53 insertions(+), 29 deletions(-)


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

diff --git a/lib/mediawiki.parser.environment.js 
b/lib/mediawiki.parser.environment.js
index adf7f92..9221cc6 100644
--- a/lib/mediawiki.parser.environment.js
+++ b/lib/mediawiki.parser.environment.js
@@ -550,17 +550,36 @@
 
 MWParserEnvironment.prototype.log = function (logType) {
// XXX this should be configurable, so we can log to syslog, etc.
-   var log = function(msg) { console.warn(msg); };
+   var log = function(logType, loc, shortMessage, longMessage, data) {
+   var msg = '';
+   if (loc) {
+   msg += logType + ' in ' + loc.iwp + ':' + loc.name;
+   if (loc.revid) {
+   msg += ' with oldid ' + loc.revid;
+   }
+   msg += '\n';
+   }
+   msg += shortMessage;
+   if (longMessage) { msg += '\n' + longMessage; }
+   if (/^(error|fatal)(\/|$)/.test(logType)) {
+   console.error('ERROR:', msg);
+   } else if (/^(warning)(\/|$)/.test(logType)) {
+   console.warn(msg);
+   } else {
+   console.log(msg);
+   }
+   };
// XXX this should be configurable.
var includeStackTrace = /^(error|fatal)(\/|$)/.test(logType) ||
/(^|\/)stacktrace(\/|$)/.test(logType);
// XXX this should be configurable.
var shouldAnnounceLocation = /^(error|warning)(\/|$)/.test(logType);
 
-   // returns an object with two fields, "msg" (for the message, if any)
-   // and "stack" (for the stack trace, if any)
+   // returns an object with three fields, "msg" (for the message, if any),
+   // "stack" (for the stack trace, if any), and "data" (an object with
+   // custom log data fields, if any)
var flatten = function(o, topLevel) {
-   var f, msg, stack;
+   var f, msg, stack, data;
if ( Array.isArray(o) && topLevel ) {
// flatten components, but no longer in a top-level 
context.
f = o.map(function(oo) { return flatten(oo); });
@@ -570,47 +589,52 @@
stack = f.reduce(function(prev, oo) {
return prev || oo.stack;
}, undefined);
-   return { msg: msg, stack: stack };
+   // merge all custom fields
+   data = f.reduce(function(prev, oo) {
+   return oo.data ? Object.assign(prev || {}, 
oo.data) : prev;
+   }, undefined);
+   return { msg: msg, stack: stack, data: data };
} else if (o instanceof Error) {
-   return { msg: o.toString(), stack: o.stack };
+   return { msg: o.toString(), stack: o.stack, data: 
o.data };
} else if (typeof(o)==='function') {
f = flatten(o());
-   return { msg: f.msg, stack: o.stack || f.stack };
+   return {
+   msg: f.msg,
+   stack: o.stack || f.stack,
+   data: o.data || f.data
+   };
} else if (typeof(o)==='object' && o.hasOwnProperty('msg')) {
f = flatten(o.msg);
-   return { msg: f.msg, stack: o.stack || f.stack };
+   return {
+   msg: f.msg,
+   stack: o.stack || f.stack,
+   data: o.data || f.data
+   };
} else if (ty

[MediaWiki-commits] [Gerrit] update cname after s6 master rotation - change (operations/dns)

2014-01-27 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: update cname after s6 master rotation
..


update cname after s6 master rotation

Change-Id: I5c7d12416717ae520b1fc521823419a16b511242
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index caa3f97..4782700 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -708,7 +708,7 @@
 s3-master  5M  IN CNAMEdb1038.eqiad.wmnet.
 s4-master  5M  IN CNAMEdb1059.eqiad.wmnet.
 s5-master  5M  IN CNAMEdb1058.eqiad.wmnet.
-s6-master  5M  IN CNAMEdb1027.eqiad.wmnet.
+s6-master  5M  IN CNAMEdb1023.eqiad.wmnet.
 s7-master  5M  IN CNAMEdb1033.eqiad.wmnet.
 m1-master  5M  IN CNAMEdb1001.eqiad.wmnet.
 m2-master  5M  IN CNAMEdb1048.eqiad.wmnet.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c7d12416717ae520b1fc521823419a16b511242
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Springle 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tcpircbot: allow 'channels' to be either a string or an array - change (operations/puppet)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: tcpircbot: allow 'channels' to be either a string or an array
..

tcpircbot: allow 'channels' to be either a string or an array

'channels' can be a single channel specified as a string.

Change-Id: I61caa435c88fcd72c1469281ba51fa2f0e07f0e2
---
M modules/tcpircbot/templates/tcpircbot.json.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/109840/1

diff --git a/modules/tcpircbot/templates/tcpircbot.json.erb 
b/modules/tcpircbot/templates/tcpircbot.json.erb
index 4d2b1fd..fab6d36 100755
--- a/modules/tcpircbot/templates/tcpircbot.json.erb
+++ b/modules/tcpircbot/templates/tcpircbot.json.erb
@@ -1,13 +1,13 @@
 {
 "irc": {
-"channels": <%= @channels.to_pson %>,
+"channels": <%= Array(@channels).to_pson %>,
 "network": ["<%= @server_host %>", <%= @server_port %>, "<%= @nickname 
%>:<%= @password %>"],
 <% if @ssl %>"ssl": true,<% end %>
 "nickname": "<%= @nickname %>"
 },
 "tcp": {
 "max_clients": <%= @max_clients %>,
-<% if @cidr %>"cidr": <%= @cidr.is_a?(Array) ? @cidr.to_pson : 
[@cidr].to_pson %>,<% end %>
+<% if @cidr %>"cidr": <%= Array(@cidr).to_pson %>,<% end %>
 "port": <%= @listen_port %>
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61caa435c88fcd72c1469281ba51fa2f0e07f0e2
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] update cname after s6 master rotation - change (operations/dns)

2014-01-27 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: update cname after s6 master rotation
..

update cname after s6 master rotation

Change-Id: I5c7d12416717ae520b1fc521823419a16b511242
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/39/109839/1

diff --git a/templates/wmnet b/templates/wmnet
index caa3f97..4782700 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -708,7 +708,7 @@
 s3-master  5M  IN CNAMEdb1038.eqiad.wmnet.
 s4-master  5M  IN CNAMEdb1059.eqiad.wmnet.
 s5-master  5M  IN CNAMEdb1058.eqiad.wmnet.
-s6-master  5M  IN CNAMEdb1027.eqiad.wmnet.
+s6-master  5M  IN CNAMEdb1023.eqiad.wmnet.
 s7-master  5M  IN CNAMEdb1033.eqiad.wmnet.
 m1-master  5M  IN CNAMEdb1001.eqiad.wmnet.
 m2-master  5M  IN CNAMEdb1048.eqiad.wmnet.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c7d12416717ae520b1fc521823419a16b511242
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Springle 

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

[MediaWiki-commits] [Gerrit] Added an opera-only partner - change (operations/puppet)

2014-01-27 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Added an opera-only partner
..

Added an opera-only partner

Change-Id: I268bec0a89d02fccdd8571570c9ff5b7673ba1ba
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/109838/1

diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index 5695f29..d3f749d 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -189,6 +189,10 @@
if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By == 
"Opera") {
set req.http.X-CS = req.http.X-CS2;
}
+   } else if (req.http.X-CS2 == "655-12") {
+   if (req.http.X-Forwarded-By == "Opera") {
+   set req.http.X-CS = req.http.X-CS2;
+   }
} else {
if (!req.http.X-Forwarded-By) {
// Any new carriers are signed up as both m & zero for 
all languages, without proxy support

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

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

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

[MediaWiki-commits] [Gerrit] Merge in Wikipedia Zero stuff. - change (apps...wikipedia)

2014-01-27 Thread Dr0ptp4kt (Code Review)

Dr0ptp4kt has uploaded a new change for review.

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

Change subject: Merge in Wikipedia Zero stuff.
..

Merge in Wikipedia Zero stuff.

Change-Id: Ifdf6dd578e87a1075cd9e8fd16e5cfde0d5a23b5
---
M wikipedia/res/values/strings.xml
1 file changed, 2 insertions(+), 5 deletions(-)


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

diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index bb617d1..66ff4c9 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -53,15 +53,13 @@
 Cancel
 Table of Contents
 No results found
-<<< HEAD   (532ebc Make captcha text box single line only)
 To help protect against 
automated spam, please enter the words that
 appear below
 
 Repeat words from above
 Enter captcha
-===
-General
 
+General
 Wikipedia Zero On (No Data 
Charges)
 Wikipedia Zero OFF (STANDARD DATA 
CHARGES MAY APPLY)
 Search Wikipedia Zero
@@ -73,5 +71,4 @@
 Continue
 Cancel
 Settings
->>> BRANCH (48287a WIP: Toggle chrome in Wikipedia Zero contexts, support 
inter)
-
+
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] retire logmsgbot from #wikimedia-dev - change (operations/puppet)

2014-01-27 Thread Ori.livneh (Code Review)

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

Change subject: retire logmsgbot from #wikimedia-dev
..


retire logmsgbot from #wikimedia-dev

Adding it did not have the intended effect of bolstering #wikimedia-dev --
it merely heaped botspam on botspam. So: undo. RIP.

Change-Id: I2fc7be988a72c08464f135a8c7ea2ba3d31db594
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 113b5c5..25bcb8d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1827,7 +1827,7 @@
 passwords::logmsgbot
 
 tcpircbot::instance { 'logmsgbot':
-channels => ['#wikimedia-operations', '#wikimedia-dev'],
+channels => '#wikimedia-operations',
 password => $passwords::logmsgbot::logmsgbot_password,
 cidr => [
 ':::10.64.21.123/128',# vanadium

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fc7be988a72c08464f135a8c7ea2ba3d31db594
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] retire logmsgbot from #wikimedia-dev - change (operations/puppet)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: retire logmsgbot from #wikimedia-dev
..

retire logmsgbot from #wikimedia-dev

Adding it did not have the intended effect of bolstering #wikimedia-dev --
it merely heaped botspam on botspam. So: undo. RIP.

Change-Id: I2fc7be988a72c08464f135a8c7ea2ba3d31db594
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/109836/1

diff --git a/manifests/site.pp b/manifests/site.pp
index e1bd67a..899dd9e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1832,7 +1832,7 @@
 passwords::logmsgbot
 
 tcpircbot::instance { 'logmsgbot':
-channels => ['#wikimedia-operations', '#wikimedia-dev'],
+channels => '#wikimedia-operations',
 password => $passwords::logmsgbot::logmsgbot_password,
 cidr => [
 ':::10.64.21.123/128',# vanadium

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fc7be988a72c08464f135a8c7ea2ba3d31db594
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] Prefer magic word from property to data-parsoid - change (mediawiki...parsoid)

2014-01-27 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Prefer magic word from property to data-parsoid
..

Prefer magic word from property to data-parsoid

Bug: 59672
Change-Id: I98cf731a37f870c7df443cf485798e83e1bac35e
---
M lib/mediawiki.WikitextSerializer.js
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/lib/mediawiki.WikitextSerializer.js 
b/lib/mediawiki.WikitextSerializer.js
index 276ffef..894c705 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -2810,10 +2810,11 @@

console.warn('defaultsort is missing source. Rendering as DEFAULTSORT 
magicword');
out = "{{DEFAULTSORT:" 
+ content + "}}";
}
-   } else if ( dp.magicSrc ) {
-   out = dp.magicSrc;
} else {
out = 
state.env.conf.wiki.getMagicWordWT(switchType[1]) || '';
+   if ( !out && dp.magicSrc ) {
+   out = dp.magicSrc;
+   }
}
cb(out, node);
}

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

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

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

[MediaWiki-commits] [Gerrit] WIP: Update README - change (mediawiki...LocalisationUpdate)

2014-01-27 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: WIP: Update README
..

WIP: Update README

 * Renamed README_FIRST.txt to README
 * Updated extension installation steps

Change-Id: I65d64b862947a5710a68197c38d92b5d18e879f0
---
A README
D README_FIRST.txt
2 files changed, 34 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LocalisationUpdate 
refs/changes/34/109834/1

diff --git a/README b/README
new file mode 100644
index 000..3df784b
--- /dev/null
+++ b/README
@@ -0,0 +1,34 @@
+== Localisation Update ==
+Localisation Update extension can update the MediaWiki messages at any time,
+without needing to upgrade the MediaWiki software.
+
+For more information see:
+ https://www.mediawiki.org/wiki/Extension:LocalisationUpdate
+
+== Installation ==
+1. Add the following to LocalSettings.php of your MediaWiki setup:
+
+ require_once "$IP/extensions/LocalisationUpdate/LocalisationUpdate.php";
+ $wgLocalisationUpdateDirectory = "$IP/cache";
+
+2. Create a cache folder in the installation directory, and be sure the server
+has permissions to write on it.
+
+If localization updates don't seem to come through, you may need to run,
+
+ php maintenance/rebuildLocalisationCache.php --force.
+
+3. Whenever you want to run an update, run,
+
+ php extensions/LocalisationUpdate/update.php
+
+For detailed help, see:
+
+ php extensions/LocalisationUpdate/update.php --help
+
+4. If you are on Unix like system, you should add LocalisationUpdate to
+crontab:
+
+ crontab -e
+ # Add the following line
+ @daily php /path/to/your/wiki/extensions/LocalisationUpdate/update.php --quiet
diff --git a/README_FIRST.txt b/README_FIRST.txt
deleted file mode 100644
index b6a44bc..000
--- a/README_FIRST.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-To install this extension first include
-LocalisationUpdate/LocalisationUpdate.php in your LocalSettings.php
-
-Whenever you want to run an update, run
-php extensions/LocalisationUpdate/update.php on the command line.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65d64b862947a5710a68197c38d92b5d18e879f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LocalisationUpdate
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Save backups for 4 days rather than 7. - change (operations/puppet)

2014-01-27 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Save backups for 4 days rather than 7.
..


Save backups for 4 days rather than 7.

We don't have storage space for 7, and I don't want to cut
out any of these files from the backup process.

Change-Id: Ib55a138b67522088adbb4822f4fa38fafa7659e3
---
M manifests/openstack.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 0e58542..3e336ea 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -424,7 +424,7 @@
 user => root,
 hour => 3,
 minute => 0,
-command => 'find /a/backup -type f -mtime +7 -delete',
+command => 'find /a/backup -type f -mtime +4 -delete',
 require => File["/a/backup"],
 ensure => present;
 }

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

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

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

[MediaWiki-commits] [Gerrit] Save backups for 4 days rather than 7. - change (operations/puppet)

2014-01-27 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Save backups for 4 days rather than 7.
..

Save backups for 4 days rather than 7.

We don't have storage space for 7, and I don't want to cut
out any of these files from the backup process.

Change-Id: Ib55a138b67522088adbb4822f4fa38fafa7659e3
---
M manifests/openstack.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 0e58542..3e336ea 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -424,7 +424,7 @@
 user => root,
 hour => 3,
 minute => 0,
-command => 'find /a/backup -type f -mtime +7 -delete',
+command => 'find /a/backup -type f -mtime +4 -delete',
 require => File["/a/backup"],
 ensure => present;
 }

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

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

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

[MediaWiki-commits] [Gerrit] update coredb topology after s6 master rotation - change (operations/puppet)

2014-01-27 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: update coredb topology after s6 master rotation
..


update coredb topology after s6 master rotation

Change-Id: I4c5416756fb396ece5008c4d8c4b8e2143fef968
---
M manifests/role/coredb.pp
M manifests/site.pp
2 files changed, 8 insertions(+), 13 deletions(-)

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



diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 1a09cfe..820f8d4 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -26,7 +26,7 @@
},
's3' => {
'hosts' => { 'pmtpa' => [ 'db71' ],
-   'eqiad' => [ 'db1003', 'db1010', 'db1019', 
'db1035', 'db1038' ] },
+   'eqiad' => [ 'db1003', 'db1019', 'db1035', 
'db1038' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => 'db71', 'eqiad' => 'db1038' },
'snapshot' => [ 'db1035' ],
@@ -50,11 +50,11 @@
},
's6' => {
'hosts' => { 'pmtpa' => [ 'db74' ],
-   'eqiad' => [ 'db1006', 'db1015', 'db1022', 
'db1023', 'db1027' ] },
+   'eqiad' => [ 'db1006', 'db1010', 'db1015', 
'db1022', 'db1023' ] },
'primary_site' => $::mw_primary,
-   'masters' => { 'pmtpa' => 'db74', 'eqiad' => 'db1027' },
+   'masters' => { 'pmtpa' => 'db74', 'eqiad' => 'db1023' },
'snapshot' => [ 'db1022' ],
-   'no_master' => [ 'db1022', 'db1023' ]
+   'no_master' => [ 'db1022', 'db1010' ]
},
's7' => {
'hosts' => { 'pmtpa' => [ 'db68' ],
diff --git a/manifests/site.pp b/manifests/site.pp
index e1bd67a..113b5c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -601,14 +601,8 @@
 }
 }
 
-node /^db10(06|10|15|22|23|27)\.eqiad\.wmnet/ {
-if $::hostname =~ /^db10(06|10|15|22|23)/ {
-class { role::coredb::s6 : innodb_file_per_table => true, mariadb => 
true }
-} elsif $::hostname =~ /^db10(27)/ {
-class { role::coredb::s6 : mariadb => true }
-} else {
-include role::coredb::s6
-}
+node /^db10(06|10|15|22|23)\.eqiad\.wmnet/ {
+class { role::coredb::s6 : innodb_file_per_table => true, mariadb => true }
 }
 
 node /^db10(07|28|33|39|41)\.eqiad\.wmnet/ {
@@ -751,7 +745,8 @@
 
 # out of action
 # db1024 RT 6672
-node /^db10(24)\.eqiad\.wmnet/ {
+# db1027 spare
+node /^db10(24|27)\.eqiad\.wmnet/ {
 include standard
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c5416756fb396ece5008c4d8c4b8e2143fef968
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle 
Gerrit-Reviewer: Springle 
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 throw JS errors when opening MWExtensionInspector on t... - change (mediawiki...VisualEditor)

2014-01-27 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Don't throw JS errors when opening MWExtensionInspector on the 
wrong node type
..

Don't throw JS errors when opening MWExtensionInspector on the wrong node type

The setup method just assumed this.node was of the right type, and
would just crash if it wasn't. You could select an image, open the
gallery inspector, and it would happily try to inspect it until
crashing because there was no .mw.extsrc attribute.

Bug: 60502
Change-Id: Idf0e9cf7ccaa37e607374ced150db732926a19f8
---
M modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
index 5d4bbeb..c426150 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
@@ -67,6 +67,10 @@
 
// Initialization
this.node = this.surface.getView().getFocusedNode();
+   // Make sure we're inspecting the right type of node
+   if ( !( this.node instanceof this.constructor.static.nodeView ) ) {
+   this.node = null;
+   }
this.input.setValue( this.node ? this.node.getModel().getAttribute( 
'mw' ).body.extsrc : '' );
 
// By default, the direction of the input element should be the same

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

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

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

[MediaWiki-commits] [Gerrit] update coredb topology after s6 master rotation - change (operations/puppet)

2014-01-27 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: update coredb topology after s6 master rotation
..

update coredb topology after s6 master rotation

Change-Id: I4c5416756fb396ece5008c4d8c4b8e2143fef968
---
M manifests/role/coredb.pp
M manifests/site.pp
2 files changed, 8 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/109831/1

diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 1a09cfe..820f8d4 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -26,7 +26,7 @@
},
's3' => {
'hosts' => { 'pmtpa' => [ 'db71' ],
-   'eqiad' => [ 'db1003', 'db1010', 'db1019', 
'db1035', 'db1038' ] },
+   'eqiad' => [ 'db1003', 'db1019', 'db1035', 
'db1038' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => 'db71', 'eqiad' => 'db1038' },
'snapshot' => [ 'db1035' ],
@@ -50,11 +50,11 @@
},
's6' => {
'hosts' => { 'pmtpa' => [ 'db74' ],
-   'eqiad' => [ 'db1006', 'db1015', 'db1022', 
'db1023', 'db1027' ] },
+   'eqiad' => [ 'db1006', 'db1010', 'db1015', 
'db1022', 'db1023' ] },
'primary_site' => $::mw_primary,
-   'masters' => { 'pmtpa' => 'db74', 'eqiad' => 'db1027' },
+   'masters' => { 'pmtpa' => 'db74', 'eqiad' => 'db1023' },
'snapshot' => [ 'db1022' ],
-   'no_master' => [ 'db1022', 'db1023' ]
+   'no_master' => [ 'db1022', 'db1010' ]
},
's7' => {
'hosts' => { 'pmtpa' => [ 'db68' ],
diff --git a/manifests/site.pp b/manifests/site.pp
index e1bd67a..113b5c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -601,14 +601,8 @@
 }
 }
 
-node /^db10(06|10|15|22|23|27)\.eqiad\.wmnet/ {
-if $::hostname =~ /^db10(06|10|15|22|23)/ {
-class { role::coredb::s6 : innodb_file_per_table => true, mariadb => 
true }
-} elsif $::hostname =~ /^db10(27)/ {
-class { role::coredb::s6 : mariadb => true }
-} else {
-include role::coredb::s6
-}
+node /^db10(06|10|15|22|23)\.eqiad\.wmnet/ {
+class { role::coredb::s6 : innodb_file_per_table => true, mariadb => true }
 }
 
 node /^db10(07|28|33|39|41)\.eqiad\.wmnet/ {
@@ -751,7 +745,8 @@
 
 # out of action
 # db1024 RT 6672
-node /^db10(24)\.eqiad\.wmnet/ {
+# db1027 spare
+node /^db10(24|27)\.eqiad\.wmnet/ {
 include standard
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 263b8c0..c39d1e6 - change (mediawiki/extensions)

2014-01-27 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 263b8c0..c39d1e6
..

Syncronize VisualEditor: 263b8c0..c39d1e6

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


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

diff --git a/VisualEditor b/VisualEditor
index 263b8c0..c39d1e6 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 263b8c04c1d2ea4712e661e49b212e9d8d55bcfc
+Subproject commit c39d1e63e0318bcc2709730336f8ba04130a3752

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ef5705425d658b70235591b0886f817ebcef89e
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] Simplify toDataElement in MW - change (mediawiki...VisualEditor)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Simplify toDataElement in MW
..


Simplify toDataElement in MW

As per I54943588c5cc2 in core.

Change-Id: Ia40e7327c4ce07a79d64a6d5b1ff0d7acec55171
---
M modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
M modules/ve-mw/dm/annotations/ve.dm.MWNowikiAnnotation.js
M modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
M modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js
M modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js
M modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
M modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js
M modules/ve-mw/dm/nodes/ve.dm.MWEntityNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWHeadingNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageCaptionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js
13 files changed, 6 insertions(+), 34 deletions(-)

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



diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js 
b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
index 07f1700..92f7f2d 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
@@ -37,7 +37,6 @@
 
 ve.dm.MWExternalLinkAnnotation.static.toDataElement = function ( domElements ) 
{
var parentResult = ve.dm.LinkAnnotation.static.toDataElement.apply( 
this, arguments );
-   parentResult.type = 'link/mwExternal';
parentResult.attributes.rel = domElements[0].getAttribute( 'rel' );
return parentResult;
 };
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js 
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 7255a53..242cac6 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -64,7 +64,7 @@
normalizedTitle = ve.dm.MWInternalLinkAnnotation.static.normalizeTitle( 
matches[2] );
 
return {
-   'type': 'link/mwInternal',
+   'type': this.name,
'attributes': {
'hrefPrefix': matches[1],
'title': decodeURIComponent( matches[2] ).replace( 
/_/g, ' ' ),
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWNowikiAnnotation.js 
b/modules/ve-mw/dm/annotations/ve.dm.MWNowikiAnnotation.js
index 9cb8981..bffb974 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWNowikiAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWNowikiAnnotation.js
@@ -33,7 +33,7 @@
 
 ve.dm.MWNowikiAnnotation.static.toDataElement = function ( domElements ) {
return {
-   'type': 'mwNowiki',
+   'type': this.name,
'attributes': {
'originalDomElements': ve.copy( domElements )
}
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
index eec6ce1..b5ef93b 100644
--- a/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
@@ -38,7 +38,7 @@
matches = href.match( /^((?:\.\.?\/)*)(.*?)(?:#(.*))?$/ ),
rawSortkey = matches[3] || '';
return {
-   'type': 'mwCategory',
+   'type': this.name,
'attributes': {
'hrefPrefix': matches[1],
'category': decodeURIComponent( matches[2] ).replace( 
/_/g, ' ' ),
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js
index c0b92d6..c93ad7d 100644
--- a/modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js
@@ -33,7 +33,7 @@
 ve.dm.MWLanguageMetaItem.static.toDataElement = function ( domElements ) {
var href = domElements[0].getAttribute( 'href' );
return {
-   'type': 'mwLanguage',
+   'type': this.name,
'attributes': {
'href': href
}
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js
index 9aea0cc..2d7dba8 100644
--- a/modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js
@@ -32,10 +32,6 @@
 
 ve.dm.MWNoEditSectionMetaItem.static.matchRdfaTypes = [ 
'mw:PageProp/noeditsection' ];
 
-ve.dm.MWNoEditSectionMetaItem.static.toDataElement = function () {
-   return { 'type': this.name };
-};
-
 ve.dm.MWNoEditSectionMetaItem.static.toDomElements = function ( dataElement

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 263b8c0..641be60 - change (mediawiki/extensions)

2014-01-27 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 263b8c0..641be60
..

Syncronize VisualEditor: 263b8c0..641be60

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


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

diff --git a/VisualEditor b/VisualEditor
index 263b8c0..641be60 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 263b8c04c1d2ea4712e661e49b212e9d8d55bcfc
+Subproject commit 641be60aead0175095e43dd4288c4a864aaa0575

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7b559d6f6618d360742302352d8f2f21a8af62a
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] Update VE core submodule to master - change (mediawiki...VisualEditor)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Update VE core submodule to master
..


Update VE core submodule to master

New changes:
d4a0fef Simplify toDataElement
fc5046d Simplify toDomElements
d81e542 Tests for RDFa attribute preservation
674ab3e Make keyboard shortcuts dialog footless
3282caf Localisation updates from https://translatewiki.net.
9b4354b Fix balancing of data in cloneSliceFromRange
9ea3f42 Attach container to DOM before initialising target in demo
e7f2b68 Only call setOriginalDimensions when non-null values are provided
815d5e9 Localisation updates from https://translatewiki.net.
8834bbb Minor clean up and doc fixes
b6bd0e9 Fix typo in ve.ce.Surface test message
2ea4ca9 Show % scale on ResizableNodes

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

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



diff --git a/lib/ve b/lib/ve
index 4913cc6..bdd6817 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 4913cc61960512828a178dded1ea36bfd04e86e9
+Subproject commit bdd68177fd3404b4f4776cf7844a67da2f6704c3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1619b9c950ef7ff26e54df6444e61fff405fdef0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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] set time intervals properly - change (operations/puppet)

2014-01-27 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: set time intervals properly
..


set time intervals properly

Change-Id: I76b31c4c9e61be0f25b85343c4f3b6d417599874
---
M manifests/misc/beta.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Matanya: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/misc/beta.pp b/manifests/misc/beta.pp
index 0a8c4b5..819cbc1 100644
--- a/manifests/misc/beta.pp
+++ b/manifests/misc/beta.pp
@@ -113,7 +113,7 @@
require => File['/usr/local/bin/monitor_fatals'],
command => '/usr/local/bin/monitor_fatals',
user=> nobody,
-   hour=> 12,
+   hour=> ['0','12']
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76b31c4c9e61be0f25b85343c4f3b6d417599874
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmcmahon 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Matanya 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] rotate s6 master, demote db1027, promote db1023 - change (operations/mediawiki-config)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: rotate s6 master, demote db1027, promote db1023
..


rotate s6 master, demote db1027, promote db1023

Change-Id: I7cf9c308c803a109b04f888621daf13bdca53a39
---
M wmf-config/db-eqiad.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 7ee8fcd..49f2146 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -125,8 +125,6 @@
'db1045'   => 400,
),
's6' => array(
-   'db1024'   => 0, # haproxy to db1027 & db1023 during rotation
-   #'db1027'   => 0, # old master, demoted for maintenance
'db1023'   => 0, # new master
'db1022'   => 0, # snapshot, vslow, dump
'db1010'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager

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

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

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

[MediaWiki-commits] [Gerrit] rotate s6 master, demote db1027, promote db1023 - change (operations/mediawiki-config)

2014-01-27 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: rotate s6 master, demote db1027, promote db1023
..

rotate s6 master, demote db1027, promote db1023

Change-Id: I7cf9c308c803a109b04f888621daf13bdca53a39
---
M wmf-config/db-eqiad.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 7ee8fcd..49f2146 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -125,8 +125,6 @@
'db1045'   => 400,
),
's6' => array(
-   'db1024'   => 0, # haproxy to db1027 & db1023 during rotation
-   #'db1027'   => 0, # old master, demoted for maintenance
'db1023'   => 0, # new master
'db1022'   => 0, # snapshot, vslow, dump
'db1010'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager

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

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

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

[MediaWiki-commits] [Gerrit] Template commits list view in rt server - change (mediawiki...parsoid)

2014-01-27 Thread Bebirchall (Code Review)

Bebirchall has uploaded a new change for review.

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

Change subject: Template commits list view in rt server
..

Template commits list view in rt server

Change-Id: I2ae9a5998af14b5b42b6dfdcb0a65a5abe2cead8
---
M tests/server/server.js
A tests/server/views/commits.html
2 files changed, 41 insertions(+), 22 deletions(-)


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

diff --git a/tests/server/server.js b/tests/server/server.js
index 49b99a4..61e229c 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -1164,33 +1164,29 @@
console.error( err );
res.send( err.toString(), 500 );
} else {
-   var n = rows.length;
-   res.setHeader( 'Content-Type', 'text/html; 
charset=UTF-8' );
res.status( 200 );
-   res.write( '' );
-   res.write(' List of all commits ');
-   res.write('');
-   res.write('Commit hashTimestamp' +
- //'RegressionsFixes' +
- 'Tests' +
- '-+');
+   var n = rows.length;
+   var tableRows = [];
for (var i = 0; i < n; i++) {
-   var r = rows[i];
-   res.write('' + r.hash + '' + 
r.timestamp + '');
-   //res.write('' + r.numregressions + 
'');
-   //res.write('' + r.numfixes + '');
-   res.write('' + r.numtests + '');
+   var row = rows[i];
+   var tableRow = [row.hash, row.timestamp, 
row.numtests];
if ( i + 1 < n ) {
-   res.write('-' );
-   res.write('+' );
-   } else {
-   res.write('');
+   tableRow.push({
+   url: '/regressions/between/' + 
rows[i+1].hash + '/' + row.hash,
+   name: '-'},
+   {url: '/topfixes/between/' + 
rows[i+1].hash + '/' + row.hash,
+   name: '+'
+   });
}
-   res.write('');
+   tableRows.push(tableRow);
}
-   res.end('' );
+   var data = {
+   heading: 'List of all commits',
+   header: ['Commit hash', 'Timestamp', 'Tests', 
'-', '+'],
+   row: tableRows
+   };
+
+   res.render('commits.html', data);
}
} );
 };
diff --git a/tests/server/views/commits.html b/tests/server/views/commits.html
new file mode 100644
index 000..f94ba9a
--- /dev/null
+++ b/tests/server/views/commits.html
@@ -0,0 +1,23 @@
+{{heading}}
+
+   
+   
+   {{#each header}}
+   {{this}}
+   {{/each}}
+   
+   {{#each row}}
+   
+   {{#each this}}
+   
+   {{#if url}}
+   {{name}}
+   {{else}}
+   {{this}}
+   {{/if}}
+   
+   {{/each}}
+   
+   {{/each}}
+   
+
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] prepare for rotation of s6 master from db1027 to db1023 - change (operations/mediawiki-config)

2014-01-27 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: prepare for rotation of s6 master from db1027 to db1023
..


prepare for rotation of s6 master from db1027 to db1023

Change-Id: I261f839e6195f7955d2f750d4c9148318ca7cd70
---
M wmf-config/db-eqiad.php
M wmf-config/db-pmtpa.php
2 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Springle: Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 81a4e93..7ee8fcd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -125,12 +125,13 @@
'db1045'   => 400,
),
's6' => array(
-   'db1027'   => 0,
+   'db1024'   => 0, # haproxy to db1027 & db1023 during rotation
+   #'db1027'   => 0, # old master, demoted for maintenance
+   'db1023'   => 0, # new master
'db1022'   => 0, # snapshot, vslow, dump
'db1010'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager
-   'db1023'   => 400,
'db1015'   => 400,
-   'db1006'   => 50, # warm up
+   'db1006'   => 400,
),
's7' => array(
'db1033' => 0,
diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php
index b32fa8f..5a9ca22 100644
--- a/wmf-config/db-pmtpa.php
+++ b/wmf-config/db-pmtpa.php
@@ -104,7 +104,7 @@
'db73'   => 100, # pmtpa master
),
's6' => array(
-   'db1027' => 0,
+   'db1023' => 0,
'db74'   => 100, # pmtpa master
),
's7' => array(
@@ -212,6 +212,7 @@
'db1020' => '10.64.16.9', #do not remove or comment out
'db1021' => '10.64.16.10', #do not remove or comment out
'db1022' => '10.64.16.11', #do not remove or comment out
+   'db1023' => '10.64.16.12', #do not remove or comment out
'db1024' => '10.64.16.13', #do not remove or comment out
'db1026' => '10.64.16.15', #do not remove or comment out
'db1027' => '10.64.16.16', #do not remove or comment out

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

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

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

[MediaWiki-commits] [Gerrit] A few small performance tweaks - change (mediawiki...parsoid)

2014-01-27 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: A few small performance tweaks
..

A few small performance tweaks

* Use string concatenation instead of Array.push & join for accumulators:
  
http://stackoverflow.com/questions/7299010/why-is-string-concatenation-faster-than-array-join

* Replace some uses of bind with closures, as those are quite a bit faster in
  v8

Overall parser tests might be slightly faster, but the improvement seems to be
within the margin of error.

Change-Id: I5d9e4191a79253fa808c9b0a26052470e8613a79
---
M lib/XMLSerializer.js
M lib/core-upgrade.js
M lib/ext.Cite.js
M lib/ext.core.AttributeExpander.js
M lib/ext.core.ParagraphWrapper.js
M lib/ext.core.Sanitizer.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.Util.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.parser.defines.js
10 files changed, 154 insertions(+), 121 deletions(-)


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

diff --git a/lib/XMLSerializer.js b/lib/XMLSerializer.js
index 69980d7..803f460 100644
--- a/lib/XMLSerializer.js
+++ b/lib/XMLSerializer.js
@@ -70,7 +70,7 @@
}
 }
 
-function serializeToString(node, buf, options){
+function serializeToString(node, options, cb){
var child;
switch(node.nodeType){
case ELEMENT_NODE:
@@ -79,7 +79,7 @@
var len = attrs.length;
var nodeName = node.tagName.toLowerCase(),
localName = node.localName;
-   buf.push('<',localName);
+   cb('<' + localName);
for(var i=0;i');
+   cb('>');
// if is cdata child node
if(hasRawContent[nodeName]) {
// TODO: perform context-sensitive escaping?
@@ -108,48 +110,51 @@
// * < to \3c in

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 263b8c0..4b71c52 - change (mediawiki/extensions)

2014-01-27 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 263b8c0..4b71c52
..

Syncronize VisualEditor: 263b8c0..4b71c52

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


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

diff --git a/VisualEditor b/VisualEditor
index 263b8c0..4b71c52 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 263b8c04c1d2ea4712e661e49b212e9d8d55bcfc
+Subproject commit 4b71c52f4432a72af1a6a610a12cc3fffa17ee29

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I917cd6297d4a362530db2f72056a0b9980cde04b
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] Fix toolbar margins in vector - change (mediawiki...VisualEditor)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Fix toolbar margins in vector
..


Fix toolbar margins in vector

In HD mode, the left margin was 0.25em off.

In narrow mode, the margins were completely wrong.

Bug: 51000
Change-Id: I7fd9cbc925b828fd780adb9ab2c71bcf15dc7284
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
index afed329..23e2c1e 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
@@ -6,5 +6,5 @@
  */
 
 .ve-init-mw-viewPageTarget-toolbar {
-   margin: -1.25em -1.5em 1.25em -1.5em;
+   margin: -1.25em -1.5em 1.25em -1.75em;
 }
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
index 74f400e..33fa47e 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
@@ -19,7 +19,7 @@
 }
 
 .ve-init-mw-viewPageTarget-toolbar {
-   margin: -1em;
+   margin: -1.25em -1.5em 1.5em -1.5em;
-webkit-transition: margin 200ms ease-out;
-moz-transition: margin 200ms ease-out;
-o-transition: margin 200ms ease-out;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd9cbc925b828fd780adb9ab2c71bcf15dc7284
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] prepare for rotation of s6 master from db1027 to db1023 - change (operations/mediawiki-config)

2014-01-27 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: prepare for rotation of s6 master from db1027 to db1023
..

prepare for rotation of s6 master from db1027 to db1023

Change-Id: I261f839e6195f7955d2f750d4c9148318ca7cd70
---
M wmf-config/db-eqiad.php
M wmf-config/db-pmtpa.php
2 files changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 81a4e93..7ee8fcd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -125,12 +125,13 @@
'db1045'   => 400,
),
's6' => array(
-   'db1027'   => 0,
+   'db1024'   => 0, # haproxy to db1027 & db1023 during rotation
+   #'db1027'   => 0, # old master, demoted for maintenance
+   'db1023'   => 0, # new master
'db1022'   => 0, # snapshot, vslow, dump
'db1010'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager
-   'db1023'   => 400,
'db1015'   => 400,
-   'db1006'   => 50, # warm up
+   'db1006'   => 400,
),
's7' => array(
'db1033' => 0,
diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php
index b32fa8f..5a9ca22 100644
--- a/wmf-config/db-pmtpa.php
+++ b/wmf-config/db-pmtpa.php
@@ -104,7 +104,7 @@
'db73'   => 100, # pmtpa master
),
's6' => array(
-   'db1027' => 0,
+   'db1023' => 0,
'db74'   => 100, # pmtpa master
),
's7' => array(
@@ -212,6 +212,7 @@
'db1020' => '10.64.16.9', #do not remove or comment out
'db1021' => '10.64.16.10', #do not remove or comment out
'db1022' => '10.64.16.11', #do not remove or comment out
+   'db1023' => '10.64.16.12', #do not remove or comment out
'db1024' => '10.64.16.13', #do not remove or comment out
'db1026' => '10.64.16.15', #do not remove or comment out
'db1027' => '10.64.16.16', #do not remove or comment out

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

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

___
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 - change (mediawiki...VisualEditor)

2014-01-27 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update VE core submodule to master
..

Update VE core submodule to master

New changes:
d4a0fef Simplify toDataElement
fc5046d Simplify toDomElements
d81e542 Tests for RDFa attribute preservation
674ab3e Make keyboard shortcuts dialog footless
3282caf Localisation updates from https://translatewiki.net.
9b4354b Fix balancing of data in cloneSliceFromRange
9ea3f42 Attach container to DOM before initialising target in demo
e7f2b68 Only call setOriginalDimensions when non-null values are provided
815d5e9 Localisation updates from https://translatewiki.net.
8834bbb Minor clean up and doc fixes
b6bd0e9 Fix typo in ve.ce.Surface test message
2ea4ca9 Show % scale on ResizableNodes

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


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

diff --git a/lib/ve b/lib/ve
index 4913cc6..bdd6817 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 4913cc61960512828a178dded1ea36bfd04e86e9
+Subproject commit bdd68177fd3404b4f4776cf7844a67da2f6704c3

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 263b8c0..2c0faa4 - change (mediawiki/extensions)

2014-01-27 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 263b8c0..2c0faa4
..

Syncronize VisualEditor: 263b8c0..2c0faa4

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/22/109822/1

diff --git a/VisualEditor b/VisualEditor
index 263b8c0..2c0faa4 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 263b8c04c1d2ea4712e661e49b212e9d8d55bcfc
+Subproject commit 2c0faa4bb1dd7f533c5759a2d83071545b877387

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61dc0cb5f95c9c70c146653155de5b086f48e6a2
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] Store original dimensions results in IV store - change (mediawiki...VisualEditor)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Store original dimensions results in IV store
..


Store original dimensions results in IV store

* Remove the this.mediaSize custom store object and replace
  with a hash function and the document's IV store.
* Remove this.inputs/this.fieldsets namespaces.
* Calculate this.filename as soon as this.mediaNode is set.
* Rename getMediaSize to getOriginalDimensions

Change-Id: I2030aade5d96555451f6a390d0aa3d44b860841f
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
1 file changed, 42 insertions(+), 30 deletions(-)

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 0687689..53cbd56 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -24,12 +24,8 @@
// Properties
this.mediaNode = null;
this.captionNode = null;
-   // Cache for image original size, if requested
-   this.mediaSize = {};
+   this.store = null;
this.filename = null;
-   // GUI properties
-   this.inputs = {};
-   this.fieldsets = {};
 };
 
 /* Inheritance */
@@ -132,14 +128,14 @@
// Define fieldsets for image settings
 
// Caption
-   this.fieldsets.caption = new OO.ui.FieldsetLayout( {
+   this.captionFieldset = new OO.ui.FieldsetLayout( {
'$': this.$,
'label': ve.msg( 'visualeditor-dialog-media-content-section' ),
'icon': 'parameter'
} );
 
// Size
-   this.fieldsets.size = new OO.ui.FieldsetLayout( {
+   this.sizeFieldset = new OO.ui.FieldsetLayout( {
'$': this.$,
'label': ve.msg( 'visualeditor-dialog-media-size-section' ),
'icon': 'parameter'
@@ -150,12 +146,12 @@
'label': ve.msg( 
'visualeditor-dialog-media-size-originalsize-error' )
} );
 
-   this.inputs.size = new ve.ui.MediaSizeWidget( {
+   this.sizeWidget = new ve.ui.MediaSizeWidget( {
'$': this.$
} );
 
-   this.fieldsets.size.$element.append( [
-   this.inputs.size.$element,
+   this.sizeFieldset.$element.append( [
+   this.sizeWidget.$element,
this.sizeErrorLabel.$element,
this.$spinner
] );
@@ -172,8 +168,8 @@
this.applyButton.connect( this, { 'click': [ 'close', { 'action': 
'apply' } ] } );
 
// Initialization
-   this.generalSettingsPage.$element.append( 
this.fieldsets.caption.$element );
-   this.advancedSettingsPage.$element.append( this.fieldsets.size.$element 
);
+   this.generalSettingsPage.$element.append( this.captionFieldset.$element 
);
+   this.advancedSettingsPage.$element.append( this.sizeFieldset.$element );
 
this.$body.append( this.bookletLayout.$element );
this.$foot.append( this.applyButton.$element );
@@ -183,16 +179,13 @@
  * Get the original size of the media object from the API, if it exists
  * @returns {jQuery.Promise}
  */
-ve.ui.MWMediaEditDialog.prototype.getMediaSize = function () {
-   var rawfilename = this.mediaNode.getAttribute( 'resource' ),
+ve.ui.MWMediaEditDialog.prototype.getOriginalDimensions = function () {
+   var index = this.store.indexOfHash( 
this.constructor.static.getSizeHash( this.filename ) ),
deferred = $.Deferred();
 
-   // Strip the raw filename up to the 'File:' namespage
-   this.filename = rawfilename.substring( rawfilename.indexOf( 'File:' ) );
-
-   if ( this.mediaSize && !$.isEmptyObject( this.mediaSize[this.filename] 
) ) {
+   if ( index ) {
// The image size is already cached
-   deferred.resolve( this.mediaSize[this.filename] );
+   deferred.resolve( this.store.value( index ) );
} else {
// Look for the media size through the API
$.ajax( {
@@ -232,7 +225,7 @@
  * @inheritdoc
  */
 ve.ui.MWMediaEditDialog.prototype.setup = function ( data ) {
-   var attrs, newDoc,
+   var attrs, newDoc, originalSize, resource,
dimensions = {},
doc = this.surface.getModel().getDocument();
 
@@ -242,6 +235,12 @@
// Properties
this.mediaNode = this.surface.getView().getFocusedNode().getModel();
this.captionNode = this.mediaNode.getCaptionNode();
+   this.store = this.surface.getModel().getDocument().getStore();
+
+   // Strip the raw filename up to the 'File:' namespage
+   resource = this.mediaNode.getAttribute( 'resource' );
+   this.filename = resource.substring( resource.indexOf( 'File:' ) );
+
if ( this.captionNode && this.captionNode.getLength() > 0 ) {
newDoc = doc.cloneFro

[MediaWiki-commits] [Gerrit] Don't include empty categories in Special:Mostlinkedcategories - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Don't include empty categories in Special:Mostlinkedcategories
..


Don't include empty categories in Special:Mostlinkedcategories

We never delete things from the category table, so there are
entries in it with 0 members, which really shouldn't show up
on the special page.

Bug: 58967
Change-Id: I6bdf5a5196724f7970fb79497ef912cf8268ec3e
---
M includes/specials/SpecialMostlinkedcategories.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialMostlinkedcategories.php 
b/includes/specials/SpecialMostlinkedcategories.php
index 0d4641b..f61a115 100644
--- a/includes/specials/SpecialMostlinkedcategories.php
+++ b/includes/specials/SpecialMostlinkedcategories.php
@@ -44,6 +44,7 @@
'fields' => array( 'title' => 'cat_title',
'namespace' => NS_CATEGORY,
'value' => 'cat_pages' ),
+   'conds' => array( 'cat_pages > 0' ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6bdf5a5196724f7970fb79497ef912cf8268ec3e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
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 getLongDesc if tif file is invalid or has invalid metadata - change (mediawiki...PagedTiffHandler)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Fix getLongDesc if tif file is invalid or has invalid metadata
..


Fix getLongDesc if tif file is invalid or has invalid metadata

Previously it was displaying as (1) i.e. the value true cast to
a string surounded by parenthesis, which was rather odd. Most
sane thing to do (imho) is just use the generic getLongDesc
from the parent class.

Change-Id: I8c7c8874c1caa6637d51907c4053dc9c4ecf10e3
---
M PagedTiffHandler_body.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/PagedTiffHandler_body.php b/PagedTiffHandler_body.php
index bf90838..2e9f777 100644
--- a/PagedTiffHandler_body.php
+++ b/PagedTiffHandler_body.php
@@ -543,9 +543,11 @@
->params( $params['size'], $params['mime'] )
->numParams( $params['page_count'] )
->parse();
+   } else {
+   // If we have no metadata, we have no idea how many 
pages we
+   // have, so just fallback to the parent class.
+   return parent::getLongDesc( $image );
}
-
-   return true;
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c7c8874c1caa6637d51907c4053dc9c4ecf10e3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PagedTiffHandler
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Gergő Tisza 
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] Add audio stats to [[Special:TimedMediaHandler]]. - change (mediawiki...TimedMediaHandler)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Add audio stats to [[Special:TimedMediaHandler]].
..


Add audio stats to [[Special:TimedMediaHandler]].

Note this doesn't include audio/midi, since that format is
not handled by Special:TimedMediaHandler.

Bug: 49654
Change-Id: I0b386b607020b2ee697fac1ff8e38d9f9332c8d0
---
M SpecialTimedMediaHandler.php
M TimedMediaHandler.i18n.php
2 files changed, 40 insertions(+), 14 deletions(-)

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



diff --git a/SpecialTimedMediaHandler.php b/SpecialTimedMediaHandler.php
index 700fe96..2192f0f 100644
--- a/SpecialTimedMediaHandler.php
+++ b/SpecialTimedMediaHandler.php
@@ -19,6 +19,11 @@
'ogg' => 'img_major_mime="application" AND img_minor_mime = 
"ogg"',
'webm' => 'img_major_mime="video" AND img_minor_mime = "webm"',
);
+   private $audioFormats = array(
+   'ogg' => 'img_major_mime="application" AND img_minor_mime = 
"ogg"',
+   'flac' => 'img_major_mime="audio" AND img_minor_mime="x-flac"',
+   'wav' => 'img_major_mime="audio" AND img_minor_mime="wav"',
+   );
 
public function __construct( $request = null, $par = null ) {
parent::__construct( 'TimedMediaHandler', 'transcode-status' );
@@ -32,18 +37,22 @@
 
$stats = $this->getStats();
 
-   $out->addHTML(
-   ""
-   . $this->msg( 'timedmedia-videos' )->numParams( 
$stats['videos']['total'] )->escaped()
-   . ""
-   );
-   // Give grep a chance to find the usages: 
timedmedia-ogg-videos, timedmedia-webm-videos
-   foreach ( $this->formats as $format => $condition ) {
-   if ( $stats[ 'videos' ][ $format ] ) {
-   $out->addHTML(
-   $this->msg( "timedmedia-$format-videos" 
)->numParams( $stats[ 'videos' ][ $format ] )->escaped()
-   . ""
-   );
+   foreach( array( 'audios', 'videos' ) as $type ) {
+   // for grep timedmedia-audios, timedmedia-videos
+   $out->addHTML(
+   ""
+   . $this->msg( 'timedmedia-' . $type 
)->numParams( $stats[$type]['total'] )->escaped()
+   . ""
+   );
+   // Give grep a chance to find the usages: 
timedmedia-ogg-videos, timedmedia-webm-videos,
+   // timedmedia-ogg-audios, timedmedia-flac-audios, 
timedmedia-wav-audios
+   foreach ( $this->formats as $format => $condition ) {
+   if ( $stats[ $type ][ $format ] ) {
+   $out->addHTML(
+   $this->msg( 
"timedmedia-$format-$type" )->numParams( $stats[ $type ][ $format ] )->escaped()
+   . Html::element( 'br' )
+   );
+   }
}
}
 
@@ -137,7 +146,7 @@
global $wgEnabledTranscodeSet, $wgEnabledAudioTranscodeSet, 
$wgMemc;
$allTranscodes = array_merge( $wgEnabledTranscodeSet, 
$wgEnabledAudioTranscodeSet );
 
-   $memcKey= wfMemcKey( 'TimedMediaHandler', 'stats' );
+   $memcKey= wfMemcKey( 'TimedMediaHandler', 'stats', '1' /* 
version */ );
$stats = $wgMemc->get( $memcKey );
if ( !$stats ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -152,7 +161,16 @@
);
$stats[ 'videos' ][ 'total' ] += $stats[ 
'videos' ][ $format ];
}
-   $wgMemc->add( $memcKey, $stats, 3600 );
+   $stats[ 'audios' ] = array( 'total' => 0 );
+   foreach( $this->formats as $format => $condition ) {
+   $stats[ 'audios' ][ $format ] = 
(int)$dbr->selectField(
+   'image',
+   'COUNT(*)',
+   'img_media_type = "AUDIO" AND (' . 
$condition . ')',
+   __METHOD__
+   );
+   $stats[ 'audios' ][ 'total' ] += $stats[ 
'audios' ][ $format ];
+   }
}
return $stats;
}
diff --git a/TimedMediaHandler.i18n.php b/TimedMediaHandler.i18n.php
index c92edb5..b65644a 100755
--- a/TimedMediaHandler.i18n.php
+++ b/TimedMediaHandler.i18n.php
@@ -141,6 +141,10 @@
'timedmedia-

[MediaWiki-commits] [Gerrit] Support SearchEngine's new sort parameter - change (mediawiki...CirrusSearch)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Support SearchEngine's new sort parameter
..


Support SearchEngine's new sort parameter

Sorting by a field requires that the field be loaded into memory so I
want to be careful not to let all fields be sortable but the title
should be safe because it is small compared to, say, text.

Won't do anything without Ie946150c6796139201221dfa6f7750c210e97166 in core
but won't crash either.

Change-Id: I4708391aed8325cf3f082b7de7e438efa031d2cb
---
M includes/CirrusSearch.php
M includes/Result.php
M includes/Searcher.php
3 files changed, 30 insertions(+), 1 deletion(-)

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



diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 620e80c..3fd9d98 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -71,6 +71,7 @@
if ( $this->lastNamespacePrefix ) {
$searcher->addSuggestPrefix( $this->lastNamespacePrefix 
);
}
+   $searcher->setSort( $this->getSort() );
 
// Delegate to either searchText or moreLikeThisArticle and 
dump the result into $status
if ( substr( $term, 0, strlen( self::MORE_LIKE_THIS_PREFIX ) ) 
=== self::MORE_LIKE_THIS_PREFIX ) {
@@ -116,4 +117,8 @@
}
return $parsed;
}
+
+   public function getValidSorts() {
+   return array( 'relevance', 'title_asc', 'title_desc' );
+   }
 }
diff --git a/includes/Result.php b/includes/Result.php
index 381ff83..8b5a6fb 100644
--- a/includes/Result.php
+++ b/includes/Result.php
@@ -92,7 +92,7 @@
$this->sectionSnippet = '';
$this->sectionTitle = null;
}
-   if ( $wgCirrusSearchShowScore ) {
+   if ( $wgCirrusSearchShowScore && $results->getMaxScore() ) {
$this->score = $result->getScore() / 
$results->getMaxScore();
}
}
diff --git a/includes/Searcher.php b/includes/Searcher.php
index d6566c9..5dca444 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -62,6 +62,10 @@
 */
private $resultsType;
/**
+* @var string sort type
+*/
+   private $sort = 'relevance';
+   /**
 * @var array(string) prefixes that should be prepended to suggestions. 
 Can be added to externally and is added to
 * during search syntax parsing.
 */
@@ -151,6 +155,14 @@
 */
public function setResultsType( $resultsType ) {
$this->resultsType = $resultsType;
+   }
+
+   /**
+* Set the type of sort to perform.  Must be 'relevance', 'title_asc', 
'title_desc'.
+* @param string sort type
+*/
+   public function setSort( $sort ) {
+   $this->sort = $sort;
}
 
/**
@@ -635,6 +647,18 @@
$query->setParam( 'rescore', $this->rescore );
}
$query->addParam( 'stats', $type );
+   switch ( $this->sort ) {
+   case 'relevance':
+   break;  // The default
+   case 'title_asc':
+   $query->setSort( array( 'title.keyword' => 'asc' ) );
+   break;
+   case 'title_desc':
+   $query->setSort( array( 'title.keyword' => 'desc' ) );
+   break;
+   default:
+   wfLogWarning( "Invalid sort type:  $this->sort" );
+   }
 
$queryOptions = array();
if ( $wgCirrusSearchMoreAccurateScoringMode ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4708391aed8325cf3f082b7de7e438efa031d2cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update OBSOLETE file text - change (mediawiki...Oversight)

2014-01-27 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged.

Change subject: Update OBSOLETE file text
..


Update OBSOLETE file text

Change-Id: Ic1e0382b3fa880193469e737db25f5cc7753f951
---
M OBSOLETE
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/OBSOLETE b/OBSOLETE
index 727563a..ee9d2b0 100644
--- a/OBSOLETE
+++ b/OBSOLETE
@@ -1,8 +1,10 @@
 As of MediaWiki 1.16.0 this extension is obsolete due to core functionality for
-revision deletion (oversight). As such, new installations of this extension are
+revision deletion (oversight) [1]. As such, new installations of this 
extension are
 redundant. This extension is not actively maintained, and is only really kept 
around
-as it is still somewhat used on Wikimedia Wikis.
+and maintained as it is still somewhat used on Wikimedia Wikis.
 
-It will be deleted from subversion in the near future.
+Migration of any revisions hidden by the Oversight extension can be migrated 
to using
+revision delete by using the migrateToRevDel.php maintenance script that 
exists in the
+extension directory.
 
-http://www.mediawiki.org/wiki/RevisionDelete
\ No newline at end of file
+[1] https://www.mediawiki.org/wiki/Manual:RevisionDelete
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1e0382b3fa880193469e737db25f5cc7753f951
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Oversight
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] Update OBSOLETE file text - change (mediawiki...Oversight)

2014-01-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Update OBSOLETE file text
..

Update OBSOLETE file text

Change-Id: Ic1e0382b3fa880193469e737db25f5cc7753f951
---
M OBSOLETE
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Oversight 
refs/changes/21/109821/1

diff --git a/OBSOLETE b/OBSOLETE
index 727563a..ee9d2b0 100644
--- a/OBSOLETE
+++ b/OBSOLETE
@@ -1,8 +1,10 @@
 As of MediaWiki 1.16.0 this extension is obsolete due to core functionality for
-revision deletion (oversight). As such, new installations of this extension are
+revision deletion (oversight) [1]. As such, new installations of this 
extension are
 redundant. This extension is not actively maintained, and is only really kept 
around
-as it is still somewhat used on Wikimedia Wikis.
+and maintained as it is still somewhat used on Wikimedia Wikis.
 
-It will be deleted from subversion in the near future.
+Migration of any revisions hidden by the Oversight extension can be migrated 
to using
+revision delete by using the migrateToRevDel.php maintenance script that 
exists in the
+extension directory.
 
-http://www.mediawiki.org/wiki/RevisionDelete
\ No newline at end of file
+[1] https://www.mediawiki.org/wiki/Manual:RevisionDelete
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1e0382b3fa880193469e737db25f5cc7753f951
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Oversight
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Imported Upstream version 7.32.3 - change (operations...vips)

2014-01-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Imported Upstream version 7.32.3
..


Imported Upstream version 7.32.3
---
A AUTHORS
A COPYING
A ChangeLog
A INSTALL
A Makefile.am
A Makefile.in
A NEWS
A THANKS
A TODO
A acinclude.m4
A aclocal.m4
A benchmark/README
A benchmark/benchmarkn-osx.sh
A benchmark/benchmarkn.sh
A benchmark/sample2.v
A bootstrap.sh
A config.guess
A config.h.in
A config.sub
A configure
A configure.ac
A depcomp
A doc/Makefile.am
A doc/Makefile.in
A doc/html/figs/arch.png
A doc/html/figs/interconvert.png
A doc/html/vipsmanual.css
A doc/html/vipsmanual.html
A doc/html/vipsmanualch1.html
A doc/html/vipsmanualch2.html
A doc/html/vipsmanualch3.html
A doc/html/vipsmanualch4.html
A doc/html/vipsmanualli1.html
A doc/html/vipsmanualli2.html
A doc/html/vipsmanualli3.html
A doc/html/vipsmanualse1.html
A doc/html/vipsmanualse10.html
A doc/html/vipsmanualse11.html
A doc/html/vipsmanualse12.html
A doc/html/vipsmanualse13.html
A doc/html/vipsmanualse14.html
A doc/html/vipsmanualse15.html
A doc/html/vipsmanualse16.html
A doc/html/vipsmanualse17.html
A doc/html/vipsmanualse18.html
A doc/html/vipsmanualse2.html
A doc/html/vipsmanualse3.html
A doc/html/vipsmanualse4.html
A doc/html/vipsmanualse5.html
A doc/html/vipsmanualse6.html
A doc/html/vipsmanualse7.html
A doc/html/vipsmanualse8.html
A doc/html/vipsmanualse9.html
A doc/pdf/vipsmanual.pdf
A doc/reference/Makefile.am
A doc/reference/Makefile.in
A doc/reference/html/VipsArithmetic.html
A doc/reference/html/VipsColourSpace.html
A doc/reference/html/VipsConversion.html
A doc/reference/html/VipsForeignSave.html
A doc/reference/html/VipsImage.html
A doc/reference/html/VipsInterpolate.html
A doc/reference/html/VipsObject.html
A doc/reference/html/VipsOperation.html
A doc/reference/html/VipsRegion.html
A doc/reference/html/VipsResample.html
A doc/reference/html/VipsThreadState.html
A doc/reference/html/annotation-glossary.html
A doc/reference/html/api-index-full.html
A doc/reference/html/ch01.html
A doc/reference/html/ch02.html
A doc/reference/html/ch03.html
A doc/reference/html/home.png
A doc/reference/html/index.html
A doc/reference/html/index.sgml
A doc/reference/html/interconvert.png
A doc/reference/html/left.png
A doc/reference/html/libvips-buf.html
A doc/reference/html/libvips-convolution.html
A doc/reference/html/libvips-error.html
A doc/reference/html/libvips-freq-filt.html
A doc/reference/html/libvips-generate.html
A doc/reference/html/libvips-header.html
A doc/reference/html/libvips-histograms-lut.html
A doc/reference/html/libvips-inplace.html
A doc/reference/html/libvips-mask.html
A doc/reference/html/libvips-memory.html
A doc/reference/html/libvips-morphology.html
A doc/reference/html/libvips-mosaicing.html
A doc/reference/html/libvips-other.html
A doc/reference/html/libvips-rect.html
A doc/reference/html/libvips-semaphore.html
A doc/reference/html/libvips-transform.html
A doc/reference/html/libvips-util.html
A doc/reference/html/libvips-version.html
A doc/reference/html/libvips-video.html
A doc/reference/html/libvips.devhelp2
A doc/reference/html/object-tree.html
A doc/reference/html/right.png
A doc/reference/html/style.css
A doc/reference/html/up.png
A doc/reference/images/interconvert.png
A doc/reference/images/interconvert.svg
A doc/reference/libvips-docs.sgml
A doc/reference/libvips-docs.sgml.in
A doc/reference/libvips-overrides.txt
A doc/reference/libvips-sections.txt
A doc/reference/tmpl/analyze2vips.sgml
A doc/reference/tmpl/arithmetic.sgml
A doc/reference/tmpl/bandary.sgml
A doc/reference/tmpl/basic.sgml
A doc/reference/tmpl/binary.sgml
A doc/reference/tmpl/buf.sgml
A doc/reference/tmpl/cimg_funcs.sgml
A doc/reference/tmpl/colour.sgml
A doc/reference/tmpl/conversion.sgml
A doc/reference/tmpl/convolution.sgml
A doc/reference/tmpl/csv.sgml
A doc/reference/tmpl/dispatch.sgml
A doc/reference/tmpl/draw.sgml
A doc/reference/tmpl/enumtypes.sgml
A doc/reference/tmpl/error.sgml
A doc/reference/tmpl/fits.sgml
A doc/reference/tmpl/foreign.sgml
A doc/reference/tmpl/format.sgml
A doc/reference/tmpl/freq_filt.sgml
A doc/reference/tmpl/generate.sgml
A doc/reference/tmpl/header.sgml
A doc/reference/tmpl/histograms_lut.sgml
A doc/reference/tmpl/image.sgml
A doc/reference/tmpl/inplace.sgml
A doc/reference/tmpl/interpolate.sgml
A doc/reference/tmpl/jpeg.sgml
A doc/reference/tmpl/libvips-unused.sgml
A doc/reference/tmpl/magick.sgml
A doc/reference/tmpl/mask.sgml
A doc/reference/tmpl/matlab.sgml
A doc/reference/tmpl/memory.sgml
A doc/reference/tmpl/morphology.sgml
A doc/reference/tmpl/mosaicing.sgml
A doc/reference/tmpl/object.sgml
A doc/reference/tmpl/openexr2vips.sgml
A doc/reference/tmpl/openslide2vips.sgml
A doc/reference/tmpl/operation.sgml
A doc/reference/tmpl/other.sgml
A doc/reference/tmpl/ppm.sgml
A doc/reference/tmpl/radiance.sgml
A doc/reference/tmpl/rect.sgml
A doc/reference/tmpl/region.sgml
A doc/reference/tmpl/relational.sgml
A doc/reference/tmpl/resam

[MediaWiki-commits] [Gerrit] Update metric names for Zuul / Gerrit graphite graphs - change (integration/docroot)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Update metric names for Zuul / Gerrit graphite graphs
..


Update metric names for Zuul / Gerrit graphite graphs

* The metric name hierarchy changed, with individual apps now
  sitting at the top level (stats_counts.gerrit -> gerrit).

* The input of the data now wraps most data points in an extra
  level (gerrit.patchset-created -> gerrit.patchset-created.count).

Change-Id: I5f7f13de4903c50bef72bfe0c02f8e040846392b
---
M org/wikimedia/integration/zuul/default.html
1 file changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/org/wikimedia/integration/zuul/default.html 
b/org/wikimedia/integration/zuul/default.html
index e703831..c7f275e 100644
--- a/org/wikimedia/integration/zuul/default.html
+++ b/org/wikimedia/integration/zuul/default.html
@@ -11,9 +11,9 @@
 &width=400
 &bgcolor=ff
 &fgcolor=00
-&target=alias(summarize(stats_counts.gerrit.event.comment-added,%20'1h'),%20'Comment%20added')
-&target=alias(summarize(stats_counts.gerrit.event.patchset-created,%20'1h'),%20'Patchset%20created')
-&target=alias(summarize(stats_counts.gerrit.event.change-merged,%20'1h'),%20'Change%20merged')
+&target=alias(summarize(gerrit.event.comment-added.count,'1h'),'Comment%20added')
+&target=alias(summarize(gerrit.event.patchset-created.count,'1h'),'Patchset%20created')
+&target=alias(summarize(gerrit.event.change-merged.count,'1h'),'Change%20merged')
 &title=Gerrit%20Events%20(per%20Hour)" title="Gerrit events (per Hour)" />

 


 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f7f13de4903c50bef72bfe0c02f8e040846392b
Gerrit-PatchSet: 2
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
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] Release notes for I9359682c - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Release notes for I9359682c
..


Release notes for I9359682c

Forgotten earlier.

Change-Id: I8e2cad1bfb5f98916baaba104e3a34c8abd51dad
---
M RELEASE-NOTES-1.23
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 5331e00..3db4a91 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -24,7 +24,8 @@
 * Preferences 'watchcreations', 'watchdefault', 'enotifwatchlistpages' ("Add
   pages I create and files I upload to my watchlist", "Add pages and files I
   edit to my watchlist", "Email me when a page or file on my watchlist is
-  changed") are now enabled by default.
+  changed") are now enabled by default. In addition new user accounts' personal
+  and talk pages are now watched by them by default.
 * $wgLBFactoryConf: Class names have had underscores removed. The configuration
   should be updated if LBFactory_Simple or LBFactory_Multi is configured.
 * $wgPasswordSenderName has been deprecated. To set a custom mailer name,
@@ -79,6 +80,7 @@
 * [[Special:Diff]] was added, allowing users to create internal links to
   revision comparison pages using syntax such as [[Special:Diff/12345]],
   [[Special:Diff/12345/prev]] or [[Special:Diff/12345/98765]].
+* New user accounts' personal and talk pages are now watched by them by 
default.
 
 === Bug fixes in 1.23 ===
 * (bug 41759) The "updated since last visit" markers (on history pages, recent

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e2cad1bfb5f98916baaba104e3a34c8abd51dad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make preference "Email me when a page or file on my watchlis... - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Make preference "Email me when a page or file on my watchlist 
is changed" true by default
..


Make preference "Email me when a page or file on my watchlist is changed" true 
by default

Consistent with the recent work in making vanilla MediaWiki closer to what a 
standard site
would do, with more obvious defaults, and bug 45020.

WMF can sort out its special problems separately and is not affected by this, 
see Iad6d13509.

Bug: 45022
Change-Id: I9757cff9728f377363c540b1ab809679a1bfa01d
---
M RELEASE-NOTES-1.23
M includes/DefaultSettings.php
2 files changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 0bb6bee..5331e00 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -21,9 +21,10 @@
 * $wgSquidServersNoPurge now supports the use of Classless Inter-Domain
   Routing (CIDR) notation to specify contiguous blocks of IPv4 and/or IPv6
   addresses that should be trusted to provide X-Forwarded-For headers.
-* Preferences 'watchcreations' and 'watchdefault' ("Add pages I create and 
files
-  I upload to my watchlist", "Add pages and files I edit to my watchlist") are
-  now enabled by default.
+* Preferences 'watchcreations', 'watchdefault', 'enotifwatchlistpages' ("Add
+  pages I create and files I upload to my watchlist", "Add pages and files I
+  edit to my watchlist", "Email me when a page or file on my watchlist is
+  changed") are now enabled by default.
 * $wgLBFactoryConf: Class names have had underscores removed. The configuration
   should be updated if LBFactory_Simple or LBFactory_Multi is configured.
 * $wgPasswordSenderName has been deprecated. To set a custom mailer name,
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9264947..2b05e1e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3981,7 +3981,7 @@
'enotifminoredits' => 0,
'enotifrevealaddr' => 0,
'enotifusertalkpages' => 1,
-   'enotifwatchlistpages' => 0,
+   'enotifwatchlistpages' => 1,
'extendwatchlist' => 0,
'fancysig' => 0,
'forceeditsummary' => 0,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9757cff9728f377363c540b1ab809679a1bfa01d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Added captcha support for editing. - change (apps...wikipedia)

2014-01-27 Thread Mhurd (Code Review)

Mhurd has uploaded a new change for review.

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


Change subject: Added captcha support for editing.
..

Added captcha support for editing.

Change-Id: I3a09db1bb56018a0e6caa998a51f20b478498870
---
M Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard
M Wikipedia-iOS/Data/Operations/UploadSectionWikiTextOp.h
M Wikipedia-iOS/Data/Operations/UploadSectionWikiTextOp.m
M Wikipedia-iOS/View Controllers/SectionEditor/SectionEditorViewController.h
M Wikipedia-iOS/View Controllers/SectionEditor/SectionEditorViewController.m
5 files changed, 186 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/19/109819/1

diff --git a/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard 
b/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard
index a44c1b4..0d63b99 100644
--- a/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard
+++ b/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard
@@ -154,13 +154,6 @@
 
 
 
-
-
-
-
-
-
-
 
 
 
@@ -181,14 +174,66 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
+
+
 
 
 
-
+
+
 
 
 
@@ -197,7 +242,11 @@
 
 
 
+
+
+
 
+
 
 
 
diff --git a/Wikipedia-iOS/Data/Operations/UploadSectionWikiTextOp.h 
b/Wikipedia-iOS/Data/Operations/UploadSectionWikiTextOp.h
index 6796a14..041c988 100644
--- a/Wikipedia-iOS/Data/Operations/UploadSectionWikiTextOp.h
+++ b/Wikipedia-iOS/Data/Operations/UploadSectionWikiTextOp.h
@@ -2,12 +2,20 @@
 
 #import "MWNetworkOp.h"
 
+typedef enum {
+WIKITEXT_UPLOAD_ERROR_SERVER = 0,
+WIKITEXT_UPLOAD_ERROR_UNKNOWN = 1,
+WIKITEXT_UPLOAD_ERROR_NEEDS_CAPTCHA = 2
+} UploadSectionWikiTextOpErrors;
+
 @interface UploadSectionWikiTextOp : MWNetworkOp
 
 - (id)initForPageTitle: (NSString *)title
 domain: (NSString *)domain
section: (NSNumber *)section
   wikiText: (NSString *)wikiText
+  captchaId: (NSString *)captchaId
+  captchaWord: (NSString *)captchaWord
c

[MediaWiki-commits] [Gerrit] Add public domain license handling - change (mediawiki...CommonsMetadata)

2014-01-27 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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


Change subject: Add public domain license handling
..

Add public domain license handling

* recognize licenses with shortname 'Public domain', return 'pd' as license name
* split license parsing into its own class
* add some sanity tests for main class

Change-Id: I596696150d5c9b6a6c9209f0fdb1d6904b6fc433
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/117
---
M CommonsMetadata.php
M DataCollector.php
A LicenseParser.php
A tests/phpunit/DataCollectorTest.php
M tests/phpunit/LicenseParserTest.php
5 files changed, 244 insertions(+), 99 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonsMetadata 
refs/changes/20/109820/1

diff --git a/CommonsMetadata.php b/CommonsMetadata.php
index fc7f83e..1d14ec1 100755
--- a/CommonsMetadata.php
+++ b/CommonsMetadata.php
@@ -29,6 +29,7 @@
 $wgAutoloadClasses['CommonsMetadata\DomNavigator'] = __DIR__ . 
'/DomNavigator.php';
 $wgAutoloadClasses['CommonsMetadata\TemplateParser'] = __DIR__ . 
'/TemplateParser.php';
 $wgAutoloadClasses['CommonsMetadata_TemplateParser'] = __DIR__ . 
'/TemplateParser_old.php';
+$wgAutoloadClasses['CommonsMetadata\LicenseParser'] = __DIR__ . 
'/LicenseParser.php';
 
 $wgExtensionMessagesFiles['CommonsMetadata'] =  __DIR__ . 
'/CommonsMetadata.i18n.php';
 
diff --git a/DataCollector.php b/DataCollector.php
index 0f6dbdb..2981906 100755
--- a/DataCollector.php
+++ b/DataCollector.php
@@ -12,17 +12,6 @@
  * Class to handle metadata collection and formatting, and manage more 
specific data extraction classes.
  */
 class DataCollector {
-   /**
-* Nonstandard license name patterns used in 
categories/templates/shortnames
-*/
-   protected static $licenseAliases = array(
-   'cc-by-sa-3.0-migrated' => 'cc-by-sa-3.0',
-   'cc-by-sa-3.0-migrated-with-disclaimers' => 'cc-by-sa-3.0',
-   'cc-by-sa-3.0-2.5-2.0-1.0' => 'cc-by-sa-3.0',
-   'cc-by-sa-2.5-2.0-1.0' => 'cc-by-sa-2.5',
-   'cc-by-2.0-stma' => 'cc-by-2.0',
-   'cc-by-sa-1.0+' => 'cc-by-sa-3.0',
-   );
 
/**
 * Mapping of category names to assesment levels. Array keys are 
regexps which will be
@@ -52,6 +41,9 @@
/** @var TemplateParser */
protected $templateParser;
 
+   /** @var  LicenseParser */
+   protected $licenseParser;
+
/**
 * @param Language $language
 */
@@ -69,8 +61,15 @@
/**
 * @param TemplateParser $templateParser
 */
-   public function setTemplateParser( $templateParser ) {
+   public function setTemplateParser( TemplateParser $templateParser ) {
$this->templateParser = $templateParser;
+   }
+
+   /**
+* @param LicenseParser $licenseParser
+*/
+   public function setLicenseParser( LicenseParser $licenseParser ) {
+   $this->licenseParser = $licenseParser;
}
 
/**
@@ -183,7 +182,7 @@
protected function getLicensesAndRemoveFromCategories( &$categories ) {
$licenses = array();
foreach ( $categories as $i => $category ) {
-   $licenseData = $this->parseLicenseString( $category );
+   $licenseData = 
$this->licenseParser->parseLicenseString( $category );
if ( $licenseData ) {
$licenses[] = $licenseData['name'];
unset( $categories[$i] );
@@ -225,7 +224,7 @@
 */
protected function filterShortnamesAndGetLicense( &$shortNames ) {
foreach ( $shortNames as $name ) {
-   $licenseData = $this->parseLicenseString( $name );
+   $licenseData = 
$this->licenseParser->parseLicenseString( $name );
if ( $licenseData ) {
$shortNames = array( $name );
return $licenseData['name'];
@@ -234,72 +233,4 @@
return null;
}
 
-   /**
-* Takes a license string (could be a category name, template name etc)
-* and returns template information (or null if the license was not 
recognized).
-* Only handles CC licenses for now.
-* The returned array will have the following keys:
-* - family: e.g. cc, gfdl
-* - type: e.g. cc-by-sa
-* - version: e.g. 2.5
-* - region: e.g. nl
-* - name: all the above put together, e.g. cc-by-sa-2.5-nl
-* @param string $str
-* @return array|null
-*/
-   public function parseLicenseString( $str ) {
-   $data = array(
-   'family' => 'cc',
-   'type' => null,
-   'version' => null,
-

[MediaWiki-commits] [Gerrit] Update Flow - change (mediawiki/core)

2014-01-27 Thread Bsitu (Code Review)

Bsitu has submitted this change and it was merged.

Change subject: Update Flow
..


Update Flow

Change-Id: I9ba239693a03d04664535a2ddc6f2f97b63e1ac5
---
M extensions/Flow
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Flow b/extensions/Flow
index c6345c3..38c95f0 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit c6345c3f38478ecca23eb6e8de8055cb52f568b6
+Subproject commit 38c95f0d6984f23a5a20de6553a7a5fb4337ab50

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ba239693a03d04664535a2ddc6f2f97b63e1ac5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 

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

[MediaWiki-commits] [Gerrit] Update Flow - change (mediawiki/core)

2014-01-27 Thread Bsitu (Code Review)

Bsitu has uploaded a new change for review.

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


Change subject: Update Flow
..

Update Flow

Change-Id: I9ba239693a03d04664535a2ddc6f2f97b63e1ac5
---
M extensions/Flow
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/109818/1

diff --git a/extensions/Flow b/extensions/Flow
index c6345c3..38c95f0 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit c6345c3f38478ecca23eb6e8de8055cb52f568b6
+Subproject commit 38c95f0d6984f23a5a20de6553a7a5fb4337ab50

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ba239693a03d04664535a2ddc6f2f97b63e1ac5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] Catch and log exceptions in Contributions\Query - change (mediawiki...Flow)

2014-01-27 Thread EBernhardson (Code Review)

EBernhardson has submitted this change and it was merged.

Change subject: Catch and log exceptions in Contributions\Query
..


Catch and log exceptions in Contributions\Query

Change-Id: I6c386bdd83daef6661a66b79c5b04d4dda77b330
(cherry picked from commit 582a41f21d9be4a9ed5a48426c6b16657ee737ec)
---
M includes/Contributions/Query.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/Contributions/Query.php b/includes/Contributions/Query.php
index 08d25ef..b2b379d 100644
--- a/includes/Contributions/Query.php
+++ b/includes/Contributions/Query.php
@@ -11,6 +11,7 @@
 use Flow\Data\ManagerGroup;
 use Flow\Model\UUID;
 use Flow\Repository\TreeRepository;
+use Flow\Exception\FlowException;
 use User;
 use BagOStuff;
 
@@ -108,7 +109,12 @@
$revisions = $this->findRevisions( $pager, $conditions, 
$limit, $revisionClass );
$this->loadMetadataBatch( $revisions );
foreach ( $revisions as $revision ) {
-   $result = $this->buildResult( $pager, 
$revision, $blockType );
+   try {
+   $result = $this->buildResult( $pager, 
$revision, $blockType );
+   } catch ( FlowException $e ) {
+   $result = false;
+   \MWExceptionHandler::logException( $e );
+   }
if ( $result ) {
$results[] = $result;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c386bdd83daef6661a66b79c5b04d4dda77b330
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Catch and log exceptions in Contributions\Query - change (mediawiki...Flow)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Catch and log exceptions in Contributions\Query
..


Catch and log exceptions in Contributions\Query

Change-Id: I6c386bdd83daef6661a66b79c5b04d4dda77b330
---
M includes/Contributions/Query.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/Contributions/Query.php b/includes/Contributions/Query.php
index 98e57ce..77e9da5 100644
--- a/includes/Contributions/Query.php
+++ b/includes/Contributions/Query.php
@@ -11,6 +11,7 @@
 use Flow\Data\ManagerGroup;
 use Flow\Model\UUID;
 use Flow\Repository\TreeRepository;
+use Flow\Exception\FlowException;
 use User;
 use BagOStuff;
 use Flow\Container;
@@ -108,7 +109,12 @@
$revisions = $this->findRevisions( $pager, $conditions, 
$limit, $revisionClass );
$this->loadMetadataBatch( $revisions );
foreach ( $revisions as $revision ) {
-   $result = $this->buildResult( $pager, 
$revision, $blockType );
+   try {
+   $result = $this->buildResult( $pager, 
$revision, $blockType );
+   } catch ( FlowException $e ) {
+   $result = false;
+   \MWExceptionHandler::logException( $e );
+   }
if ( $result ) {
$results[] = $result;
}

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

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

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

[MediaWiki-commits] [Gerrit] Request maximum image resolution in the API call. - change (mediawiki...MultimediaViewer)

2014-01-27 Thread Aarcos (Code Review)

Aarcos has uploaded a new change for review.

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


Change subject: Request maximum image resolution in the API call.
..

Request maximum image resolution in the API call.

After checking all the code paths (phew !), it seems
this simple change takes care of the resolution issue
that surfaces mainly in iOS devices (see b/60388).

Bug: 60388
Change-Id: I867dd18f782126fb71eb52ec637a2b90b910050d
---
M resources/mmv/mmv.js
M tests/qunit/mmv.test.js
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/17/109817/1

diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index 55658b4..e1953d5 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -278,7 +278,8 @@
}
 
return {
-   requested: requestedWidth,
+   // Factor in pixel ratio so we get as many pixels as 
the device supports, see b/60388
+   requested: requestedWidth * $.devicePixelRatio(),
target: calculatedMaxWidth || targetWidth
};
};
diff --git a/tests/qunit/mmv.test.js b/tests/qunit/mmv.test.js
index f858afb..9445855 100644
--- a/tests/qunit/mmv.test.js
+++ b/tests/qunit/mmv.test.js
@@ -467,7 +467,7 @@
widths = viewer.getImageSizeApiArgs(ui);
 
assert.strictEqual(widths.target, 150/100*200, 'Correct target 
width was computed.');
-   assert.strictEqual(widths.requested, 320, 'Correct requested 
width was computed.');
+   assert.strictEqual(widths.requested, 320 * 
$.devicePixelRatio(), 'Correct requested width was computed.');
 
// Fake viewport dimensions, width/height == 1.0, we are 
limited by width
ui.$imageWrapper.height(600);
@@ -476,7 +476,7 @@
widths = viewer.getImageSizeApiArgs(ui);
 
assert.strictEqual(widths.target, 600, 'Correct target width 
was computed.');
-   assert.strictEqual(widths.requested, 640, 'Correct requested 
width was computed.');
+   assert.strictEqual(widths.requested, 640 * 
$.devicePixelRatio(), 'Correct requested width was computed.');
 
ui.unattach();
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I867dd18f782126fb71eb52ec637a2b90b910050d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Aarcos 

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

[MediaWiki-commits] [Gerrit] Catch and log exceptions in Contributions\Query - change (mediawiki...Flow)

2014-01-27 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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


Change subject: Catch and log exceptions in Contributions\Query
..

Catch and log exceptions in Contributions\Query

Change-Id: I6c386bdd83daef6661a66b79c5b04d4dda77b330
---
M includes/Contributions/Query.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/Contributions/Query.php b/includes/Contributions/Query.php
index 98e57ce..77e9da5 100644
--- a/includes/Contributions/Query.php
+++ b/includes/Contributions/Query.php
@@ -11,6 +11,7 @@
 use Flow\Data\ManagerGroup;
 use Flow\Model\UUID;
 use Flow\Repository\TreeRepository;
+use Flow\Exception\FlowException;
 use User;
 use BagOStuff;
 use Flow\Container;
@@ -108,7 +109,12 @@
$revisions = $this->findRevisions( $pager, $conditions, 
$limit, $revisionClass );
$this->loadMetadataBatch( $revisions );
foreach ( $revisions as $revision ) {
-   $result = $this->buildResult( $pager, 
$revision, $blockType );
+   try {
+   $result = $this->buildResult( $pager, 
$revision, $blockType );
+   } catch ( FlowException $e ) {
+   $result = false;
+   \MWExceptionHandler::logException( $e );
+   }
if ( $result ) {
$results[] = $result;
}

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

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

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

[MediaWiki-commits] [Gerrit] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

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

Change subject: Update WikimediaEvents to master
..


Update WikimediaEvents to master

Change-Id: If8976f3d130f88f9f15954f2766afd3fcee47794
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index e75c08b..40b3fe3 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba
+Subproject commit 40b3fe3d8e4a26a9e11d022cd51eaca8a1762120

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8976f3d130f88f9f15954f2766afd3fcee47794
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf10
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] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

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

Change subject: Update WikimediaEvents to master
..


Update WikimediaEvents to master

Change-Id: Icf72f86cf2b83952a301b7f9c67325025185c768
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index e75c08b..40b3fe3 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba
+Subproject commit 40b3fe3d8e4a26a9e11d022cd51eaca8a1762120

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf72f86cf2b83952a301b7f9c67325025185c768
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
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] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Update WikimediaEvents to master
..

Update WikimediaEvents to master

Change-Id: Icf72f86cf2b83952a301b7f9c67325025185c768
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/109813/1

diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index e75c08b..40b3fe3 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba
+Subproject commit 40b3fe3d8e4a26a9e11d022cd51eaca8a1762120

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf72f86cf2b83952a301b7f9c67325025185c768
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Update WikimediaEvents to master
..

Update WikimediaEvents to master

Change-Id: If8976f3d130f88f9f15954f2766afd3fcee47794
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index e75c08b..40b3fe3 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba
+Subproject commit 40b3fe3d8e4a26a9e11d022cd51eaca8a1762120

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8976f3d130f88f9f15954f2766afd3fcee47794
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf10
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Use ve.trackSubscribe - change (mediawiki...WikimediaEvents)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Use ve.trackSubscribe
..


Use ve.trackSubscribe

From I6b3f10b0d on, VisualEditor events are also published using mw.track, but
it has not been deployed to production yet.

Change-Id: I666adb0a07beea452617885c01a4b16957c0de3b
---
M modules/ext.wikimediaEvents.ve.js
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.ve.js 
b/modules/ext.wikimediaEvents.ve.js
index aa4c1e2..2fba4b1 100644
--- a/modules/ext.wikimediaEvents.ve.js
+++ b/modules/ext.wikimediaEvents.ve.js
@@ -5,6 +5,10 @@
 ( function ( mw ) {
var timer = null, queue = [];
 
+   if ( !ve.trackSubscribe ) {
+   return;
+   }
+
function dispatch() {
var points = [];
while ( queue.length ) {
@@ -15,9 +19,9 @@
} );
}
 
-   mw.trackSubscribe( 've.performance', function ( topic, data ) {
+   ve.trackSubscribe( 'performance', function ( topic, data ) {
if ( data.duration ) {
-   queue.push( topic + '=' + Math.round( data.duration ) );
+   queue.push( 've.' + topic + '=' + Math.round( 
data.duration ) );
clearTimeout( timer );
timer = setTimeout( dispatch, 2000 );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I666adb0a07beea452617885c01a4b16957c0de3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
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] Use ve.trackSubscribe - change (mediawiki...WikimediaEvents)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Use ve.trackSubscribe
..

Use ve.trackSubscribe

From I6b3f10b0d on, VisualEditor events are also published using mw.track, but
it has not been deployed to production yet.

Change-Id: I666adb0a07beea452617885c01a4b16957c0de3b
---
M modules/ext.wikimediaEvents.ve.js
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/12/109812/1

diff --git a/modules/ext.wikimediaEvents.ve.js 
b/modules/ext.wikimediaEvents.ve.js
index aa4c1e2..2fba4b1 100644
--- a/modules/ext.wikimediaEvents.ve.js
+++ b/modules/ext.wikimediaEvents.ve.js
@@ -5,6 +5,10 @@
 ( function ( mw ) {
var timer = null, queue = [];
 
+   if ( !ve.trackSubscribe ) {
+   return;
+   }
+
function dispatch() {
var points = [];
while ( queue.length ) {
@@ -15,9 +19,9 @@
} );
}
 
-   mw.trackSubscribe( 've.performance', function ( topic, data ) {
+   ve.trackSubscribe( 'performance', function ( topic, data ) {
if ( data.duration ) {
-   queue.push( topic + '=' + Math.round( data.duration ) );
+   queue.push( 've.' + topic + '=' + Math.round( 
data.duration ) );
clearTimeout( timer );
timer = setTimeout( dispatch, 2000 );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I666adb0a07beea452617885c01a4b16957c0de3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
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] Drop data from Elasticsearch we don't need - change (mediawiki...CirrusSearch)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Drop data from Elasticsearch we don't need
..


Drop data from Elasticsearch we don't need

The big thing this fixes is that having more redirects on a page no longer
makes each redirect worth less.

This also saves about 8.5% of space on my development index.  I'm not sure
how much space it'll save on a more real wiki but it should help.

Bug: 60045
Change-Id: I35528e02e50dac5a89c3022e84c34a99ca800af5
---
M includes/MappingConfigBuilder.php
M tests/browser/features/full_text.feature
M tests/browser/features/support/hooks.rb
3 files changed, 55 insertions(+), 23 deletions(-)

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



diff --git a/includes/MappingConfigBuilder.php 
b/includes/MappingConfigBuilder.php
index 777d2a6..b1d263e 100644
--- a/includes/MappingConfigBuilder.php
+++ b/includes/MappingConfigBuilder.php
@@ -48,21 +48,26 @@
 * @return array the mapping config
 */
public function buildConfig() {
+   $suggestExtra = array( 'analyzer' => 'suggest' );
// Note never to set something as type='object' here because 
that isn't returned by elasticsearch
// and is infered anyway.
$titleExtraAnalyzers = array(
-   'suggest',
-   array( 'index' => 'prefix', 'search' => 'near_match' ),
-   'near_match',
-   'keyword',
+   $suggestExtra,
+   array( 'index_analyzer' => 'prefix', 'search_analyzer' 
=> 'near_match', 'index_options' => 'docs' ),
+   array( 'analyzer' => 'near_match', 'index_options' => 
'docs' ),
+   array( 'analyzer' => 'keyword', 'index_options' => 
'docs' ),
);
if ( $this->prefixSearchStartsWithAnyWord ) {
-   $titleExtraAnalyzers[] = array( 'index' => 
'word_prefix', 'search' => 'plain' );
+   $titleExtraAnalyzers[] = array(
+   'index_analyzer' => 'word_prefix',
+   'search_analyzer' => 'plain',
+   'index_options' => 'docs'
+   );
}
 
$textExtraAnalyzers = array();
if ( $this->phraseUseText ) {
-   $textExtraAnalyzers[] = 'suggest';
+   $textExtraAnalyzers[] = $suggestExtra;
}
 
$config = array(
@@ -89,14 +94,14 @@
'template' => 
$this->buildLowercaseKeywordField(),
'outgoing_link' => $this->buildKeywordField(),
'external_link' => $this->buildKeywordField(),
-   'heading' => $this->buildStringField( 'heading' 
),
+   'heading' => $this->buildStringField( 
'heading', array(), false ),
'text_bytes' => $this->buildLongField(),
'text_words' => $this->buildLongField(),  
// TODO remove once text.word_count is available everywhere
'redirect' => array(
'dynamic' => false,
'properties' => array(
'namespace' =>  
$this->buildLongField(),
-   'title' => 
$this->buildStringField( 'title', array( 'suggest' ) ),
+   'title' => 
$this->buildStringField( 'title', array( $suggestExtra ), false ),
)
),
'incoming_links' => $this->buildLongField(),
@@ -110,11 +115,13 @@
 
/**
 * Build a string field that does standard analysis for the language.
-* @param $name string|null Name of the field.
-* @param $extra array|null Extra analyzers for this field beyond the 
basic text and plain.
+* @param string $name Name of the field.
+* @param array|null $extra Extra analyzers for this field beyond the 
basic text and plain.
+* @param boolean $enableNorms Should length norms be enabled for the 
field?  Defaults to true.
 * @return array definition of the field
 */
-   public function buildStringField( $name, $extra = array() ) {
+   public function buildStringField( $name, $extra = array(), $enableNorms 
= true ) {
+   $norms = array( 'enabled' => $enableNorms );
$field = array(
'type' => 'multi_field',
'fields' => array(
@@ -123,30 +130,28 @@
'analyzer' => 'text',

[MediaWiki-commits] [Gerrit] Save back parser output to cache in RefreshLinks - change (mediawiki/core)

2014-01-27 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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


Change subject: Save back parser output to cache in RefreshLinks
..

Save back parser output to cache in RefreshLinks

* Those only applies to non-fast parses to avoid cache churn

Change-Id: If3763811a3aa6360799a10ff64a725f17d8cee6d
---
M includes/job/jobs/RefreshLinksJob.php
1 file changed, 19 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/109811/1

diff --git a/includes/job/jobs/RefreshLinksJob.php 
b/includes/job/jobs/RefreshLinksJob.php
index 78ac84d..3bcb4fc 100644
--- a/includes/job/jobs/RefreshLinksJob.php
+++ b/includes/job/jobs/RefreshLinksJob.php
@@ -35,6 +35,8 @@
  * @ingroup JobQueue
  */
 class RefreshLinksJob extends Job {
+   const PARSE_THRESHOLD_SEC = 1.0;
+
function __construct( $title, $params = '' ) {
parent::__construct( 'refreshLinks', $title, $params );
// Base backlink update jobs and per-title update jobs can be 
de-duplicated.
@@ -114,6 +116,8 @@
wfGetLB()->waitFor( $this->params['masterPos'] );
}
 
+   $page = WikiPage::factory( $title );
+
// Fetch the current revision...
$revision = Revision::newFromTitle( $title, false, 
Revision::READ_NORMAL );
if ( !$revision ) {
@@ -127,18 +131,17 @@
}
 
$parserOutput = false;
+   $parserOptions = $page->makeParserOptions( 'canonical' );
// If page_touched changed after this root job (with a good 
slave lag skew factor),
// then it is likely that any views of the pages already 
resulted in re-parses which
// are now in cache. This can be reused to avoid expensive 
parsing in some cases.
if ( isset( $this->params['rootJobTimestamp'] ) ) {
-   $page = WikiPage::factory( $title );
$skewedTimestamp = wfTimestamp( TS_UNIX, 
$this->params['rootJobTimestamp'] ) + 5;
if ( $page->getLinksTimestamp() > wfTimestamp( TS_MW, 
$skewedTimestamp ) ) {
// Something already updated the backlinks 
since this job was made
return true;
}
if ( $page->getTouched() > wfTimestamp( TS_MW, 
$skewedTimestamp ) ) {
-   $parserOptions = $page->makeParserOptions( 
'canonical' );
$parserOutput = 
ParserCache::singleton()->getDirty( $page, $parserOptions );
if ( $parserOutput && 
$parserOutput->getCacheTime() <= $skewedTimestamp ) {
$parserOutput = false; // too stale
@@ -147,8 +150,21 @@
}
// Fetch the current revision and parse it if necessary...
if ( $parserOutput == false ) {
+   $start = microtime( true );
// Revision ID must be passed to the parser output to 
get revision variables correct
-   $parserOutput = $content->getParserOutput( $title, 
$revision->getId(), null, false );
+   $parserOutput = $content->getParserOutput(
+   $title, $revision->getId(), $parserOptions, 
false );
+   $ellapsed = microtime( true ) - $start;
+   // If it took a long time to render, then save this 
back to the cache to avoid
+   // wasted CPU by other apaches or job runners. We don't 
want to always save to
+   // cache as this cause cause high cache I/O and LRU 
churn when a template changes.
+   if ( $ellapsed >= self::PARSE_THRESHOLD_SEC
+   && $page->isParserCacheUsed( $parserOptions, 
$revision->getId() )
+   && $parserOutput->isCacheable()
+   ) {
+   $ctime = wfTimestamp( TS_MW, (int)$start ); // 
cache time
+   ParserCache::singleton()->save( $parserOutput, 
$page, $parserOptions, $ctime );
+   }
}
 
$updates = $content->getSecondaryDataUpdates( $title, null, 
false, $parserOutput );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3763811a3aa6360799a10ff64a725f17d8cee6d
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] Update Flow - change (mediawiki/core)

2014-01-27 Thread Bsitu (Code Review)

Bsitu has submitted this change and it was merged.

Change subject: Update Flow
..


Update Flow

Change-Id: I2f027909ffea78e31b061dd2a4c4b51ced43e253
---
M extensions/Flow
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Flow b/extensions/Flow
index a525b6c..c6345c3 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit a525b6c7177c62a36e44438e876bb618869e7df7
+Subproject commit c6345c3f38478ecca23eb6e8de8055cb52f568b6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f027909ffea78e31b061dd2a4c4b51ced43e253
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 

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

[MediaWiki-commits] [Gerrit] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Update WikimediaEvents to master
..


Update WikimediaEvents to master

Change-Id: I2c1637598afe7b1ac94f1613bdf28bb9be71da59
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index 9e0df46..e75c08b 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit 9e0df46bb2f89527896a1ba57042a2b69b5c7c84
+Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c1637598afe7b1ac94f1613bdf28bb9be71da59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf10
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] Update Flow - change (mediawiki/core)

2014-01-27 Thread Bsitu (Code Review)

Bsitu has uploaded a new change for review.

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


Change subject: Update Flow
..

Update Flow

Change-Id: I2f027909ffea78e31b061dd2a4c4b51ced43e253
---
M extensions/Flow
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/109810/1

diff --git a/extensions/Flow b/extensions/Flow
index a525b6c..c6345c3 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit a525b6c7177c62a36e44438e876bb618869e7df7
+Subproject commit c6345c3f38478ecca23eb6e8de8055cb52f568b6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f027909ffea78e31b061dd2a4c4b51ced43e253
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] Ignore temp files from jedit - change (mediawiki...Flow)

2014-01-27 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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


Change subject: Ignore temp files from jedit
..

Ignore temp files from jedit

Change-Id: I248e280908e407382bf4b0011c998d97b10dc058
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 3e45dad..774853b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.kate-swp
 .*.swp
 scripts/hhvm-wrapper.phar
+\#*#

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

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

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

[MediaWiki-commits] [Gerrit] Rough sketch of using OOJS and OOJS-UI for data model and UI - change (mediawiki...Flow)

2014-01-27 Thread Trevor Parscal (Code Review)

Trevor Parscal has uploaded a new change for review.

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


Change subject: Rough sketch of using OOJS and OOJS-UI for data model and UI
..

Rough sketch of using OOJS and OOJS-UI for data model and UI

Objective:
* Demonstrate what a rich-client implementation of flow would look like

Change-Id: I9ad2c22d37f14124603a118e610e6c00cb00903a
---
A demos/rewrite/demo.css
A demos/rewrite/demo.js
A demos/rewrite/index.html
A lib/jquery/jquery.js
A lib/oojs-ui/images/fade-down.png
A lib/oojs-ui/images/fade-up.png
A lib/oojs-ui/images/icons/accept.png
A lib/oojs-ui/images/icons/accept.svg
A lib/oojs-ui/images/icons/add-item.png
A lib/oojs-ui/images/icons/add-item.svg
A lib/oojs-ui/images/icons/alert.png
A lib/oojs-ui/images/icons/alert.svg
A lib/oojs-ui/images/icons/arched-arrow-ltr.png
A lib/oojs-ui/images/icons/arched-arrow-ltr.svg
A lib/oojs-ui/images/icons/arched-arrow-rtl.png
A lib/oojs-ui/images/icons/arched-arrow-rtl.svg
A lib/oojs-ui/images/icons/check.png
A lib/oojs-ui/images/icons/check.svg
A lib/oojs-ui/images/icons/clear.png
A lib/oojs-ui/images/icons/clear.svg
A lib/oojs-ui/images/icons/close.png
A lib/oojs-ui/images/icons/close.svg
A lib/oojs-ui/images/icons/code.png
A lib/oojs-ui/images/icons/code.svg
A lib/oojs-ui/images/icons/collapse.png
A lib/oojs-ui/images/icons/collapse.svg
A lib/oojs-ui/images/icons/comment.png
A lib/oojs-ui/images/icons/comment.svg
A lib/oojs-ui/images/icons/expand.png
A lib/oojs-ui/images/icons/expand.svg
A lib/oojs-ui/images/icons/help.png
A lib/oojs-ui/images/icons/help.svg
A lib/oojs-ui/images/icons/history.png
A lib/oojs-ui/images/icons/history.svg
A lib/oojs-ui/images/icons/link.png
A lib/oojs-ui/images/icons/link.svg
A lib/oojs-ui/images/icons/menu.png
A lib/oojs-ui/images/icons/menu.svg
A lib/oojs-ui/images/icons/move-ltr.png
A lib/oojs-ui/images/icons/move-ltr.svg
A lib/oojs-ui/images/icons/move-rtl.png
A lib/oojs-ui/images/icons/move-rtl.svg
A lib/oojs-ui/images/icons/picture.png
A lib/oojs-ui/images/icons/picture.svg
A lib/oojs-ui/images/icons/remove-item.png
A lib/oojs-ui/images/icons/remove-item.svg
A lib/oojs-ui/images/icons/remove.png
A lib/oojs-ui/images/icons/remove.svg
A lib/oojs-ui/images/icons/search.png
A lib/oojs-ui/images/icons/search.svg
A lib/oojs-ui/images/icons/settings.png
A lib/oojs-ui/images/icons/settings.svg
A lib/oojs-ui/images/icons/tag.png
A lib/oojs-ui/images/icons/tag.svg
A lib/oojs-ui/images/icons/window.png
A lib/oojs-ui/images/icons/window.svg
A lib/oojs-ui/images/indicators/down.png
A lib/oojs-ui/images/indicators/down.svg
A lib/oojs-ui/images/indicators/required.png
A lib/oojs-ui/images/indicators/required.svg
A lib/oojs-ui/images/indicators/up.png
A lib/oojs-ui/images/indicators/up.svg
A lib/oojs-ui/images/tail.svg
A lib/oojs-ui/images/textures/pending.gif
A lib/oojs-ui/images/textures/transparency.png
A lib/oojs-ui/images/toolbar-shadow.png
A lib/oojs-ui/oojs-ui.js
A lib/oojs-ui/oojs-ui.svg.css
A lib/oojs/oojs.js
A modules/flow/dm/flow.dm.Board.js
A modules/flow/dm/flow.dm.Item.js
A modules/flow/dm/flow.dm.List.js
A modules/flow/dm/flow.dm.Post.js
A modules/flow/dm/flow.dm.Topic.js
A modules/flow/dm/flow.dm.js
A modules/flow/flow.js
A modules/flow/ui/flow.ui.Board.js
A modules/flow/ui/flow.ui.Item.js
A modules/flow/ui/flow.ui.List.js
A modules/flow/ui/flow.ui.Post.js
A modules/flow/ui/flow.ui.ReplyWidget.js
A modules/flow/ui/flow.ui.TimestampWidget.js
A modules/flow/ui/flow.ui.Topic.js
A modules/flow/ui/flow.ui.UsernameWidget.js
A modules/flow/ui/flow.ui.js
A modules/flow/ui/styles/flow.ui.Board.css
A modules/flow/ui/styles/flow.ui.Post.css
A modules/flow/ui/styles/flow.ui.Topic.css
A modules/flow/ui/styles/flow.ui.Widget.css
A modules/flow/ui/styles/flow.ui.css
90 files changed, 20,650 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad2c22d37f14124603a118e610e6c00cb00903a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal 

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

[MediaWiki-commits] [Gerrit] QA: Tests for story 1628 - change (mediawiki...MobileFrontend)

2014-01-27 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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


Change subject: QA: Tests for story 1628
..

QA: Tests for story 1628

Change-Id: I4ceb6c81f2be72a08622cca8d4db813cc98aa49c
Dependency: I4c72b4b9128b3a74de8b8b5bce7664fbb315216b
---
M javascripts/modules/editor/VisualEditorOverlay.js
M tests/browser/features/editor-ve.feature
M tests/browser/features/step_definitions/common_article_steps.rb
M tests/browser/features/support/pages/article_page.rb
4 files changed, 48 insertions(+), 0 deletions(-)


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

diff --git a/javascripts/modules/editor/VisualEditorOverlay.js 
b/javascripts/modules/editor/VisualEditorOverlay.js
index 76c1151..293629d 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -7,6 +7,7 @@
templatePartials: {
content: M.template.get( 
'modules/editor/VisualEditorOverlay' )
},
+   className: 'overlay editor-overlay editor-overlay-ve',
initialize: function( options ) {
var self = this;
this._super( options );
diff --git a/tests/browser/features/editor-ve.feature 
b/tests/browser/features/editor-ve.feature
index c2877375f..afd1334 100644
--- a/tests/browser/features/editor-ve.feature
+++ b/tests/browser/features/editor-ve.feature
@@ -1,6 +1,17 @@
 @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
 Feature: VisualEditor
 
+Scenario: Toolbar VisualEditor
+  Given I am in alpha mode
+And I am logged into the mobile website
+  When I am on the Selenium Edit Test article
+And I click edit
+  Then I see the VisualEditor overlay
+And I see a toolbar in the overlay header
+And The VisualEditor toolbar has a bold button
+And The VisualEditor toolbar has an italic button
+And The VisualEditor toolbar has an underline button
+
 Scenario: I can edit a page using VisualEditor
   Given I am in alpha mode
 And I am logged into the mobile website
diff --git a/tests/browser/features/step_definitions/common_article_steps.rb 
b/tests/browser/features/step_definitions/common_article_steps.rb
index a2f817f..36deda9 100644
--- a/tests/browser/features/step_definitions/common_article_steps.rb
+++ b/tests/browser/features/step_definitions/common_article_steps.rb
@@ -6,6 +6,26 @@
   on(ArticlePage).editor_text_area_element.when_present.send_keys(text)
 end
 
+Then(/^I see the VisualEditor overlay$/) do
+  on(ArticlePage).overlay_ve_element.when_present.should exist
+end
+
+Then(/^I see a toolbar in the overlay header$/) do
+  on(ArticlePage).overlay_ve_header_toolbar_element.when_present.should exist
+end
+
+Then(/^The VisualEditor toolbar has a bold button$/) do
+  
on(ArticlePage).overlay_ve_header_toolbar_bold_button_element.when_present.should
 exist
+end
+
+Then(/^The VisualEditor toolbar has an italic button$/) do
+  
on(ArticlePage).overlay_ve_header_toolbar_italic_button_element.when_present.should
 exist
+end
+
+Then(/^The VisualEditor toolbar has an underline button$/) do
+  
on(ArticlePage).overlay_ve_header_toolbar_underline_button_element.when_present.should
 exist
+end
+
 Given(/^I type (.+) into VisualEditor$/) do |text|
   on(ArticlePage) do |page|
 page.editor_ve_element.when_present.fire_event("onfocus")
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 82683f3..53e9a2e 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -57,6 +57,22 @@
   div(:keep_going, class:'overlay-bottom')
 
   # visual editor
+  div(:overlay_ve, class: "overlay editor-overlay editor-overlay-ve")
+  div(:overlay_ve_header) do |page|
+page.overlay_ve_element.div_element(class: "overlay-header-container 
position-fixed")
+  end
+  div(:overlay_ve_header_toolbar) do |page|
+page.overlay_ve_header_element.div_element(class: "oo-ui-toolbar-bar")
+  end
+  div(:overlay_ve_header_toolbar_bold_button) do |page|
+page.overlay_ve_header_element.link_element(title: "Bold ⌘B")
+  end
+  div(:overlay_ve_header_toolbar_underline_button) do |page|
+page.overlay_ve_header_element.link_element(title: "Underline ⌘U")
+  end
+  div(:overlay_ve_header_toolbar_italic_button) do |page|
+page.overlay_ve_header_element.link_element(title: "Italic ⌘I")
+  end
   div(:editor_ve, class: "ve-ce-documentNode ve-ce-branchNode")
 
   # toast

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ceb6c81f2be72a08622cca8d4db813cc98aa49c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branc

[MediaWiki-commits] [Gerrit] Make sure previous.overlay is defined before using it - change (mediawiki...MobileFrontend)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Make sure previous.overlay is defined before using it
..


Make sure previous.overlay is defined before using it

In the case where an overlay doesn't completely load before the
user hits the back button, it would throw a JS error. This prevents
the error.

Change-Id: I00e37f99b32a15dc79a0d9c11ab485e33137bd6c
---
M javascripts/common/OverlayManager.js
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/javascripts/common/OverlayManager.js 
b/javascripts/common/OverlayManager.js
index aad1498..15a2d2b 100644
--- a/javascripts/common/OverlayManager.js
+++ b/javascripts/common/OverlayManager.js
@@ -61,7 +61,11 @@
} );
 
// force hide only if more overlays in stack
-   if ( previous && this.hidePrevious && 
!previous.overlay.hide( this.stack.length > 1 ) ) {
+   if ( previous &&
+   previous.overlay !== undefined &&
+   this.hidePrevious &&
+   !previous.overlay.hide( this.stack.length > 1 )
+   ) {
// if hide prevented, prevent route change event
ev.preventDefault();
} else if ( !match ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00e37f99b32a15dc79a0d9c11ab485e33137bd6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Awjrichards 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Story 1628: Move VisualEditor toolbar to Overlay header - change (mediawiki...VisualEditor)

2014-01-27 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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


Change subject: Story 1628: Move VisualEditor toolbar to Overlay header
..

Story 1628: Move VisualEditor toolbar to Overlay header

Introduce toolbarOptions to provide more flexibility to the toolbar
Update the mobile toolbar to only have B, I and U tools

Change-Id: I4c72b4b9128b3a74de8b8b5bce7664fbb315216b
---
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 20 insertions(+), 30 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index 2400045..53e735c 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -33,42 +33,22 @@
 
 OO.inheritClass( ve.init.mw.MobileViewTarget, ve.init.mw.Target );
 
+
 /* Static Properties */
+ve.init.mw.MobileViewTarget.static.toolbarOptions = {
+   insertBefore: false,
+   appendTo: '.overlay-header > div',
+   floatable: false
+};
 
 ve.init.mw.MobileViewTarget.static.toolbarGroups = [
-   { 'include': [ 'undo', 'redo' ] },
-   {
-   'type': 'menu',
-   'indicator': 'down',
-   'include': [ { 'group': 'format' } ],
-   'promote': [ 'paragraph' ],
-   'demote': [ 'preformatted', 'heading1' ]
-   },
-   { 'include': [ 'bold', 'italic', 'link', 'clear' ] },
-   { 'include': [ 'number', 'bullet', 'outdent', 'indent' ] },
-   { 'include': '*', 'exclude': [ { 'group': 'format' }, 'reference', 
'referenceList', 'mediaEdit', 'mediaInsert', 'transclusion' ] }
+   { 'include': [ 'bold', 'italic', 'underline' ] }
 ];
 
 ve.init.mw.MobileViewTarget.static.surfaceCommands = [
-   'undo',
-   'redo',
'bold',
'italic',
-   'link',
-   'clear',
'underline',
-   'subscript',
-   'superscript',
-   'indent',
-   'outdent',
-   'paragraph',
-   'heading1',
-   'heading2',
-   'heading3',
-   'heading4',
-   'heading5',
-   'heading6',
-   'preformatted'
 ];
 
 /* Methods */
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5c246a4..1434135 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -201,6 +201,11 @@
 
 ];
 
+ve.init.mw.Target.static.toolbarOptions = {
+   insertBefore: '#firstHeading',
+   floatable: true
+};
+
 /* Static Methods */
 
 /**
@@ -1159,15 +1164,20 @@
  * @method
  */
 ve.init.mw.Target.prototype.setUpToolbar = function () {
+   var options = this.constructor.static.toolbarOptions;
this.toolbar = new ve.ui.TargetToolbar( this, this.surface, { 'shadow': 
true, 'actions': true } );
this.toolbar.setup( this.constructor.static.toolbarGroups );
this.surface.addCommands( this.constructor.static.surfaceCommands );
-   if ( !this.isMobileDevice ) {
+   if ( options.floatable ) {
this.toolbar.enableFloatable();
}
this.toolbar.$element
-   .addClass( 've-init-mw-viewPageTarget-toolbar' )
-   .insertBefore( $( '#firstHeading' ).length > 0 ? 
'#firstHeading' : this.surface.$element );
+   .addClass( 've-init-mw-viewPageTarget-toolbar' );
+   if ( options.insertBefore ) {
+   this.toolbar.$element.insertBefore( $( options.insertBefore 
).length > 0 ? options.insertBefore : this.surface.$element );
+   } else if ( options.appendTo ) {
+   this.toolbar.$element.appendTo( options.appendTo );
+   }
this.toolbar.$bar.slideDown( 'fast', ve.bind( function () {
// Check the surface wasn't torn down while the toolbar was 
animating
if ( this.surface ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c72b4b9128b3a74de8b8b5bce7664fbb315216b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Remove cloning where it isn't happening anyways. - change (mediawiki...parsoid)

2014-01-27 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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


Change subject: Remove cloning where it isn't happening anyways.
..

Remove cloning where it isn't happening anyways.

Follows f10c6df593a764141cbccb217ababe3eae87e53a.

Change-Id: I52130ec5ea911fe3f11007c69c39280b220bb542
---
M lib/ext.core.Sanitizer.js
M lib/mediawiki.Util.js
M lib/mediawiki.parser.defines.js
3 files changed, 7 insertions(+), 10 deletions(-)


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

diff --git a/lib/ext.core.Sanitizer.js b/lib/ext.core.Sanitizer.js
index ad2f822..f4de420 100644
--- a/lib/ext.core.Sanitizer.js
+++ b/lib/ext.core.Sanitizer.js
@@ -749,14 +749,13 @@
 
// keep html-pre content tokens for 
later use
if ( !( htmlpre && k === "content" ) ) {
-   var newKV = Util.clone(kv);
if ( Array.isArray(k) ) {
-   newKV.k = 
Util.tokensToString ( k );
+   kv.k = 
Util.tokensToString ( k );
}
if ( Array.isArray(v) ) {
-   newKV.v = 
Util.tokensToString ( v );
+   kv.v = 
Util.tokensToString ( v );
}
-   attribs[i] = newKV;
+   attribs[i] = kv;
}
 
}
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index b437f8e..9f02b66 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -586,9 +586,8 @@
expandParserValueValues: function(kvs, cb, wrapTemplates) {
var v,
reassembleKV = function( kv, cb2, v )  {
-   var newKV = Util.clone(kv);
-   newKV.v = v;
-   cb2(null, newKV);
+   kv.v = v;
+   cb2(null, kv);
};
 
 
diff --git a/lib/mediawiki.parser.defines.js b/lib/mediawiki.parser.defines.js
index 40f7bab..2dcafe2 100644
--- a/lib/mediawiki.parser.defines.js
+++ b/lib/mediawiki.parser.defines.js
@@ -132,9 +132,8 @@
var kv = this.attribs[i],
k = kv.k;
if ( k.constructor === String && k.toLowerCase() === 
name ) {
-   var newKV = Util.clone(kv);
-   newKV.v = value;
-   this.attribs[i] = newKV;
+   kv.v = value;
+   this.attribs[i] = kv;
return;
}
}

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

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

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

[MediaWiki-commits] [Gerrit] repool db1006, warm up - change (operations/mediawiki-config)

2014-01-27 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: repool db1006, warm up
..


repool db1006, warm up

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index b0f741d..81a4e93 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -130,7 +130,7 @@
'db1010'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager
'db1023'   => 400,
'db1015'   => 400,
-   # schema changes 'db1006'   => 400,
+   'db1006'   => 50, # warm up
),
's7' => array(
'db1033' => 0,

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

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

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

[MediaWiki-commits] [Gerrit] repool db1006, warm up - change (operations/mediawiki-config)

2014-01-27 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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


Change subject: repool db1006, warm up
..

repool db1006, warm up

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index b0f741d..81a4e93 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -130,7 +130,7 @@
'db1010'   => 0, # watchlist, recentchangeslinked, 
contributions, logpager
'db1023'   => 400,
'db1015'   => 400,
-   # schema changes 'db1006'   => 400,
+   'db1006'   => 50, # warm up
),
's7' => array(
'db1033' => 0,

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

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

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

[MediaWiki-commits] [Gerrit] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

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

Change subject: Update WikimediaEvents to master
..


Update WikimediaEvents to master

Change-Id: Ic2fbfc131674a1ad2a20ab7c83c33678726a44f3
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index 9e0df46..e75c08b 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit 9e0df46bb2f89527896a1ba57042a2b69b5c7c84
+Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2fbfc131674a1ad2a20ab7c83c33678726a44f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
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] Catch and log errors in contributions formatting - change (mediawiki...Flow)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Catch and log errors in contributions formatting
..


Catch and log errors in contributions formatting

Change-Id: I0afcdcd5063217fa06cb42083582cfb2fdb2b13e
(cherry picked from commit 3549cda53fc7654154028109cbad9456d3aef02a)
---
M includes/Contributions/Formatter.php
M includes/Model/Workflow.php
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/includes/Contributions/Formatter.php 
b/includes/Contributions/Formatter.php
index 9e4a25a..63c2ae7 100644
--- a/includes/Contributions/Formatter.php
+++ b/includes/Contributions/Formatter.php
@@ -3,6 +3,7 @@
 namespace Flow\Contributions;
 
 use Flow\AbstractFormatter;
+use Flow\Exception\FlowException;
 use ContribsPager;
 use Html;
 
@@ -13,6 +14,15 @@
 * @return string|bool HTML for contributions entry, or false on failure
 */
public function format( ContribsPager $pager, $row ) {
+   try {
+   return $this->formatReal( $pager, $row );
+   } catch ( FlowException $e ) {
+   \MWExceptionHandler::logException( $e );
+   return false;
+   }
+   }
+
+   protected function formatReal( ContribsPager $pager, $row ) {
// Get all necessary objects
$workflow = $row->workflow;
$revision = $row->revision;
diff --git a/includes/Model/Workflow.php b/includes/Model/Workflow.php
index 99e9b93..72c8972 100644
--- a/includes/Model/Workflow.php
+++ b/includes/Model/Workflow.php
@@ -6,6 +6,7 @@
 use Title;
 use User;
 use Flow\Exception\DataModelException;
+use Flow\Exception\FlowException;
 use Flow\Exception\InvalidInputException;
 
 class Workflow {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0afcdcd5063217fa06cb42083582cfb2fdb2b13e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Catch and log errors in contributions formatting - change (mediawiki...Flow)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Catch and log errors in contributions formatting
..


Catch and log errors in contributions formatting

Change-Id: I0afcdcd5063217fa06cb42083582cfb2fdb2b13e
---
M includes/Contributions/Formatter.php
M includes/Model/Workflow.php
2 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/includes/Contributions/Formatter.php 
b/includes/Contributions/Formatter.php
index ec5c4a6..5847122 100644
--- a/includes/Contributions/Formatter.php
+++ b/includes/Contributions/Formatter.php
@@ -3,6 +3,7 @@
 namespace Flow\Contributions;
 
 use Flow\AbstractFormatter;
+use Flow\Exception\FlowException;
 use ContribsPager;
 use Html;
 
@@ -13,6 +14,15 @@
 * @return string|bool HTML for contributions entry, or false on failure
 */
public function format( ContribsPager $pager, $row ) {
+   try {
+   return $this->formatReal( $pager, $row );
+   } catch ( FlowException $e ) {
+   \MWExceptionHandler::logException( $e );
+   return false;
+   }
+   }
+
+   protected function formatReal( ContribsPager $pager, $row ) {
// Get all necessary objects
$workflow = $row->workflow;
$revision = $row->revision;
diff --git a/includes/Model/Workflow.php b/includes/Model/Workflow.php
index 301ff9f..e5cbe5e 100644
--- a/includes/Model/Workflow.php
+++ b/includes/Model/Workflow.php
@@ -5,8 +5,8 @@
 use MWTimestamp;
 use Title;
 use User;
-use Flow\Exception\FlowException;
 use Flow\Exception\DataModelException;
+use Flow\Exception\FlowException;
 use Flow\Exception\InvalidInputException;
 
 class Workflow {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0afcdcd5063217fa06cb42083582cfb2fdb2b13e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] So many changes... - change (wikimedia...tools)

2014-01-27 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


Change subject: So many changes...
..

So many changes...

Change-Id: Id80816c0e8e67d10a7936a1d1c517752c4c37e0a
---
A silverpop_export/silverpop_countrylangs.sql
M silverpop_export/update.sh
M silverpop_export/update_table.sql
3 files changed, 363 insertions(+), 50 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/02/109802/1

diff --git a/silverpop_export/silverpop_countrylangs.sql 
b/silverpop_export/silverpop_countrylangs.sql
new file mode 100644
index 000..41e1c0f
--- /dev/null
+++ b/silverpop_export/silverpop_countrylangs.sql
@@ -0,0 +1,250 @@
+DROP TABLE IF EXISTS silverpop_countrylangs;
+CREATE TABLE IF NOT EXISTS silverpop_countrylangs(
+  id int unsigned PRIMARY KEY AUTO_INCREMENT,
+  country varchar(2),
+  lang varchar(20),
+
+  INDEX spcl_country (country)
+);
+
+INSERT INTO silverpop_countrylangs (country, lang) VALUES
+  ('AF', 'prs'),
+  ('AL', 'sq'),
+  ('DZ', 'fr'),
+  ('AS', 'sm'),
+  ('AD', 'ca'),
+  ('AO', 'pt'),
+  ('AI', 'en'),
+  ('AQ', 'en'),
+  ('AG', 'en'),
+  ('AR', 'es'),
+  ('AM', 'hy'),
+  ('AW', 'en'),
+  ('AU', 'en'),
+  ('AT', 'de'),
+  ('AZ', 'az'),
+  ('BS', 'en'),
+  ('BH', 'ar'),
+  ('BD', 'bn'),
+  ('BB', 'en'),
+  ('BY', 'be'),
+  ('BE', 'nl'),
+  ('BZ', 'es'),
+  ('BJ', 'fr'),
+  ('BM', 'en'),
+  ('BT', 'dz'),
+  ('BO', 'es'),
+  ('BA', 'bs'),
+  ('BW', 'en'),
+  ('BR', 'pt-br'),
+  ('BN', 'ms'),
+  ('BG', 'bg'),
+  ('BF', 'fr'),
+  ('BI', 'fr'),
+  ('KH', 'km'),
+  ('CM', 'en'),
+  ('CA', 'en'),
+  ('CV', 'pt'),
+  ('KY', 'en'),
+  ('CF', 'fr'),
+  ('TD', 'fr'),
+  ('CL', 'es'),
+  ('CN', 'zh-hans'),
+  ('CX', 'en'),
+  ('CC', 'ms'),
+  ('CO', 'es'),
+  ('KM', 'ar'),
+  ('CG', 'fr'),
+  ('CD', 'fr'),
+  ('CK', 'en'),
+  ('CR', 'es'),
+  ('CI', 'fr'),
+  ('HR', 'hr'),
+  ('CU', 'es'),
+  ('CW', 'nl'),
+  ('CY', 'el'),
+  ('CZ', 'cs'),
+  ('DK', 'da'),
+  ('DJ', 'fr'),
+  ('DM', 'fr'),
+  ('DO', 'es'),
+  ('EC', 'es'),
+  ('EG', 'ar'),
+  ('SV', 'es'),
+  ('GQ', 'es'),
+  ('ER', 'en'),
+  ('EE', 'et'),
+  ('ET', 'en'),
+  ('FK', 'en'),
+  ('FO', 'da'),
+  ('FJ', 'en'),
+  ('FI', 'fi'),
+  ('FR', 'fr'),
+  ('GF', 'fr'),
+  ('PF', 'fr'),
+  ('TF', 'fr'),
+  ('GA', 'fr'),
+  ('GM', 'en'),
+  ('GE', 'ka'),
+  ('DE', 'de'),
+  ('GH', 'en'),
+  ('GI', 'en'),
+  ('GR', 'el'),
+  ('GL', 'da'),
+  ('GD', 'en'),
+  ('GP', 'es'),
+  ('GU', 'en'),
+  ('GT', 'es'),
+  ('GG', 'es'),
+  ('GN', 'fr'),
+  ('GW', 'pt'),
+  ('GY', 'en'),
+  ('HT', 'fr'),
+  ('VA', 'it'),
+  ('HN', 'es'),
+  ('HK', 'zh-hans'),
+  ('HU', 'hu'),
+  ('IS', 'is'),
+  ('IN', 'en'),
+  ('ID', 'id'),
+  ('IR', 'fa'),
+  ('IQ', 'ar'),
+  ('IE', 'en'),
+  ('IM', 'en'),
+  ('IL', 'he'),
+  ('IT', 'it'),
+  ('JM', 'en'),
+  ('JP', 'jp'),
+  ('JE', 'en'),
+  ('JO', 'ar'),
+  ('KZ', 'ru'),
+  ('KE', 'en'),
+  ('KI', 'en'),
+  ('KP', 'ko'),
+  ('KR', 'ko'),
+  ('KW', 'ar'),
+  ('KG', 'ky'),
+  ('LA', 'lo'),
+  ('LV', 'lv'),
+  ('LB', 'ar'),
+  ('LS', 'en'),
+  ('LR', 'en'),
+  ('LY', 'ar'),
+  ('LI', 'de'),
+  ('LT', 'lt'),
+  ('LU', 'fr'),
+  ('MO', 'zh-hant'),
+  ('MK', 'mk'),
+  ('MG', 'fr'),
+  ('MW', 'en'),
+  ('MY', 'zlm'),
+  ('MV', 'en'),
+  ('ML', 'fr'),
+  ('MT', 'mt'),
+  ('MH', 'mh'),
+  ('MQ', 'fr'),
+  ('MR', 'ar'),
+  ('MU', 'fr'),
+  ('MX', 'es'),
+  ('FM', 'en'),
+  ('MD', 'ro'),
+  ('MC', 'fr'),
+  ('MN', 'mn'),
+  ('ME', 'sr'),
+  ('MS', 'en'),
+  ('MA', 'ar'),
+  ('MZ', 'pt'),
+  ('NA', 'ar'),
+  ('NR', 'en'),
+  ('NP', 'ne'),
+  ('NL', 'nl'),
+  ('NC', 'fr'),
+  ('NZ', 'en'),
+  ('NI', 'es'),
+  ('NE', 'fr'),
+  ('NG', 'en'),
+  ('NU', 'en'),
+  ('NF', 'en'),
+  ('NO', 'no'),
+  ('OM', 'ar'),
+  ('PK', 'en'),
+  ('PW', 'pau'),
+  ('PS', 'ar'),
+  ('PA', 'es'),
+  ('PG', 'en'),
+  ('PY', 'es'),
+  ('PE', 'es'),
+  ('PH', 'en'),
+  ('PN', 'en'),
+  ('PL', 'pt'),
+  ('PT', 'pt'),
+  ('PR', 'es'),
+  ('QA', 'ar'),
+  ('RO', 'ro'),
+  ('RU', 'ru'),
+  ('RW', 'fr'),
+  ('BL', 'fr'),
+  ('SH', 'en'),
+  ('KN', 'en'),
+  ('LC', 'en'),
+  ('MF', 'fr'),
+  ('PM', 'fr'),
+  ('VC', 'en'),
+  ('WS', 'en'),
+  ('SM', 'it'),
+  ('ST', 'pt'),
+  ('SA', 'ar'),
+  ('SN', 'fr'),
+  ('RS', 'sr'),
+  ('SC', 'en'),
+  ('SL', 'en'),
+  ('SG', 'en'),
+  ('SX', 'nl'),
+  ('SK', 'sk'),
+  ('SI', 'sl'),
+  ('SB', 'en'),
+  ('SO', 'ar'),
+  ('ZA', 'af'),
+  ('SS', 'en'),
+  ('ES', 'es'),
+  ('LK', 'en'),
+  ('SD', 'ar'),
+  ('SR', 'nl'),
+  ('SJ', 'no'),
+  ('SZ', 'en'),
+  ('SE', 'sv'),
+  ('CH', 'de'),
+  ('SY', 'ar'),
+  ('TW', 'zh-hant'),
+  ('TJ', 'ru'),
+  ('TZ', 'en'),
+  ('TH', 'th'),
+  ('TL', 'pt'),
+  ('TG', 'fr'),
+  ('TK', 'en'),
+  ('TO', 'en'),
+  ('TT', 'en'),
+  ('TN', 'ar'),
+  ('TR', 'tr'),
+  ('TM', 'tk'),
+  ('TC', 'en'),
+  ('TV', 'en'),
+  ('UG', 'en'),
+  ('UA', 'uk'),
+  ('AE', 'ar'),
+  ('GB', 'en'),
+  ('US', 'en'),
+  ('UM', 'en'),
+  ('UY', 'es'),
+  ('UZ', 'uz'),
+  ('VU', 'en'),
+  ('VE'

[MediaWiki-commits] [Gerrit] Catch and log errors in contributions formatting - change (mediawiki...Flow)

2014-01-27 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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


Change subject: Catch and log errors in contributions formatting
..

Catch and log errors in contributions formatting

Change-Id: I0afcdcd5063217fa06cb42083582cfb2fdb2b13e
---
M includes/Contributions/Formatter.php
M includes/Model/Workflow.php
2 files changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/includes/Contributions/Formatter.php 
b/includes/Contributions/Formatter.php
index 9e4a25a..63c2ae7 100644
--- a/includes/Contributions/Formatter.php
+++ b/includes/Contributions/Formatter.php
@@ -3,6 +3,7 @@
 namespace Flow\Contributions;
 
 use Flow\AbstractFormatter;
+use Flow\Exception\FlowException;
 use ContribsPager;
 use Html;
 
@@ -13,6 +14,15 @@
 * @return string|bool HTML for contributions entry, or false on failure
 */
public function format( ContribsPager $pager, $row ) {
+   try {
+   return $this->formatReal( $pager, $row );
+   } catch ( FlowException $e ) {
+   \MWExceptionHandler::logException( $e );
+   return false;
+   }
+   }
+
+   protected function formatReal( ContribsPager $pager, $row ) {
// Get all necessary objects
$workflow = $row->workflow;
$revision = $row->revision;
diff --git a/includes/Model/Workflow.php b/includes/Model/Workflow.php
index 99e9b93..72c8972 100644
--- a/includes/Model/Workflow.php
+++ b/includes/Model/Workflow.php
@@ -6,6 +6,7 @@
 use Title;
 use User;
 use Flow\Exception\DataModelException;
+use Flow\Exception\FlowException;
 use Flow\Exception\InvalidInputException;
 
 class Workflow {

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

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

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

[MediaWiki-commits] [Gerrit] Ignore 'unknown' in XFF - change (mediawiki/core)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Ignore 'unknown' in XFF
..


Ignore 'unknown' in XFF

Can come from Squid
http://www.squid-cache.org/Doc/config/forwarded_for/

Bug: 57467
Change-Id: I3fd3170d31a1aff2e748302c30dd6e364ed3bdcd
---
M includes/WebRequest.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index b42564c..a52894d 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1128,6 +1128,10 @@
# unless the address is not sensible (e.g. private). 
However, prefer private
# IP addresses over proxy servers controlled by this 
site (more sensible).
foreach ( $ipchain as $i => $curIP ) {
+   // ignore 'unknown' value from Squid when 
'forwarded_for off' and try next
+   if ( $curIP === 'unknown' ) {
+   continue;
+   }
$curIP = IP::sanitizeIP( IP::canonicalize( 
$curIP ) );
if ( wfIsTrustedProxy( $curIP ) && isset( 
$ipchain[$i + 1] ) ) {
if ( wfIsConfiguredProxy( $curIP ) || 
// bug 48919; treat IP as sane

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fd3170d31a1aff2e748302c30dd6e364ed3bdcd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: MZMcBride 
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] Remove setting referrer from HttpFunctions - change (mediawiki/core)

2014-01-27 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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


Change subject: Remove setting referrer from HttpFunctions
..

Remove setting referrer from HttpFunctions

It was introduced in 5d210b50 but no callers have ever been updated
so this always falls back on $wgTitle (which is usually wrong). It
only works on cURL, and is marginally useful at best.

Change-Id: Ic498108af9f466cefbd0072f94f0efa4055cd169
---
M includes/HttpFunctions.php
1 file changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/109799/1

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 9093c83..2536de1 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -351,13 +351,6 @@
}
 
/**
-* Set the referrer header
-*/
-   public function setReferer( $url ) {
-   $this->setHeader( 'Referer', $url );
-   }
-
-   /**
 * Set the user agent
 * @param $UA string
 */
@@ -441,18 +434,12 @@
 * @return Status
 */
public function execute() {
-   global $wgTitle;
-
wfProfileIn( __METHOD__ );
 
$this->content = "";
 
if ( strtoupper( $this->method ) == "HEAD" ) {
$this->headersOnly = true;
-   }
-
-   if ( is_object( $wgTitle ) && !isset( 
$this->reqHeaders['Referer'] ) ) {
-   $this->setReferer( wfExpandUrl( $wgTitle->getFullURL(), 
PROTO_CURRENT ) );
}
 
$this->proxySetup(); // set up any proxy as needed
@@ -751,10 +738,6 @@
$this->curlOptions[CURLOPT_MAXREDIRS] = $this->maxRedirects;
$this->curlOptions[CURLOPT_ENCODING] = ""; # Enable compression
 
-   /* not sure these two are actually necessary */
-   if ( isset( $this->reqHeaders['Referer'] ) ) {
-   $this->curlOptions[CURLOPT_REFERER] = 
$this->reqHeaders['Referer'];
-   }
$this->curlOptions[CURLOPT_USERAGENT] = 
$this->reqHeaders['User-Agent'];
 
$this->curlOptions[CURLOPT_SSL_VERIFYHOST] = 
$this->sslVerifyHost ? 2 : 0;

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

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

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

[MediaWiki-commits] [Gerrit] Enable varnishkafka on bits caches - change (operations/puppet)

2014-01-27 Thread Gage (Code Review)

Gage has uploaded a new change for review.

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


Change subject: Enable varnishkafka on bits caches
..

Enable varnishkafka on bits caches

Change-Id: Ib071b39f6fce30282bf5811da01a5a025c8d392a
---
M manifests/role/cache.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/109800/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 63834f2..254fe75 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -911,6 +911,12 @@
 }
 
 include role::cache::varnish::logging::eventlistener
+
+# Install a varnishkafka producer to send
+# varnish webrequest logs to Kafka.
+class { 'role::cache::varnish::kafka':
+topic => 'webrequest_bits'
+}
 }
 
 class mobile inherits role::cache::varnish::2layer {

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

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

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

[MediaWiki-commits] [Gerrit] Show % scale on ResizableNodes - change (VisualEditor/VisualEditor)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Show % scale on ResizableNodes
..


Show % scale on ResizableNodes

Requires original dimensions to be provided.

Implement on ImageNodes using naturalWidth/Height.

Change-Id: I2719ddd0dae73db4927aff592a565560c6a1d5dc
---
M modules/ve/ce/nodes/ve.ce.ImageNode.js
M modules/ve/ce/styles/ve.ce.Node.css
M modules/ve/ce/ve.ce.ResizableNode.js
3 files changed, 56 insertions(+), 6 deletions(-)

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



diff --git a/modules/ve/ce/nodes/ve.ce.ImageNode.js 
b/modules/ve/ce/nodes/ve.ce.ImageNode.js
index 0b55faf..08c6530 100644
--- a/modules/ve/ce/nodes/ve.ce.ImageNode.js
+++ b/modules/ve/ce/nodes/ve.ce.ImageNode.js
@@ -32,6 +32,7 @@
 
// Events
this.$element.on( 'click', ve.bind( this.onClick, this ) );
+   this.$image.on( 'load', ve.bind( this.onLoad, this ) );
this.model.connect( this, { 'attributeChange': 'onAttributeChange' } );
 
// Initialization
@@ -100,6 +101,19 @@
).select();
 };
 
+/**
+ * Handle the image load
+ *
+ * @method
+ * @param {jQuery.Event} e Load event
+ */
+ve.ce.ImageNode.prototype.onLoad = function () {
+   this.setOriginalDimensions( {
+   'width': this.$image.prop( 'naturalWidth' ),
+   'height': this.$image.prop( 'naturalHeight' )
+   } );
+};
+
 /* Registration */
 
 ve.ce.nodeFactory.register( ve.ce.ImageNode );
diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index 3eea298..1002855 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -144,6 +144,12 @@
white-space: nowrap;
 }
 
+.ve-ce-resizableNode-sizeText span:not(:first-child) {
+   margin-left: 0.4em;
+   padding-left: 0.4em;
+   border-left: solid 1px #ccc;
+}
+
 /* ve.ce.RelocatableNode */
 
 .ve-ce-relocatableNode-marker {
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js 
b/modules/ve/ce/ve.ce.ResizableNode.js
index 26297e9..2622538 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -17,6 +17,7 @@
  * @param {number|null} [config.snapToGrid=10] Snap to a grid of size X when 
the shift key is held. Null disables.
  * @param {boolean} [config.outline=false] Resize using an outline of the 
element only, don't live preview.
  * @param {boolean} [config.showSizeLabel=true] Show a label with the current 
dimensions while resizing
+ * @param {boolean} [config.showScaleLabel=true] Show a label with the current 
scale while resizing
  * @param {boolean} [config.min=1] Minimum size of longest edge
  * @param {boolean} [config.max=Infinity] Maximum size or longest edge
  */
@@ -29,11 +30,16 @@
this.$resizeHandles = this.$( '' );
this.snapToGrid = config.snapToGrid !== undefined ? config.snapToGrid : 
10;
this.outline = !!config.outline;
-   if ( config.showSizeLabel !== false ) {
+   this.showSizeLabel = config.showSizeLabel !== false;
+   this.showScaleLabel = config.showScaleLabel !== false;
+   // Only gets enabled when the original dimensions are provided
+   this.canShowScaleLabel = false;
+   if ( this.showSizeLabel || this.showScaleLabel ) {
this.$sizeText = this.$( '' ).addClass( 
've-ce-resizableNode-sizeText' );
this.$sizeLabel = this.$( '' ).addClass( 
've-ce-resizableNode-sizeLabel' ).append( this.$sizeText );
}
this.resizableOffset = null;
+   this.originalDimensions = null;
 
this.min = config.min !== undefined ? config.min : 1;
this.max = config.max !== undefined ? config.max : Infinity;
@@ -92,6 +98,17 @@
 };
 
 /**
+ * Set the orignal dimensions of an image
+ *
+ * @param {Object} dimensions Dimensions object with width & height
+ */
+ve.ce.ResizableNode.prototype.setOriginalDimensions = function ( dimensions ) {
+   this.originalDimensions = ve.copy( dimensions );
+   // If dimensions are valid and the scale label is desired, enable it
+   this.canShowScaleLabel = this.showScaleLabel && 
this.originalDimensions.width && this.originalDimensions.height;
+};
+
+/**
  * Update the contents and position of the size label
  *
  * Omitting the dimensions object will hide the size label.
@@ -99,14 +116,15 @@
  * @param {Object} [dimensions] Dimensions object with width, height, top & 
left, or undefined to hide
  */
 ve.ce.ResizableNode.prototype.updateSizeLabel = function ( dimensions ) {
-   if ( !this.$sizeLabel ) {
+   if ( !this.showSizeLabel && !this.canShowScaleLabel ) {
return;
}
-   var offset, node, top, height;
+   var offset, node, top, height, minWidth;
if ( dimensions ) {
offset = this.getResizableOffset();
-   // Things get a bit tight below 100px, so put the label on the 
outside
-

[MediaWiki-commits] [Gerrit] Only call setOriginalDimensions when non-null values are pro... - change (VisualEditor/VisualEditor)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Only call setOriginalDimensions when non-null values are 
provided
..


Only call setOriginalDimensions when non-null values are provided

Otherwise the button is never disabled.

Also assume that dimensions objects are always just width/height
as specified in the documentation.

Change-Id: I9530ed4257e88b90d4073b9d21d7a7490aa16f7b
---
M modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js 
b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
index 8c01c49..505742f 100644
--- a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -35,8 +35,8 @@
 
this.width = config.width || '';
this.height = config.height || '';
-   this.originalDimensions = config.originalDimensions || {};
-   this.maxDimensions = config.maxDimensions || {};
+   this.originalDimensions = null;
+   this.maxDimensions = null;
 
// Cache for the aspect ratio, which is set by setOriginalDimensions()
this.aspectRatio = null;
@@ -107,8 +107,12 @@
 
// Initialization
this.$element.addClass( 've-ui-mediaSizeWidget' );
-   this.setOriginalDimensions( this.originalDimensions );
-   this.setMaxDimensions( this.maxDimensions );
+   if ( config.originalDimensions ) {
+   this.setOriginalDimensions( config.originalDimensions );
+   }
+   if ( config.maxDimensions ) {
+   this.setMaxDimensions( config.maxDimensions );
+   }
 };
 
 /* Inheritance */
@@ -217,10 +221,7 @@
  * @param {number} [dimensions.height] Maximum height
  */
 ve.ui.MediaSizeWidget.prototype.setMaxDimensions = function ( dimensions ) {
-   this.maxDimensions = {
-   'width': dimensions.width,
-   'height': dimensions.height
-   };
+   this.maxDimensions = ve.copy( dimensions );
 };
 
 /**
@@ -240,10 +241,7 @@
  * @param {number} dimensions.height Original height
  */
 ve.ui.MediaSizeWidget.prototype.setOriginalDimensions = function ( dimensions 
) {
-   this.originalDimensions = {
-   'width': dimensions.width,
-   'height': dimensions.height
-   };
+   this.originalDimensions = ve.copy( dimensions );
// Cache the aspect ratio
this.aspectRatio = this.originalDimensions.width / 
this.originalDimensions.height;
// Enable the 'original dimensions' button
@@ -285,9 +283,11 @@
// TODO use a separate error message for this case,
// and put the max dimensions in the error message
(
+   this.maxDimensions &&
$.isNumeric( this.maxDimensions.width ) &&
Number( this.width ) > this.maxDimensions.width
) || (
+   this.maxDimensions &&
$.isNumeric( this.maxDimensions.height ) &&
Number( this.height ) > this.maxDimensions.height
)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9530ed4257e88b90d4073b9d21d7a7490aa16f7b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update wmf/1.23wmf10 branch to match wmf/1.23wmf11 - change (mediawiki...Flow)

2014-01-27 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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


Change subject: Update wmf/1.23wmf10 branch to match wmf/1.23wmf11
..

Update wmf/1.23wmf10 branch to match wmf/1.23wmf11

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7be77ed15be57c8eb09c9472162faf0d96f172f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf10
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Update WikimediaEvents to master
..

Update WikimediaEvents to master

Change-Id: I2c1637598afe7b1ac94f1613bdf28bb9be71da59
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/109797/1

diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index 9e0df46..e75c08b 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit 9e0df46bb2f89527896a1ba57042a2b69b5c7c84
+Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c1637598afe7b1ac94f1613bdf28bb9be71da59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf10
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Update WikimediaEvents to master - change (mediawiki/core)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Update WikimediaEvents to master
..

Update WikimediaEvents to master

Change-Id: Ic2fbfc131674a1ad2a20ab7c83c33678726a44f3
---
M extensions/WikimediaEvents
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/109796/1

diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents
index 9e0df46..e75c08b 16
--- a/extensions/WikimediaEvents
+++ b/extensions/WikimediaEvents
-Subproject commit 9e0df46bb2f89527896a1ba57042a2b69b5c7c84
+Subproject commit e75c08b368d282507533a42cc5cd1c78414bbcba

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2fbfc131674a1ad2a20ab7c83c33678726a44f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Update Flow - change (mediawiki/core)

2014-01-27 Thread Bsitu (Code Review)

Bsitu has submitted this change and it was merged.

Change subject: Update Flow
..


Update Flow

Change-Id: I90eb079a5179c25afae6eec2060cf1b33441e705
---
M extensions/Flow
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Flow b/extensions/Flow
index f957e72..a525b6c 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit f957e725b26c8c80bb9d372b3d477c1221b3e943
+Subproject commit a525b6c7177c62a36e44438e876bb618869e7df7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90eb079a5179c25afae6eec2060cf1b33441e705
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
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 I829790cd5, removing module storage logging - change (mediawiki...WikimediaEvents)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Revert I829790cd5, removing module storage logging
..


Revert I829790cd5, removing module storage logging

Experiment is done; code can go.

Change-Id: Ifc697cbe67d4001a9c10f3ddfe3a2b812da3acb4
---
M WikimediaEvents.php
M modules/ext.wikimediaEvents.moduleStorage.js
M modules/ext.wikimediaEvents.ve.js
3 files changed, 21 insertions(+), 161 deletions(-)

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



diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index 98b2996..5b56d6a 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -32,21 +32,10 @@
 // Configs
 
 $wgResourceModules += array(
-   'schema.VisualEditorDOMRetrieved' => array(
-   'class'=> 'ResourceLoaderSchemaModule',
-   'schema'   => 'VisualEditorDOMRetrieved',
-   'revision' => 5961496,
-   ),
-   'schema.VisualEditorDOMSaved' => array(
-   'class'=> 'ResourceLoaderSchemaModule',
-   'schema'   => 'VisualEditorDOMSaved',
-   'revision' => 6063754,
-   ),
-   'schema.ModuleStorage' => array(
-   'class'=> 'ResourceLoaderSchemaModule',
-   'schema'   => 'ModuleStorage',
-   'revision' => 6978194,
-   'targets'  => array( 'desktop', 'mobile' ),
+   'schema.TimingData' => array(
+   'class'  => 'ResourceLoaderSchemaModule',
+   'schema' => 'TimingData',
+   'revision' => 7254808,
),
'ext.wikimediaEvents.ve' => array(
'scripts'   => 'ext.wikimediaEvents.ve.js',
@@ -55,28 +44,9 @@
'remoteExtPath' => 'WikimediaEvents/modules',
'targets' => array( 'desktop', 'mobile' ),
),
-   'ext.wikimediaEvents.moduleStorage' => array(
-   'scripts'   => 'ext.wikimediaEvents.moduleStorage.js',
-   'dependencies'  => array( 'mediawiki.inspect', 
'schema.ModuleStorage' ),
-   'localBasePath' => __DIR__ . '/modules',
-   'remoteExtPath' => 'WikimediaEvents/modules',
-   'targets'   => array( 'desktop', 'mobile' ),
-   ),
 );
 
 $wgVisualEditorPluginModules[] = 'ext.wikimediaEvents.ve';
-
-// Hooks
-
-$wgHooks[ 'BeforePageDisplay' ][] = function ( &$out, &$skin ) {
-   global $wgResourceLoaderStorageEnabled;
-
-   if ( !$wgResourceLoaderStorageEnabled ) {
-   $out->addModules( 'ext.wikimediaEvents.moduleStorage' );
-   }
-
-   return true;
-};
 
 /**
  * Log server-side event on successful page edit.
diff --git a/modules/ext.wikimediaEvents.moduleStorage.js 
b/modules/ext.wikimediaEvents.moduleStorage.js
index 18ada10..e69de29 100644
--- a/modules/ext.wikimediaEvents.moduleStorage.js
+++ b/modules/ext.wikimediaEvents.moduleStorage.js
@@ -1,68 +0,0 @@
-/**
- * Log timing data for the ResourceLoader module storage performance 
evaluation.
- * @see https://meta.wikimedia.org/wiki/Schema:ModuleStorage
- */
-( function ( mw, $ ) {
-
-   if (
-   // Return early
-   // ..if we're in debug mode.
-   mw.config.get( 'debug' ) ||
-   // ..if module storage is enabled by default.
-   mw.config.get( 'wgResourceLoaderStorageEnabled' ) ||
-   // ..if the experiment is not defined
-   mw.loader.store.experiment === undefined ||
-   // ..if the user is not included in the experiment.
-   ( mw.loader.store.experiment.group !== 1 && 
mw.loader.store.experiment.group !== 2 )
-   ) {
-   return;
-   }
-
-   $( window ).load( function () {
-   var event, store, now, moduleLoadingTime, totalLoadingTime, 
loadIndex;
-
-   store = mw.loader.store;
-   now = ( new Date() ).getTime();
-   moduleLoadingTime = now - store.experiment.start;
-   totalLoadingTime = now - mediaWikiLoadStart;
-
-   try {
-   loadIndex = JSON.parse( localStorage.getItem( 
'moduleStorageExperimentLoadIdx' ) );
-   if ( typeof loadIndex !== 'number' ) {
-   loadIndex = 0;
-   }
-   loadIndex++;
-   localStorage.setItem( 'moduleStorageExperimentLoadIdx', 
loadIndex );
-   } catch ( e ) {}
-
-   event = {
-   experimentGroup: store.experiment.group,
-   experimentId: store.experiment.id.toString( 16 ),
-   loadIndex: loadIndex,
-   moduleLoadingTime: moduleLoadingTime,
-   totalLoadingTime: totalLoadingTime,
-   moduleStoreEnabled: !!store.enabled,
-   userAgent: navigator.userAgent,
-

[MediaWiki-commits] [Gerrit] Revert I829790cd5, removing module storage logging - change (mediawiki...WikimediaEvents)

2014-01-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Revert I829790cd5, removing module storage logging
..

Revert I829790cd5, removing module storage logging

Experiment is done; code can go.

Change-Id: Ifc697cbe67d4001a9c10f3ddfe3a2b812da3acb4
---
M WikimediaEvents.php
M modules/ext.wikimediaEvents.moduleStorage.js
M modules/ext.wikimediaEvents.ve.js
3 files changed, 21 insertions(+), 161 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/95/109795/1

diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index 98b2996..5b56d6a 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -32,21 +32,10 @@
 // Configs
 
 $wgResourceModules += array(
-   'schema.VisualEditorDOMRetrieved' => array(
-   'class'=> 'ResourceLoaderSchemaModule',
-   'schema'   => 'VisualEditorDOMRetrieved',
-   'revision' => 5961496,
-   ),
-   'schema.VisualEditorDOMSaved' => array(
-   'class'=> 'ResourceLoaderSchemaModule',
-   'schema'   => 'VisualEditorDOMSaved',
-   'revision' => 6063754,
-   ),
-   'schema.ModuleStorage' => array(
-   'class'=> 'ResourceLoaderSchemaModule',
-   'schema'   => 'ModuleStorage',
-   'revision' => 6978194,
-   'targets'  => array( 'desktop', 'mobile' ),
+   'schema.TimingData' => array(
+   'class'  => 'ResourceLoaderSchemaModule',
+   'schema' => 'TimingData',
+   'revision' => 7254808,
),
'ext.wikimediaEvents.ve' => array(
'scripts'   => 'ext.wikimediaEvents.ve.js',
@@ -55,28 +44,9 @@
'remoteExtPath' => 'WikimediaEvents/modules',
'targets' => array( 'desktop', 'mobile' ),
),
-   'ext.wikimediaEvents.moduleStorage' => array(
-   'scripts'   => 'ext.wikimediaEvents.moduleStorage.js',
-   'dependencies'  => array( 'mediawiki.inspect', 
'schema.ModuleStorage' ),
-   'localBasePath' => __DIR__ . '/modules',
-   'remoteExtPath' => 'WikimediaEvents/modules',
-   'targets'   => array( 'desktop', 'mobile' ),
-   ),
 );
 
 $wgVisualEditorPluginModules[] = 'ext.wikimediaEvents.ve';
-
-// Hooks
-
-$wgHooks[ 'BeforePageDisplay' ][] = function ( &$out, &$skin ) {
-   global $wgResourceLoaderStorageEnabled;
-
-   if ( !$wgResourceLoaderStorageEnabled ) {
-   $out->addModules( 'ext.wikimediaEvents.moduleStorage' );
-   }
-
-   return true;
-};
 
 /**
  * Log server-side event on successful page edit.
diff --git a/modules/ext.wikimediaEvents.moduleStorage.js 
b/modules/ext.wikimediaEvents.moduleStorage.js
index 18ada10..e69de29 100644
--- a/modules/ext.wikimediaEvents.moduleStorage.js
+++ b/modules/ext.wikimediaEvents.moduleStorage.js
@@ -1,68 +0,0 @@
-/**
- * Log timing data for the ResourceLoader module storage performance 
evaluation.
- * @see https://meta.wikimedia.org/wiki/Schema:ModuleStorage
- */
-( function ( mw, $ ) {
-
-   if (
-   // Return early
-   // ..if we're in debug mode.
-   mw.config.get( 'debug' ) ||
-   // ..if module storage is enabled by default.
-   mw.config.get( 'wgResourceLoaderStorageEnabled' ) ||
-   // ..if the experiment is not defined
-   mw.loader.store.experiment === undefined ||
-   // ..if the user is not included in the experiment.
-   ( mw.loader.store.experiment.group !== 1 && 
mw.loader.store.experiment.group !== 2 )
-   ) {
-   return;
-   }
-
-   $( window ).load( function () {
-   var event, store, now, moduleLoadingTime, totalLoadingTime, 
loadIndex;
-
-   store = mw.loader.store;
-   now = ( new Date() ).getTime();
-   moduleLoadingTime = now - store.experiment.start;
-   totalLoadingTime = now - mediaWikiLoadStart;
-
-   try {
-   loadIndex = JSON.parse( localStorage.getItem( 
'moduleStorageExperimentLoadIdx' ) );
-   if ( typeof loadIndex !== 'number' ) {
-   loadIndex = 0;
-   }
-   loadIndex++;
-   localStorage.setItem( 'moduleStorageExperimentLoadIdx', 
loadIndex );
-   } catch ( e ) {}
-
-   event = {
-   experimentGroup: store.experiment.group,
-   experimentId: store.experiment.id.toString( 16 ),
-   loadIndex: loadIndex,
-   moduleLoadingTime: moduleLoadingTime,
-   totalLoadingTime: totalLoadingTime,
-   moduleStoreEnabled: !!store.enab

[MediaWiki-commits] [Gerrit] Revert "update branch to wmf/1.23wmf11" - change (mediawiki...Flow)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Revert "update branch to wmf/1.23wmf11"
..


Revert "update branch to wmf/1.23wmf11"

This reverts commit 417430f8831fe6d893a40e0bb4587307aa259168.

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3f0ec4541b0c4b5036e273e55078558aaf8e48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
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 "Update wmf/1.23wmf10 to match wmf/1.23wmf11" - change (mediawiki...Flow)

2014-01-27 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Update wmf/1.23wmf10 to match wmf/1.23wmf11"
..


Revert "Update wmf/1.23wmf10 to match wmf/1.23wmf11"

This reverts commit b8ef1e7890adb8e842a38d28570c1db949a77dbf.

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Clean up easily removed $wgTitles - change (mediawiki...SemanticPageMaker)

2014-01-27 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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


Change subject: Clean up easily removed $wgTitles
..

Clean up easily removed $wgTitles

- Obtained from Parser, CategoryPage, SpecialPage, etc.
- Couple of unused instances

Change-Id: I1a73d025bbeacc09ac94383ca898854c531e6eeb
---
M includes/widgets/SPM_WidgetDesignPage.php
M includes/widgets/SPM_WidgetParserFunctions.php
M includes/widgets/SPM_WidgetUtils.php
M includes/widgets/datatype/SPM_WT_Page.php
M includes/widgets/datatype/SPM_WT_String.php
M specials/WidgetAssembler/SPM_WidgetAssembler.php
M specials/WidgetClone/SPM_WidgetClone.php
M specials/WikiObjectEditor/SPM_ObjectEditor.php
8 files changed, 13 insertions(+), 15 deletions(-)


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

diff --git a/includes/widgets/SPM_WidgetDesignPage.php 
b/includes/widgets/SPM_WidgetDesignPage.php
index 298972f..a326017 100644
--- a/includes/widgets/SPM_WidgetDesignPage.php
+++ b/includes/widgets/SPM_WidgetDesignPage.php
@@ -660,8 +660,10 @@
wfProfileIn( __METHOD__ );
$this->addHTMLHeader();
 
-   global $wgOut, $wgTitle;
-   $wgOut->addWikiText( wfMsg( 'wf_wd_hint_wfedit', 
Title::newFromText( $wgTitle->getText(), NS_CATEGORY ) ) );
+   global $wgOut;
+   $wgOut->addWikiText( wfMsg( 'wf_wd_hint_wfedit',
+   Title::newFromText( $wgOut->getTitle()->getText(), 
NS_CATEGORY )
+   ) );
 
$html = $this->getDesignerUI();
 
diff --git a/includes/widgets/SPM_WidgetParserFunctions.php 
b/includes/widgets/SPM_WidgetParserFunctions.php
index 059f2d1..c3e3e31 100644
--- a/includes/widgets/SPM_WidgetParserFunctions.php
+++ b/includes/widgets/SPM_WidgetParserFunctions.php
@@ -216,8 +216,7 @@
$params = func_get_args();
array_shift( $params ); // don't need the parser
 
-   global $wgTitle;
-   $defaultValue = $wgTitle->getPrefixedText();
+   $defaultValue = $parser->getTitle()->getPrefixedText();
$widgetName = $field_value = $extra = '';
$buttonStr = 'Create or edit';
// assign params - support unlabelled params, for backwards 
compatibility
diff --git a/includes/widgets/SPM_WidgetUtils.php 
b/includes/widgets/SPM_WidgetUtils.php
index 6c94079..d50a815 100644
--- a/includes/widgets/SPM_WidgetUtils.php
+++ b/includes/widgets/SPM_WidgetUtils.php
@@ -289,10 +289,10 @@
return true;
}
 
-   static function addWFInput() {
-   global $wgOut, $wgTitle;
+   static function addWFInput( $categoryPage ) {
+   global $wgOut;
$wgOut->addWikiText( wfMsg( 'wf_spm_hint_wfinput' ) );
-   $wgOut->addWikiText( "{{#wfinput:{$wgTitle->getText()}|}}" );
+   $wgOut->addWikiText( 
"{{#wfinput:{$categoryPage->getTitle()->getText()}|}}" );
 
return true;
}
diff --git a/includes/widgets/datatype/SPM_WT_Page.php 
b/includes/widgets/datatype/SPM_WT_Page.php
index e511283..85528ad 100644
--- a/includes/widgets/datatype/SPM_WT_Page.php
+++ b/includes/widgets/datatype/SPM_WT_Page.php
@@ -302,7 +302,7 @@
$params = array() ) {
 
if ( $this->getDefaultValue( $proptitle, $extra_semdata ) == 
'__ALWAYS_CURRENT_USER__' ) {
-   global $wgParser, $wgTitle, $wgUser;
+   global $wgParser, $wgUser;
$current_value = $this->getUser();
}
 
diff --git a/includes/widgets/datatype/SPM_WT_String.php 
b/includes/widgets/datatype/SPM_WT_String.php
index 17b7864..947c899 100644
--- a/includes/widgets/datatype/SPM_WT_String.php
+++ b/includes/widgets/datatype/SPM_WT_String.php
@@ -38,7 +38,7 @@
$params = array() ) {
 
if ( $this->getDefaultValue( $proptitle, $extra_semdata ) == 
'__ALWAYS_CURRENT_USER__' ) {
-   global $wgParser, $wgTitle, $wgUser;
+   global $wgParser, $wgUser;
$current_value = $this->getUser();
}
 
diff --git a/specials/WidgetAssembler/SPM_WidgetAssembler.php 
b/specials/WidgetAssembler/SPM_WidgetAssembler.php
index 4cb7b59..c3c3bb3 100644
--- a/specials/WidgetAssembler/SPM_WidgetAssembler.php
+++ b/specials/WidgetAssembler/SPM_WidgetAssembler.php
@@ -75,8 +75,7 @@
}
}
 
-   global $wgTitle;
-   $new_url = $wgTitle->getLocalURL( 'action=submit' );
+   $new_url = $this->getTitle()->getLocalURL( 'action=submit' );
$html = '
 
 
diff --git a/specials/WidgetClone/SPM_WidgetClone.php 
b/specials/WidgetClone/SPM_WidgetClone.php
index b5001e8..91e89f2 100644
--- a/specials/Widge

1 2 3 4 >

1 - 100 of 397 matches

Mail list logo