date:20141124

[MediaWiki-commits] [Gerrit] Permissive Timestamp fromX methods - change (pywikibot/core)

2014-11-24 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Permissive Timestamp fromX methods
..

Permissive Timestamp fromX methods

Several methods of site and page classes return a Timestamp where
previously they returned a string which should be passed to the
Timestamp class to create a Timestamp object.
In order to improve compatibility with old versions of pywikibot,
Timestamp should recognise it is being passed a Timestamp, and not
try to parse it.

Change-Id: Ifb850b3e52c0fb1b84f2da433f50cb142f854591
---
M pywikibot/__init__.py
A tests/timestamp_tests.py
2 files changed, 106 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/04/175404/1

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index e20d7c4..d60e45e 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -112,6 +112,10 @@
 
 Use Timestamp.fromISOformat() and Timestamp.fromtimestampformat() to
 create Timestamp objects from MediaWiki string formats.
+As these constructors are typically used to create objects using data
+passed provided by site and page methods, some of which return a Timestamp
+when previously they returned a MediaWiki string representation, these
+methods also accept a Timestamp object, in which case they return a clone.
 
 Use Site.getcurrenttime() for the current time; this is more reliable
 than using Timestamp.utcnow().
@@ -124,11 +128,19 @@
 @classmethod
 def fromISOformat(cls, ts):
 Convert an ISO 8601 timestamp to a Timestamp object.
+# If inadvertantly passed a Timestamp object, use replace()
+# to create a clone.
+if isinstance(ts, cls):
+return ts.replace(microsecond=ts.microsecond)
 return cls.strptime(ts, cls.ISO8601Format)
 
 @classmethod
 def fromtimestampformat(cls, ts):
 Convert a MediaWiki internal timestamp to a Timestamp object.
+# If inadvertantly passed a Timestamp object, use replace()
+# to create a clone.
+if isinstance(ts, cls):
+return ts.replace(microsecond=ts.microsecond)
 return cls.strptime(ts, cls.mediawikiTSFormat)
 
 def toISOformat(self):
@@ -144,7 +156,8 @@
 return self.toISOformat()
 
 def __add__(self, other):
-newdt = datetime.datetime.__add__(self, other)
+Perform addition, returning a Timestamp instead of datetime.
+newdt = super(Timestamp, self).__add__(other)
 if isinstance(newdt, datetime.datetime):
 return Timestamp(newdt.year, newdt.month, newdt.day, newdt.hour,
  newdt.minute, newdt.second, newdt.microsecond,
@@ -153,7 +166,8 @@
 return newdt
 
 def __sub__(self, other):
-newdt = datetime.datetime.__sub__(self, other)
+Perform substraction, returning a Timestamp instead of datetime.
+newdt = super(Timestamp, self).__sub__(other)
 if isinstance(newdt, datetime.datetime):
 return Timestamp(newdt.year, newdt.month, newdt.day, newdt.hour,
  newdt.minute, newdt.second, newdt.microsecond,
diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py
new file mode 100644
index 000..0018c01
--- /dev/null
+++ b/tests/timestamp_tests.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8  -*-
+Tests for the Timestamp class.
+#
+# (C) Pywikibot team, 2014
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+
+import datetime
+
+from pywikibot import Timestamp as T
+
+from tests.aspects import unittest, TestCase
+
+
+class TestTimestamp(TestCase):
+
+Test Timestamp class comparisons.
+
+net = False
+
+def test_instantiate_from_instance(self):
+Test passing instance to factory methods works.
+t1 = T.utcnow()
+self.assertIsNot(t1, T.fromISOformat(t1))
+self.assertEqual(t1, T.fromISOformat(t1))
+self.assertIsInstance(T.fromISOformat(t1), T)
+self.assertIsNot(t1, T.fromtimestampformat(t1))
+self.assertEqual(t1, T.fromtimestampformat(t1))
+self.assertIsInstance(T.fromtimestampformat(t1), T)
+
+def test_iso_format(self):
+t1 = T.utcnow()
+ts1 = t1.toISOformat()
+t2 = T.fromISOformat(ts1)
+ts2 = t2.toISOformat()
+# MediaWiki ISO format doesnt include microseconds
+self.assertNotEqual(t1, t2)
+t1 = t1.replace(microsecond=0)
+self.assertEqual(t1, t2)
+self.assertEqual(ts1, ts2)
+
+def test_mediawiki_format(self):
+t1 = T.utcnow()
+ts1 = t1.totimestampformat()
+t2 = T.fromtimestampformat(ts1)
+ts2 = t2.totimestampformat()
+self.assertNotEqual(t1, t2)
+t1 = t1.replace(microsecond=0)
+self.assertEqual(t1, t2)
+self.assertEqual(ts1, ts2)
+
+def

[MediaWiki-commits] [Gerrit] txstatsd: gather runtime self metrics under statsd - change (operations/puppet)

2014-11-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: txstatsd: gather runtime self metrics under statsd
..


txstatsd: gather runtime self metrics under statsd

this gets rid of top-level txstatsd metrics and put them under common statsd/ 
(at the moment swift machines are pushing their stats to top-level)

once this is rolled out we can backfill previous data with whisper-fill
from https://github.com/jssjr/carbonate

Change-Id: Ie05a49bcfb7e9fbc1e2b493bbfe301e84dc35fe2
---
M manifests/role/swift.pp
M manifests/role/txstatsd.pp
2 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve



diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 80e0193..39522ba 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -121,6 +121,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }
@@ -142,6 +143,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }
@@ -256,6 +258,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }
@@ -275,6 +278,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }
@@ -424,6 +428,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }
@@ -465,6 +470,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }
diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp
index 4bfcc40..f485c3b 100644
--- a/manifests/role/txstatsd.pp
+++ b/manifests/role/txstatsd.pp
@@ -15,6 +15,7 @@
 'prefix' = '',
 'max-queue-size' = 1000 * 1000,
 'max-datapoints-per-message' = 10 * 1000,
+'instance-name'  = statsd.${::hostname},
 },
 },
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie05a49bcfb7e9fbc1e2b493bbfe301e84dc35fe2
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Infobox: Check if entities isn't undefined - change (mediawiki...MobileFrontend)

2014-11-24 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Infobox: Check if entities isn't undefined
..

Infobox: Check if entities isn't undefined

Change-Id: I813023e3077ebbf870eff9723744a984ef2ddb74
Task: T75701
---
M javascripts/modules/infobox/Infobox.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/javascripts/modules/infobox/Infobox.js 
b/javascripts/modules/infobox/Infobox.js
index df734db..f2a0ab2 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -485,7 +485,7 @@
options.description = claims.description;
rows = options.rows;
$.each( rows, function ( i, row ) {
-   if ( claims.entities[ row.id ] ) {
+   if ( claims.entities  
claims.entities[ row.id ] ) {
row.values = self._getValues( 
claims.entities[ row.id ] );
} else {
row.values = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I813023e3077ebbf870eff9723744a984ef2ddb74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de

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

[MediaWiki-commits] [Gerrit] Enable Form Refresh as a BetaFeature - change (operations/mediawiki-config)

2014-11-24 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Enable Form Refresh as a BetaFeature
..

Enable Form Refresh as a BetaFeature

This will allow users to opt-in to Form Refresh through
BetaFeatures. Added 'betafeatures-vector-form-refresh' to
whitelist and set $wgVectorBetaFormRefresh to true by default.

BetaFeature created at Icad0b8c3255008a4d901aee411f231ae01017a4c

Bug: T73477
Change-Id: I2680b4d0d8a8c3fea8777a041e7ccdd5165d3a4f
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9c09aab..dc362ca 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1975,6 +1975,7 @@
 if ( $wmgUseVectorBeta ) {
require_once( $IP/extensions/VectorBeta/VectorBeta.php );
$wgVectorBetaPersonalBar = $wmgVectorBetaPersonalBar;
+   $wgVectorBetaFormRefresh = $wmgVectorBetaFormRefresh;
 }
 
 if ( $wmgUseParsoid ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a3b7b4d..7d2115e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11258,6 +11258,7 @@
'visualeditor-enable-language', // 2014-11-01 — VE 
language editor
'wikibase-otherprojects',   // 2015-02-27 — 
Other projects sidebar (wikidata)
'HHVM', // 2015-03-18 - 
HHVM opt-in
+   'betafeatures-vector-form-refresh', // 2015-05-24 - 
Interface Refresh and Standardization
),
 ),
 
@@ -11288,6 +11289,11 @@
'nonbetafeatures' = false,
 ),
 
+'wmgVectorBetaFormRefresh' = array(
+   'default' = true, // T73477
+   'nonbetafeatures' = false,
+),
+
 'wmgULSCompactLinks' = array(
'default' = true,
'nonbetafeatures' = false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2680b4d0d8a8c3fea8777a041e7ccdd5165d3a4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] SpecialNewpages: Load mediawiki.userSuggest only when needed - change (mediawiki/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: SpecialNewpages: Load mediawiki.userSuggest only when needed
..


SpecialNewpages: Load mediawiki.userSuggest only when needed

Follow up: I261ffb6eb651e1a76c960fb87367bb08444ddf78

Change-Id: Id09d242745ef5c4a23bfe25d549a4517ee53e44d
---
M includes/specials/SpecialNewpages.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialNewpages.php 
b/includes/specials/SpecialNewpages.php
index dd4f156..b3b3d48 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -120,7 +120,6 @@
 */
public function execute( $par ) {
$out = $this-getOutput();
-   $out-addModules( 'mediawiki.userSuggest' );
 
$this-setHeaders();
$this-outputHeader();
@@ -200,6 +199,8 @@
 
protected function form() {
$out = $this-getOutput();
+   $out-addModules( 'mediawiki.userSuggest' );
+
// Consume values
$this-opts-consumeValue( 'offset' ); // don't carry offset, 
DWIW
$namespace = $this-opts-consumeValue( 'namespace' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id09d242745ef5c4a23bfe25d549a4517ee53e44d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: PiRSquared17 pirsquare...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Enable WikiLove extension on zhwikivoyage - change (operations/mediawiki-config)

2014-11-24 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Enable WikiLove extension on zhwikivoyage
..

Enable WikiLove extension on zhwikivoyage

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a3b7b4d..90712fd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12082,6 +12082,7 @@
'viwiki' = true, // bug 48878
'labswiki' = true,
'zhwiki' = true, // bug 30362
+   'zhwikivoyage' = true, // T75717
 ),
 'wmgWikiLoveDefault' = array(
'default' = true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie22fe0012243c7fc309819f744adb25464a9c4b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] @disallow_redirect - change (pywikibot/core)

2014-11-24 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: @disallow_redirect
..

@disallow_redirect

Change-Id: Ibc01db5858f5c0ab6cb338a1614843a9b3744315
---
M pywikibot/page.py
M scripts/replace.py
M scripts/solve_disambiguation.py
M tests/page_tests.py
4 files changed, 82 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/08/175408/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 2d71d8a..3a56d38 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -49,7 +49,8 @@
 SiteDefinitionError
 )
 from pywikibot.tools import (
-ComparableMixin, deprecated, deprecate_arg, deprecated_args
+ComparableMixin, deprecated, deprecate_arg, deprecated_args,
+add_decorated_full_name,
 )
 from pywikibot import textlib
 
@@ -58,6 +59,34 @@
 
 # Pre-compile re expressions
 reNamespace = re.compile(^(.+?) *: *(.*)$)
+
+
+def disallow_redirect(fn):
+ Decorator to raise IsRedirectPage exception by default.
+
+compat often include an argument get_redirect, always default False.
+It is confusingly named, as 'get' here means get the raw wikitext which
+includes the #REDIRECT, and not that the redirect should be followed.
+
+This decorator looks for argument 'allow_redirect' and 'get_redirect',
+which if set will skip raising IsRedirectPage when used with a redirect.
+
+@return: decorated method
+
+def callee(self, *args, **kwargs):
+allow_redirect = kwargs.pop('allow_redirect',
+kwargs.pop('get_redirect', False))
+if not allow_redirect and self.isRedirectPage():
+raise pywikibot.IsRedirectPage(self)
+return fn(self, *args, **kwargs)
+
+callee.__name__ = fn.__name__
+callee.__doc__ = fn.__doc__
+callee.__module__ = callee.__module__
+if not hasattr(fn, '__full_name__'):
+add_decorated_full_name(fn)
+callee.__full_name__ = fn.__full_name__
+return callee
 
 
 # Note: Link objects (defined later on) represent a wiki-page's title, while
@@ -303,6 +332,7 @@
 return self.autoFormat()[0] is not None
 
 @deprecated_args(throttle=None, change_edit_time=None)
+# FIXME: rename get_redirect to allow_redirect after using warnings module.
 def get(self, force=False, get_redirect=False, sysop=False):
 Return the wiki-text of the page.
 
@@ -367,13 +397,17 @@
 self._getexception = pywikibot.IsRedirectPage(self)
 raise self._getexception
 
-@deprecated_args(throttle=None, change_edit_time=None)
-def getOldVersion(self, oldid, force=False, get_redirect=False,
-  sysop=False):
-Return text of an old revision of this page; same options as get().
+@deprecated_args(throttle=None, change_edit_time=None, get_redirect=None)
+def getOldVersion(self, oldid, force=False, sysop=False):
+Return text of an old revision of this page.
 
 @param oldid: The revid of the revision desired.
+@param force: reload all page attributes, including errors
+@param sysop: if the user has a sysop account, use it to
+  retrieve this page
 
+@return: old revision page text
+@rtype: unicode
 
 if force or oldid not in self._revisions \
 or self._revisions[oldid].text is None:
@@ -381,7 +415,6 @@
 getText=True,
 revids=oldid,
 sysop=sysop)
-# TODO: what about redirects, errors?
 return self._revisions[oldid].text
 
 def permalink(self, oldid=None):
@@ -1227,6 +1260,7 @@
 DEPRECATED. Use templates().
 return self.templates()
 
+@disallow_redirect
 def templates(self, content=False):
 Return a list of Page objects for templates used on this Page.
 
@@ -1277,7 +1311,8 @@
 return self.site.pageimages(self, step=step, total=total,
 content=content)
 
-@deprecate_arg(get_redirect, None)
+@disallow_redirect
+@deprecated_args(thistxt=None)
 def templatesWithParams(self):
 Iterate templates used on this Page.
 
@@ -1328,7 +1363,10 @@
 result.append((pywikibot.Page(link, self.site), positional))
 return result
 
-@deprecated_args(nofollow_redirects=None, get_redirect=None)
+# nofollow_redirects was removed (not deprecated) from compat in mid-2008
+# (7cb7143).  However it was still used in core until late 2014.
+@deprecated_args(nofollow_redirects='allow_redirect')
+@disallow_redirect
 def categories(self, withSortKey=False, step=None, total=None,
content=False):
 Iterate categories that the article is in.
diff --git a/scripts/replace.py b/scripts/replace.py
index

[MediaWiki-commits] [Gerrit] Fix wrong case of Id - change (mediawiki...MathSearch)

2014-11-24 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Fix wrong case of Id
..

Fix wrong case of Id

* in the code snipped fot the documentation ID was used instead of Id

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


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

diff --git a/i18n/en.json b/i18n/en.json
index 16a8ef1..865207a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,7 +27,7 @@
 math-wmc-SelectRun: Name,
 math-wmc-SelectRunHelp : Specify a unique name for your submission, or 
overwrite an existing draft.,
 math-wmc-FileLabel : CSV File,
-math-wmc-FileHelp : Upload your results as ranked, comma separated list 
of (queryId,formulaId)-pairs. A column header of the form 
codequeryID,formulaId/code is required.,
+math-wmc-FileHelp : Upload your results as ranked, comma separated list 
of (queryId,formulaId)-pairs. A column header of the form 
codequeryId,formulaId/code is required.,
 math-wmc-RunAdded: Added submission \$1\ with Id \$2\,
 math-wmc-RunAddError: Error: Cannot add submission \$1\.,
 math-wmc-RunAddExist: Submission named \$1\ already exists with Id 
\$2\,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5520440e3885f4cfdbe32d756ae58e41fa5d3786
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] Fix APISite.search incorrect deprecate_arg used - change (pywikibot/core)

2014-11-24 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Fix APISite.search incorrect deprecate_arg used
..

Fix APISite.search incorrect deprecate_arg used

APISite.search listed 'number' as a deprecated argument
name for the new argument 'limit'.  However 'limit' isn't
a valid argument; 'total' is the valid argument name.

Change-Id: I3ea14e96de1bb87674c42859189c7ff2f791d436
---
M pywikibot/site.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/11/175411/1

diff --git a/pywikibot/site.py b/pywikibot/site.py
index 142e419..1e6e614 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3479,7 +3479,7 @@
 
 return rcgen
 
-@deprecate_arg(number, limit)
+@deprecated_args(number=total)
 def search(self, searchstring, namespaces=None, where=text,
getredirects=False, step=None, total=None, content=False):
 Iterate Pages that contain the searchstring.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ea14e96de1bb87674c42859189c7ff2f791d436
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com

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

[MediaWiki-commits] [Gerrit] fix if/else/while construct with single function (v 3.11.3) - change (mediawiki...PhpTags)

2014-11-24 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review.

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

Change subject: fix if/else/while construct with single function (v 3.11.3)
..

fix if/else/while construct with single function (v 3.11.3)

* fix error with empty tag

Change-Id: I2ea4a8ce32a84ac90d5b831c8e11711c39fee1ad
---
M PhpTags.body.php
M PhpTags.php
M includes/Compiler.php
M includes/ErrorHandler.php
M tests/parser/PhpTagsTests.txt
5 files changed, 61 insertions(+), 35 deletions(-)


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

diff --git a/PhpTags.body.php b/PhpTags.body.php
index 9454d7b..01e59f1 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -187,7 +187,7 @@
 *
 * @param Article $article
 */
-   public static function clearBytecodeCache( $article ) {
+   public static function clearBytecodeCache( $article ) {
wfProfileIn( __METHOD__ );
 
$frameID = $article-getTitle()-getArticleID();
diff --git a/PhpTags.php b/PhpTags.php
index 0ff2696..d7bae1f 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -17,7 +17,7 @@
 
 const PHPTAGS_MAJOR_VERSION = 3;
 const PHPTAGS_MINOR_VERSION = 11;
-const PHPTAGS_RELEASE_VERSION = 2;
+const PHPTAGS_RELEASE_VERSION = 3;
 define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION 
. '.' . PHPTAGS_RELEASE_VERSION );
 
 const PHPTAGS_HOOK_RELEASE = 5;
diff --git a/includes/Compiler.php b/includes/Compiler.php
index 39745d0..4401c5e 100644
--- a/includes/Compiler.php
+++ b/includes/Compiler.php
@@ -144,7 +144,7 @@
$this-tokens = $tokens;
reset( $this-tokens );
$this-tokenLine = 0;
-   $this-stepUP();
+   $this-stepUP( false );
}
 
public static function compile( $source, $place = 'Command line code' ) 
{
@@ -168,28 +168,7 @@
 
private function stepBlockOperators( $endToken, $throwEndTag = true ) {
while ( $this-id != $endToken ) {
-   $result = $this-stepFirstOperator( $throwEndTag );
-   if ( !$result ) {
-   if ( $this-id == ';' ) { // Example: 
-   $this-stepUP( $throwEndTag ); // @todo 
fix it
-   } else {
-   $value = $this-getNextValue();
-   if ( $value ) { // Example: $foo=1;
-   $dummy = array( 
PHPTAGS_STACK_RESULT=null );
-   $this-addValueIntoStack( 
$value, $dummy, PHPTAGS_STACK_RESULT );
-   unset( $dummy );
-   //$this-stack[] = $value;
-   if ( $this-id != ';' ) { // 
Example: $foo=1,
-   // PHP Parse error:  
syntax error, unexpected $id, expecting ';'
-   throw new 
PhpTagsException( PhpTagsException::PARSE_SYNTAX_ERROR_UNEXPECTED, array( 
$this-id, ';' ), $this-tokenLine, $this-place );
-   }
-   $this-stepUP( $throwEndTag );
-   } else {
-   // PHP Parse error:  syntax 
error, unexpected $id
-   throw new PhpTagsException( 
PhpTagsException::PARSE_SYNTAX_ERROR_UNEXPECTED, array( $this-id ), 
$this-tokenLine, $this-place );
-   }
-   }
-   }
+   $this-stepFirstOperator( $throwEndTag ) || 
$this-stepFirsValue( $throwEndTag );
}
}
 
@@ -198,7 +177,7 @@
$text = $this-text;
switch ( $id ) {
case T_ECHO:
-   $this-stepUP();
+   $this-stepUP( true );
$value = $this-getNextValue();
if( !$value ) { // Example: echo ;
// PHP Parse error:  syntax error, 
unexpected $id
@@ -218,7 +197,7 @@
if ( current($this-tokens) != ',' ) {
break;
}
-   $this-stepUP();
+   $this-stepUP( true );
} while ( $value = $this-getNextValue() );
 
if ( $this-id != ';' ) { // Example echo foo%
@@ -241,7 +220,7 @@

[MediaWiki-commits] [Gerrit] fix if/else/while construct with single function (v 3.11.3) - change (mediawiki...PhpTags)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: fix if/else/while construct with single function (v 3.11.3)
..


fix if/else/while construct with single function (v 3.11.3)

* fix error with empty tag

Change-Id: I2ea4a8ce32a84ac90d5b831c8e11711c39fee1ad
---
M PhpTags.body.php
M PhpTags.php
M includes/Compiler.php
M includes/ErrorHandler.php
M tests/parser/PhpTagsTests.txt
5 files changed, 61 insertions(+), 35 deletions(-)

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



diff --git a/PhpTags.body.php b/PhpTags.body.php
index 9454d7b..01e59f1 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -187,7 +187,7 @@
 *
 * @param Article $article
 */
-   public static function clearBytecodeCache( $article ) {
+   public static function clearBytecodeCache( $article ) {
wfProfileIn( __METHOD__ );
 
$frameID = $article-getTitle()-getArticleID();
diff --git a/PhpTags.php b/PhpTags.php
index 0ff2696..d7bae1f 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -17,7 +17,7 @@
 
 const PHPTAGS_MAJOR_VERSION = 3;
 const PHPTAGS_MINOR_VERSION = 11;
-const PHPTAGS_RELEASE_VERSION = 2;
+const PHPTAGS_RELEASE_VERSION = 3;
 define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION 
. '.' . PHPTAGS_RELEASE_VERSION );
 
 const PHPTAGS_HOOK_RELEASE = 5;
diff --git a/includes/Compiler.php b/includes/Compiler.php
index 39745d0..4401c5e 100644
--- a/includes/Compiler.php
+++ b/includes/Compiler.php
@@ -144,7 +144,7 @@
$this-tokens = $tokens;
reset( $this-tokens );
$this-tokenLine = 0;
-   $this-stepUP();
+   $this-stepUP( false );
}
 
public static function compile( $source, $place = 'Command line code' ) 
{
@@ -168,28 +168,7 @@
 
private function stepBlockOperators( $endToken, $throwEndTag = true ) {
while ( $this-id != $endToken ) {
-   $result = $this-stepFirstOperator( $throwEndTag );
-   if ( !$result ) {
-   if ( $this-id == ';' ) { // Example: 
-   $this-stepUP( $throwEndTag ); // @todo 
fix it
-   } else {
-   $value = $this-getNextValue();
-   if ( $value ) { // Example: $foo=1;
-   $dummy = array( 
PHPTAGS_STACK_RESULT=null );
-   $this-addValueIntoStack( 
$value, $dummy, PHPTAGS_STACK_RESULT );
-   unset( $dummy );
-   //$this-stack[] = $value;
-   if ( $this-id != ';' ) { // 
Example: $foo=1,
-   // PHP Parse error:  
syntax error, unexpected $id, expecting ';'
-   throw new 
PhpTagsException( PhpTagsException::PARSE_SYNTAX_ERROR_UNEXPECTED, array( 
$this-id, ';' ), $this-tokenLine, $this-place );
-   }
-   $this-stepUP( $throwEndTag );
-   } else {
-   // PHP Parse error:  syntax 
error, unexpected $id
-   throw new PhpTagsException( 
PhpTagsException::PARSE_SYNTAX_ERROR_UNEXPECTED, array( $this-id ), 
$this-tokenLine, $this-place );
-   }
-   }
-   }
+   $this-stepFirstOperator( $throwEndTag ) || 
$this-stepFirsValue( $throwEndTag );
}
}
 
@@ -198,7 +177,7 @@
$text = $this-text;
switch ( $id ) {
case T_ECHO:
-   $this-stepUP();
+   $this-stepUP( true );
$value = $this-getNextValue();
if( !$value ) { // Example: echo ;
// PHP Parse error:  syntax error, 
unexpected $id
@@ -218,7 +197,7 @@
if ( current($this-tokens) != ',' ) {
break;
}
-   $this-stepUP();
+   $this-stepUP( true );
} while ( $value = $this-getNextValue() );
 
if ( $this-id != ';' ) { // Example echo foo%
@@ -241,7 +220,7 @@
return true;
case T_CONTINUE:

[MediaWiki-commits] [Gerrit] hhvm: define more jit configurations - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: hhvm: define more jit configurations
..

hhvm: define more jit configurations

Also, make the base jit size configurable.

Change-Id: I56e2edffee040c7c047490d98f7d0617f355da57
---
M modules/hhvm/manifests/init.pp
1 file changed, 22 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/175412/1

diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 8c00b82..b4392ec 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -44,6 +44,9 @@
 # [*fcgi_settings*]
 #   Ditto, except for FastCGI mode.
 #
+# [*base_jit_size*]
+#   Base jit size, in bytes. Defaults to 100 Mb
+#
 # === Examples
 #
 #  class { 'hhvm':
@@ -59,6 +62,7 @@
 $group = 'www-data',
 $fcgi_settings = {},
 $cli_settings  = {},
+$base_jit_size = to_bytes('100 Mb'),
 ) {
 requires_ubuntu('= trusty')
 
@@ -87,13 +91,15 @@
 # of the admin server.
 #
 # A ratio of 1 : 0.33 : 1 for a : a_cold : a_frozen is good general
-# guidance.
+# guidance. We also set a_prof_size, a_hot_size and g_data_size,
+# with ratios that seem like sensible defaults.
 
-$base_jit_size = to_bytes('100 Mb')
 $a_size= $base_jit_size
 $a_cold_size   = 0.33 * $base_jit_size
 $a_frozen_size = $base_jit_size
-
+$a_prof_size   = $base_jit_size
+$g_data_size   = 0.33 * $base_jit_size
+$a_hot_size= 0.15 * $base_jit_size
 
 $common_defaults = {
 date = { timezone = 'UTC' },
@@ -125,14 +131,19 @@
 $fcgi_defaults = {
 memory_limit = '300M',
 hhvm = {
-jit   = true,
-jit_a_size= $a_size,
-jit_a_cold_size   = $a_cold_size,
-jit_a_frozen_size = $a_frozen_size,
-perf_pid_map  = true,  # See 
http://www.brendangregg.com/perf.html#JIT%20Symbols
-repo  = { central = { path = 
'/run/hhvm/cache/fcgi.hhbc.sq3' } },
-admin_server  = { port = 9001 },
-server= {
+jit  = true,
+jit_a_size   = $a_size,
+jit_a_hot_size   = $a_hot_size,
+jit_a_cold_size  = $a_cold_size,
+jit_a_frozen_size= $a_frozen_size,
+jit_a_prof_size  = $a_size,
+jit_global_data_size = $g_data_size,
+perf_pid_map = true,  # See 
http://www.brendangregg.com/perf.html#JIT%20Symbols
+repo = {
+central = { path = '/run/hhvm/cache/fcgi.hhbc.sq3' }
+},
+admin_server = { port = 9001 },
+server   = {
 port   = 9000,
 type   = 'fastcgi',
 gzip_compression_level = 0,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56e2edffee040c7c047490d98f7d0617f355da57
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix wrong case of Id - change (mediawiki...MathSearch)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix wrong case of Id
..


Fix wrong case of Id

* in the code snipped fot the documentation ID was used instead of Id

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 16a8ef1..865207a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,7 +27,7 @@
 math-wmc-SelectRun: Name,
 math-wmc-SelectRunHelp : Specify a unique name for your submission, or 
overwrite an existing draft.,
 math-wmc-FileLabel : CSV File,
-math-wmc-FileHelp : Upload your results as ranked, comma separated list 
of (queryId,formulaId)-pairs. A column header of the form 
codequeryID,formulaId/code is required.,
+math-wmc-FileHelp : Upload your results as ranked, comma separated list 
of (queryId,formulaId)-pairs. A column header of the form 
codequeryId,formulaId/code is required.,
 math-wmc-RunAdded: Added submission \$1\ with Id \$2\,
 math-wmc-RunAddError: Error: Cannot add submission \$1\.,
 math-wmc-RunAddExist: Submission named \$1\ already exists with Id 
\$2\,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5520440e3885f4cfdbe32d756ae58e41fa5d3786
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [WIP] Merge commons_category_redirect.py - change (pywikibot/core)

2014-11-24 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: [WIP] Merge commons_category_redirect.py
..

[WIP] Merge commons_category_redirect.py

- use wikidata to get localized Non-empty_category_redirects
  category with -tiny option.
- Set cooldown days with -delay option
- CategoryRedirectBot becomes a subclass of pywikibot.Bot
- split code into pars

Change-Id: Iaa36e36ee39689e376c181df36784a189b40bc4f
---
M scripts/category_redirect.py
1 file changed, 137 insertions(+), 101 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/13/175413/1

diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index f6274af..2712efa 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 This bot will move pages out of redirected categories.
 
-Usage: category_redirect.py [options]
-
 The bot will look for categories that are marked with a category redirect
 template, take the first parameter of the template as the target of the
 redirect, and move all pages and subcategories of the category there. It
@@ -11,6 +9,15 @@
 A log is written under userpage/category_redirect_log. Only category pages
 that haven't been edited for a certain cooldown period (currently 7 days)
 are taken into account.
+
+-delay:#  Set an amount of days. If the category is edited more recenty
+  than given days, ignore it. Default is 7.
+
+-tiny Only loops over Category:Non-empty_category_redirects and
+  moves all images, pages and categories in redirect categories
+  to the target category.
+
+Usage: category_redirect.py [options]
 
 
 
@@ -34,17 +41,25 @@
 import cPickle
 
 
-class CategoryRedirectBot(object):
+class CategoryRedirectBot(pywikibot.Bot):
 
 Page category update bot.
 
-def __init__(self):
+def __init__(self, **kwargs):
 Constructor.
-self.cooldown = 7  # days
+self.availableOptions.update({
+'tiny': False,  # use Non-empty category redirects only
+'delay': 7,  # cool down delay in days
+})
+super(CategoryRedirectBot, self).__init__(**kwargs)
+self.cooldown = self.getOption('delay')
 self.site = pywikibot.Site()
 self.catprefix = self.site.namespace(14) + :
 self.log_text = []
 self.edit_requests = []
+self.problems = []
+self.template_list = []
+self.cat_title = None
 self.log_page = pywikibot.Page(self.site,
uUser:%(user)s/category redirect log
% {'user': self.site.username()})
@@ -53,28 +68,27 @@
 
 # Category that contains all redirected category pages
 self.cat_redirect_cat = {
-'wikipedia': {
-'ar': uتصنيف:تحويلات تصنيفات ويكيبيديا,
-'cs': uKategorie:Zastaralé kategorie,
-'da': Kategori:Omdirigeringskategorier,
-'en': Category:Wikipedia soft redirected categories,
-'es': Categoría:Wikipedia:Categorías redirigidas,
-'fa': uرده:رده‌های منتقل‌شده,
-'hu': Kategória:Kategóriaátirányítások,
-'ja': Category:移行中のカテゴリ,
-'no': Kategori:Wikipedia omdirigertekategorier,
-'pl': Kategoria:Przekierowania kategorii,
-'pt': Categoria:!Redirecionamentos de categorias,
-'ru': Категория:Википедия:Категории-дубликаты,
-'simple': Category:Category redirects,
-'sh': uKategorija:Preusmjerene kategorije Wikipedije,
-'vi': uThể loại:Thể loại đổi hướng,
-'zh': uCategory:已重定向的分类,
-},
-'commons': {
-'commons': Category:Category redirects
-}
+'commons': Category:Category redirects,
+'ar': uتصنيف:تحويلات تصنيفات ويكيبيديا,
+'cs': uKategorie:Zastaralé kategorie,
+'da': Kategori:Omdirigeringskategorier,
+'en': Category:Wikipedia soft redirected categories,
+'es': Categoría:Wikipedia:Categorías redirigidas,
+'fa': uرده:رده‌های منتقل‌شده,
+'hu': Kategória:Kategóriaátirányítások,
+'ja': Category:移行中のカテゴリ,
+'no': Kategori:Wikipedia omdirigertekategorier,
+'pl': Kategoria:Przekierowania kategorii,
+'pt': Categoria:!Redirecionamentos de categorias,
+'ru': Категория:Википедия:Категории-дубликаты,
+'simple': Category:Category redirects,
+'sh': uKategorija:Preusmjerene kategorije Wikipedije,
+'vi': uThể loại:Thể loại đổi hướng,
+'zh': uCategory:已重定向的分类,
 }
+
+# Category that contains non-empty

[MediaWiki-commits] [Gerrit] [FIX] Logentries: Use the query's site argument - change (pywikibot/core)

2014-11-24 Thread XZise (Code Review)

XZise has uploaded a new change for review.

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

Change subject: [FIX] Logentries: Use the query's site argument
..

[FIX] Logentries: Use the query's site argument

The 'title' and 'new_title' methods of LogEntry and MoveEntry both don't
use the site used to generate the log entries but the default site
object.

This is a breaking change as LogEntry and LogEntryFactory now require a
site parameter.

Bug: T75723
Change-Id: Ia965ce5c4733f9fef84d58f556dd4b1f5d46fc8b
---
M pywikibot/data/api.py
M pywikibot/logentries.py
2 files changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/14/175414/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 8aa97b4..0400f5d 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1689,7 +1689,7 @@
 ListGenerator.__init__(self, logevents, **kwargs)
 
 from pywikibot import logentries
-self.entryFactory = logentries.LogEntryFactory(logtype)
+self.entryFactory = logentries.LogEntryFactory(self.site, logtype)
 
 def result(self, pagedata):
 return self.entryFactory.create(pagedata)
diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py
index 5a71ad9..5b35cd8 100644
--- a/pywikibot/logentries.py
+++ b/pywikibot/logentries.py
@@ -37,9 +37,10 @@
 # Overriden in subclasses.
 _expectedType = None
 
-def __init__(self, apidata):
+def __init__(self, apidata, site):
 Initialize object from a logevent dict returned by MW API.
 self.data = LogDict(apidata)
+self.site = site
 if self._expectedType is not None and self._expectedType != 
self.type():
 raise Error(Wrong log type! Expecting %s, received %s instead.
 % (self._expectedType, self.type()))
@@ -59,7 +60,7 @@
 def title(self):
 Page on which action was performed.
 if not hasattr(self, '_title'):
-self._title = pywikibot.Page(pywikibot.Link(self.data['title']))
+self._title = pywikibot.Page(self.site, self.data['title'])
 return self._title
 
 def type(self):
@@ -88,9 +89,9 @@
 
 _expectedType = 'block'
 
-def __init__(self, apidata):
+def __init__(self, apidata, site):
 Constructor.
-super(BlockEntry, self).__init__(apidata)
+super(BlockEntry, self).__init__(apidata, site)
 # see 
en.wikipedia.org/w/api.php?action=querylist=logeventsletype=blocklelimit=1lestart=2009-03-04T00:35:07Z
 # When an autoblock is removed, the title field is not a page title
 # ( https://bugzilla.wikimedia.org/show_bug.cgi?id=17781 )
@@ -205,7 +206,7 @@
 def new_title(self):
 Return page object of the new title.
 if not hasattr(self, '_new_title'):
-self._new_title = 
pywikibot.Page(pywikibot.Link(self.data['move']['new_title']))
+self._new_title = pywikibot.Page(self.site, 
self.data['move']['new_title'])
 return self._new_title
 
 def suppressedredirect(self):
@@ -261,15 +262,18 @@
 'newusers': NewUsersEntry
 }
 
-def __init__(self, logtype=None):
+def __init__(self, site, logtype=None):
 
 Constructor.
 
+@param site: The site on which the log entries are created.
+@type site: BaseSite
 @param logtype: The log type of the log entries, if known in advance.
 If None, the Factory will fetch the log entry from
 the data to create each object.
 @type logtype: (letype) str : move/block/patrol/etc...
 
+self._site = site
 if logtype is None:
 self._creator = self._createFromData
 else:
@@ -286,7 +290,7 @@
 
 @return: LogEntry object representing logdata
 
-return self._creator(logdata)
+return self._creator(logdata, self._site)
 
 @staticmethod
 def _getEntryClass(logtype):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia965ce5c4733f9fef84d58f556dd4b1f5d46fc8b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de

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

[MediaWiki-commits] [Gerrit] Filter out comments from external paste - change (mediawiki...VisualEditor)

2014-11-24 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Filter out comments from external paste
..

Filter out comments from external paste

Bug: T71821
Change-Id: I165efd75adf3d4092860c6d2bc408469dba31388
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 24f6a2b..f186d84 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -250,7 +250,7 @@
// Annotations
'link', 'textStyle/span', 'textStyle/underline',
// Nodes
-   'inlineImage', 'blockImage', 'div', 'alienInline', 
'alienBlock'
+   'inlineImage', 'blockImage', 'div', 'alienInline', 
'alienBlock', 'comment'
],
removeHtmlAttributes: true
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I165efd75adf3d4092860c6d2bc408469dba31388
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hygiene: Refactor special uploads code - change (mediawiki...MobileFrontend)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Refactor special uploads code
..


Hygiene: Refactor special uploads code

This code doesn't follow the patterns set elsewhere so moving here.

Change-Id: I21a8cd3f89dfc187b0c46c513a1fcbf7c7178549
---
M includes/Resources.php
D javascripts/specials/uploads.js
A javascripts/specials/uploads/PhotoItem.js
A javascripts/specials/uploads/PhotoList.js
A javascripts/specials/uploads/UserGalleryApi.js
A javascripts/specials/uploads/init.js
R tests/qunit/specials/uploads/test_UserGalleryApi.js
7 files changed, 300 insertions(+), 266 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index 2c15059..bd63352 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1126,7 +1126,10 @@
'mobile-frontend-photo-upload-user-count',
),
'scripts' = array(
-   'javascripts/specials/uploads.js',
+   'javascripts/specials/uploads/UserGalleryApi.js',
+   'javascripts/specials/uploads/PhotoItem.js',
+   'javascripts/specials/uploads/PhotoList.js',
+   'javascripts/specials/uploads/init.js',
),
'position' = 'top',
),
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
deleted file mode 100644
index 3ebcb78..000
--- a/javascripts/specials/uploads.js
+++ /dev/null
@@ -1,263 +0,0 @@
-( function ( M, $ ) {
-   var
-   PhotoUploaderButton = M.require( 
'modules/uploads/PhotoUploaderButton' ),
-   user = M.require( 'user' ),
-   popup = M.require( 'toast' ),
-   Api = M.require( 'api' ).Api,
-   View = M.require( 'View' ),
-   corsUrl = mw.config.get( 'wgMFPhotoUploadEndpoint' ),
-   pageParams = mw.config.get( 'wgPageName' ).split( '/' ),
-   currentUserName = user.getName(),
-   userName = pageParams[1] ? pageParams[1] : currentUserName,
-   IMAGE_WIDTH = mw.config.get( 'wgMFThumbnailSizes' ).medium,
-   UserGalleryApi, PhotoItem, PhotoList,
-   icons = M.require( 'icons' );
-
-   /**
-* API for retrieving gallery photos
-* @class UserGalleryApi
-* @extends Api
-*/
-   UserGalleryApi = Api.extend( {
-   initialize: function () {
-   Api.prototype.initialize.apply( this, arguments );
-   this.limit = 10;
-   },
-   getPhotos: function () {
-   var self = this,
-   result = $.Deferred();
-
-   // FIXME: Don't simply use this.endTimestamp as 
initially this value is undefined
-   if ( this.endTimestamp !== false ) {
-   this.get( {
-   action: 'query',
-   generator: 'allimages',
-   gaisort: 'timestamp',
-   gaidir: 'descending',
-   gaiuser: userName,
-   gailimit: this.limit,
-   gaicontinue: this.endTimestamp,
-   prop: 'imageinfo',
-   origin: corsUrl ? this.getOrigin() : 
undefined,
-   // FIXME: [API] have to request 
timestamp since api returns an object
-   // rather than an array thus we need a 
way to sort
-   iiprop: 'url|timestamp',
-   iiurlwidth: IMAGE_WIDTH
-   }, {
-   url: corsUrl || this.apiUrl,
-   xhrFields: {
-   withCredentials: true
-   }
-   } ).done( function ( resp ) {
-   if ( resp.query  resp.query.pages ) {
-   // FIXME: [API] in an ideal 
world imageData would be a sorted array
-   var photos = $.map( 
resp.query.pages, getImageDataFromPage ).sort( function ( a, b ) {
-   return a.timestamp  
b.timestamp ? 1 : -1;
-   } );
-   if ( resp['query-continue'] ) {
-   self.endTimestamp

[MediaWiki-commits] [Gerrit] codfw: provision ms-be 2013/2014/2015 - change (operations/dns)

2014-11-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: codfw: provision ms-be 2013/2014/2015
..

codfw: provision ms-be 2013/2014/2015

RT #8804

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/16/175416/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8c973a5..08eb2d1 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2409,6 +2409,7 @@
 27  1H IN PTR   es2005.codfw.wmnet.
 28  1H IN PTR   es2006.codfw.wmnet.
 29  1H IN PTR   es2007.codfw.wmnet.
+30  1H IN PTR   ms-be2013.codfw.wmnet.
 
 $ORIGIN 1.192.{{ zonename }}.
 1   1H IN PTR   lvs2001.codfw.wmnet.
@@ -2458,6 +2459,7 @@
 29  1H IN PTR   es2008.codfw.wmnet.
 30  1H IN PTR   es2009.codfw.wmnet.
 31  1H IN PTR   es2010.codfw.wmnet.
+32  1H IN PTR   ms-be2014.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
@@ -2496,6 +2498,7 @@
 15  1H IN PTR   ms-be2010.codfw.wmnet.
 16  1H IN PTR   ms-be2011.codfw.wmnet.
 17  1H IN PTR   ms-be2012.codfw.wmnet.
+18  1H IN PTR   ms-be2015.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index da25518..b1c09f2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2082,6 +2082,9 @@
 ms-be2010   1H  IN A10.192.32.15
 ms-be2011   1H  IN A10.192.32.16
 ms-be2012   1H  IN A10.192.32.17
+ms-be2013   1H  IN A10.192.0.30
+ms-be2014   1H  IN A10.192.16.32
+ms-be2015   1H  IN A10.192.32.18
 ms-fe2001   1H  IN A10.192.0.23
 ms-fe2002   1H  IN A10.192.0.24
 ms-fe2003   1H  IN A10.192.16.25

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1039b9c06327ae2370fe6b2669e3d024684c6faf
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Rename paste rules to import rules - change (VisualEditor/VisualEditor)

2014-11-24 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: [BREAKING CHANGE] Rename paste rules to import rules
..

[BREAKING CHANGE] Rename paste rules to import rules

Also used by drag and drop

Change-Id: I40d1d78861f23e06b079de5f3b99323628150099
---
M src/ce/ve.ce.Surface.js
M src/dm/lineardata/ve.dm.ElementLinearData.js
M src/init/sa/ve.init.sa.Target.js
M src/init/ve.init.Target.js
M src/ui/ve.ui.Surface.js
M src/ui/widgets/ve.ui.SurfaceWidget.js
6 files changed, 31 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/18/175418/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 9a442db..23ff9d3 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -894,7 +894,7 @@
// Properties may be nullified by other events, so cache before 
setTimeout
var selectionJSON, dragSelection, dragRange, originFragment, originData,
targetRange, targetOffset, targetFragment, dragHtml, dragText,
-   htmlDoc, doc, data, pasteRules,
+   htmlDoc, doc, data, importRules,
i, l, name, insert,
fileHandlers = [],
dataTransfer = e.originalEvent.dataTransfer,
@@ -985,15 +985,15 @@
fileHandlers[i].getInsertableData().done( 
insert );
}
} else if ( dragHtml ) {
-   pasteRules = this.getSurface().getPasteRules();
+   importRules = this.getSurface().getImportRules();
htmlDoc = ve.createDocumentFromHtml( dragHtml );
doc = ve.dm.converter.getModelFromDom( htmlDoc, 
this.getModel().getDocument().getHtmlDocument() );
data = doc.data;
// Clear metadata
doc.metadata = new ve.dm.MetaLinearData( 
doc.getStore(), new Array( 1 + data.getLength() ) );
-   data.sanitize( pasteRules.external, this.pasteSpecial );
-   if ( pasteRules.all ) {
-   data.sanitize( pasteRules.all );
+   data.sanitize( importRules.external, this.pasteSpecial 
);
+   if ( importRules.all ) {
+   data.sanitize( importRules.all );
}
data.remapInternalListKeys( 
this.model.getDocument().getInternalList() );
// Initialize node tree
@@ -1537,7 +1537,7 @@
$elements, parts, pasteData, slice, tx, internalListRange,
data, doc, htmlDoc,
context, left, right, contextRange,
-   pasteRules = this.getSurface().getPasteRules(),
+   importRules = this.getSurface().getImportRules(),
beforePasteData = this.beforePasteData || {},
selection = this.model.getSelection(),
view = this;
@@ -1628,8 +1628,8 @@
ve.copy( slice.getOriginalData() )
);
 
-   if ( pasteRules.all || this.pasteSpecial ) {
-   pasteData.sanitize( pasteRules.all || {}, 
this.pasteSpecial );
+   if ( importRules.all || this.pasteSpecial ) {
+   pasteData.sanitize( importRules.all || {}, 
this.pasteSpecial );
}
 
// Annotate
@@ -1649,8 +1649,8 @@
ve.copy( slice.getBalancedData() )
);
 
-   if ( pasteRules.all || this.pasteSpecial ) {
-   pasteData.sanitize( pasteRules.all || {}, 
this.pasteSpecial );
+   if ( importRules.all || this.pasteSpecial ) {
+   pasteData.sanitize( importRules.all || {}, 
this.pasteSpecial );
}
 
// Annotate
@@ -1696,14 +1696,14 @@
data = doc.data;
// Clear metadata
doc.metadata = new ve.dm.MetaLinearData( doc.getStore(), new 
Array( 1 + data.getLength() ) );
-   // If the clipboardKey isn't set (paste from non-VE instance) 
use external paste rules
+   // If the clipboardKey isn't set (paste from non-VE instance) 
use external import rules
if ( !clipboardKey ) {
-   data.sanitize( pasteRules.external, this.pasteSpecial );
-   if ( pasteRules.all ) {
-   data.sanitize( pasteRules.all );
+   data.sanitize( importRules.external, this.pasteSpecial 
);
+   if ( importRules.all ) {
+   data.sanitize( importRules.all );

[MediaWiki-commits] [Gerrit] Rename paste rules to import rules - change (mediawiki...VisualEditor)

2014-11-24 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Rename paste rules to import rules
..

Rename paste rules to import rules

Also used by drag and drop

Depends on I40d1d78 in core.

Change-Id: I5cfa15ab3efd03e2c64c2f9f725cb3098f53b32a
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
4 files changed, 14 insertions(+), 14 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index bd0f12d..16d0efa 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -432,7 +432,7 @@
},
history: 'updateToolbarSaveButtonState'
} );
-   this.surface.setPasteRules( this.constructor.static.pasteRules );
+   this.surface.setImportRules( this.constructor.static.importRules );
 
// TODO: mwTocWidget should probably live in a ve.ui.MWSurface subclass
if ( mw.config.get( 'wgVisualEditorConfig' ).enableTocWidget ) {
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 24f6a2b..9ad9cbd 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -244,7 +244,7 @@
}
 ];
 
-ve.init.mw.Target.static.pasteRules = {
+ve.init.mw.Target.static.importRules = {
external: {
blacklist: [
// Annotations
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index f96700a..3a2f10b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -158,18 +158,18 @@
 ];
 
 /**
- * Get the paste rules for the surface widget in the dialog
+ * Get the import rules for the surface widget in the dialog
  *
  * @see ve.dm.ElementLinearData#sanitize
- * @return {Object} Paste rules
+ * @return {Object} Import rules
  */
-ve.ui.MWMediaDialog.static.getPasteRules = function () {
+ve.ui.MWMediaDialog.static.getImportRules = function () {
return ve.extendObject(
-   ve.copy( ve.init.target.constructor.static.pasteRules ),
+   ve.copy( ve.init.target.constructor.static.importRules ),
{
all: {
blacklist: OO.simpleArrayUnion(
-   ve.getProp( 
ve.init.target.constructor.static.pasteRules, 'all', 'blacklist' ) || [],
+   ve.getProp( 
ve.init.target.constructor.static.importRules, 'all', 'blacklist' ) || [],
[
// Tables (but not lists) are 
possible in wikitext with a leading
// line break but we prevent 
creating these with the UI
@@ -896,7 +896,7 @@
$: this.$,
tools: this.constructor.static.toolbarGroups,
commands: this.constructor.static.surfaceCommands,
-   pasteRules: this.constructor.static.getPasteRules()
+   importRules: this.constructor.static.getImportRules()
}
);
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 68fc262..9392b9d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -150,18 +150,18 @@
 ];
 
 /**
- * Get the paste rules for the surface widget in the dialog
+ * Get the import rules for the surface widget in the dialog
  *
  * @see ve.dm.ElementLinearData#sanitize
- * @return {Object} Paste rules
+ * @return {Object} Import rules
  */
-ve.ui.MWReferenceDialog.static.getPasteRules = function () {
+ve.ui.MWReferenceDialog.static.getImportRules = function () {
return ve.extendObject(
-   ve.copy( ve.init.target.constructor.static.pasteRules ),
+   ve.copy( ve.init.target.constructor.static.importRules ),
{
all: {
blacklist: OO.simpleArrayUnion(
-   ve.getProp( 
ve.init.target.constructor.static.pasteRules, 'all', 'blacklist' ) || [],
+   ve.getProp( 
ve.init.target.constructor.static.importRules, 'all', 'blacklist' ) || [],
[
// Nested

[MediaWiki-commits] [Gerrit] Set signature in decorators - change (pywikibot/core)

2014-11-24 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Set __signature__ in decorators
..

Set __signature__ in decorators

PEP 362 introduces __signature__ for functions as a way to alter
function arguments in a decorator in a way that can be reliably
inspected.  It is implemented in Python 3.4, and back ports are
available.

Sphinx 1.3 on Python 3.4 uses the inspect module to automatically
describe function arguments, allowing documentation to be accurate
even in the presence of decorators.

deprecated_args updates the signature to include the deprecated
arguments, either providing a note in the default value, or
a default of NotImplemented if there is no substitute argument.

Change-Id: I2aeef8c8f31cdb01f18e199834b2f1a8ef8b043c
---
M pywikibot/site.py
M pywikibot/tools.py
2 files changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/19/175419/1

diff --git a/pywikibot/site.py b/pywikibot/site.py
index 1e6e614..2a55df6 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -30,7 +30,7 @@
 from pywikibot.tools import (
 itergroup, deprecated, deprecate_arg, UnicodeMixin, ComparableMixin,
 redirect_func, add_decorated_full_name, deprecated_args,
-SelfCallDict, SelfCallString,
+SelfCallDict, SelfCallString, signature,
 )
 from pywikibot.tools import MediaWikiVersion as LV
 from pywikibot.throttle import Throttle
@@ -973,6 +973,7 @@
 if not hasattr(fn, '__full_name__'):
 add_decorated_full_name(fn)
 callee.__full_name__ = fn.__full_name__
+callee.__signature__ = signature(fn)
 return callee
 
 return decorator
@@ -1001,6 +1002,7 @@
 callee.__name__ = fn.__name__
 callee.__doc__ = fn.__doc__
 callee.__module__ = fn.__module__
+callee.__signature__ = signature(fn)
 if not hasattr(fn, '__full_name__'):
 add_decorated_full_name(fn)
 callee.__full_name__ = fn.__full_name__
diff --git a/pywikibot/tools.py b/pywikibot/tools.py
index d71ad8a..777149b 100644
--- a/pywikibot/tools.py
+++ b/pywikibot/tools.py
@@ -456,6 +456,12 @@
 # only one arg, and that arg be a callable, as it will be detected as
 # a deprecator without any arguments.
 
+# Use a dummy function if inspect.signature (PEP 362; py 3.4) does not exist.
+if 'signature' in inspect.__dict__:
+signature = inspect.signature
+else:
+signature = lambda x: None
+
 
 def add_decorated_full_name(obj):
 Extract full object name, including class, and store in __full_name__.
@@ -527,6 +533,7 @@
 inner_wrapper.__doc__ = obj.__doc__
 inner_wrapper.__name__ = obj.__name__
 inner_wrapper.__module__ = obj.__module__
+inner_wrapper.__signature__ = signature(obj)
 
 # The decorator being decorated may have args, so both
 # syntax need to be supported.
@@ -581,6 +588,7 @@
 wrapper.__doc__ = obj.__doc__
 wrapper.__name__ = obj.__name__
 wrapper.__module__ = obj.__module__
+wrapper.__signature__ = signature(obj)
 return wrapper
 
 without_parameters = len(args) == 1 and len(kwargs) == 0 and 
callable(args[0])
@@ -662,6 +670,19 @@
 wrapper.__doc__ = obj.__doc__
 wrapper.__name__ = obj.__name__
 wrapper.__module__ = obj.__module__
+wrapper.__signature__ = signature(obj)
+if wrapper.__signature__:
+# Build a new signature with deprecated args added.
+params = collections.OrderedDict()
+for param in wrapper.__signature__.parameters.values():
+params[param.name] = param.replace()
+for old_arg, new_arg in arg_pairs.items():
+params[old_arg] = inspect.Parameter(
+old_arg, kind=inspect._POSITIONAL_OR_KEYWORD,
+default='[deprecated name of ' + new_arg + ']' if new_arg
+else NotImplemented)
+wrapper.__signature__ = inspect.Signature()
+wrapper.__signature__._parameters = params
 if not hasattr(obj, '__full_name__'):
 add_decorated_full_name(obj)
 wrapper.__full_name__ = obj.__full_name__

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aeef8c8f31cdb01f18e199834b2f1a8ef8b043c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com

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

[MediaWiki-commits] [Gerrit] WIP MT: Subsequence extraction and mapping algorithm impleme... - change (mediawiki...cxserver)

2014-11-24 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: WIP MT: Subsequence extraction and mapping algorithm 
implementation
..

WIP MT: Subsequence extraction and mapping algorithm implementation

Change-Id: I5b97362d1bd75f7719eabd85bea19169ef3bc230
---
M index.js
M lineardoc/LinearDoc.js
2 files changed, 99 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/20/175420/1

diff --git a/index.js b/index.js
index f955bdb..167639e 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,8 @@
 module.exports = {
Segmenter: require( './segmentation/CXSegmenter.js' ).CXSegmenter,
Apertium: require( './mt/Apertium.js' ),
+   Yandex: require( './mt/Yandex.js' ),
+   MTClient: require( './mt/MTClient.js' ),
LinearDoc: require( './lineardoc/LinearDoc.js' ),
Dictionary: require( './dictionary' )
 };
diff --git a/lineardoc/LinearDoc.js b/lineardoc/LinearDoc.js
index 3144bad..bb3581a 100644
--- a/lineardoc/LinearDoc.js
+++ b/lineardoc/LinearDoc.js
@@ -67,7 +67,7 @@
}
attributes.sort();
for ( i = 0, len = attributes.length; i  len; i++ ) {
-   attr = attributes[i];
+   attr = attributes[ i ];
html.push( ' ' + esc( attr ) + '=' + escAttr( tag.attributes[ 
attr ] ) + '' );
}
if ( tag.isSelfClosing ) {
@@ -84,9 +84,12 @@
  * @return {Object} Cloned tag
  */
 function cloneOpenTag( tag ) {
-   var attr, newTag = { name: tag.name, attributes: {} };
+   var attr, newTag = {
+   name: tag.name,
+   attributes: {}
+   };
for ( attr in tag.attributes ) {
-   newTag.attributes[attr] = tag.attributes[attr];
+   newTag.attributes[ attr ] = tag.attributes[ attr ];
}
return newTag;
 }
@@ -202,7 +205,7 @@
'map', 'object', 'pre', 'progress', 'video',
// non-annotation inline tags
'img', 'br'
-] ) );
+ ] ) );
 
 /**
  * Find the boundaries that lie in each chunk
@@ -225,16 +228,18 @@
 
// Get boundaries in order, disregarding the start of the first chunk
boundaries = boundaries.slice();
-   boundaries.sort( function ( a, b ) { return a - b; } );
-   while ( boundaries[boundaryPtr] === 0 ) {
+   boundaries.sort( function ( a, b ) {
+   return a - b;
+   } );
+   while ( boundaries[ boundaryPtr ] === 0 ) {
boundaryPtr++;
}
for ( i = 0, len = chunks.length; i  len; i++ ) {
groupBoundaries = [];
-   chunk = chunks[i];
+   chunk = chunks[ i ];
chunkLength = getLength( chunk );
while ( true ) {
-   boundary = boundaries[boundaryPtr];
+   boundary = boundaries[ boundaryPtr ];
if ( boundary === undefined || boundary  offset + 
chunkLength - 1 ) {
// beyond the interior of this chunk
break;
@@ -285,7 +290,10 @@
this.offsets = [];
cursor = 0;
for ( i = 0, len = this.textChunks.length; i  len; i++ ) {
-   this.offsets[ i ] = { start: cursor, length: this.textChunks[ i 
].text.length };
+   this.offsets[ i ] = {
+   start: cursor,
+   length: this.textChunks[ i ].text.length
+   };
cursor += this.offsets[ i ].length;
}
 }
@@ -382,7 +390,7 @@
offset = this.offsets[ i ].start;
if ( textChunk.text.length  0 ) {
continue;
-   } 
+   }
if ( !emptyTextChunks[ offset ] ) {
emptyTextChunks[ offset ] = [];
}
@@ -391,7 +399,9 @@
for ( offset in emptyTextChunks ) {
emptyTextChunkOffsets.push( offset );
}
-   emptyTextChunkOffsets.sort( function ( a, b ) { return a - b; } );
+   emptyTextChunkOffsets.sort( function ( a, b ) {
+   return a - b;
+   } );
 
for ( i = 0, iLen = rangeMappings.length; i  iLen; i++ ) {
// Copy tags from source text start offset
@@ -488,7 +498,9 @@
} );
pos += tail.length;
}
-   return new TextBlock( textChunks.map( function ( x ) { return 
x.textChunk; } ) );
+   return new TextBlock( textChunks.map( function ( x ) {
+   return x.textChunk;
+   } ) );
 };
 
 /**
@@ -642,14 +654,14 @@
// Setup: currentTextChunks for current segment, and allTextChunks for 
all segments
allTextChunks = [];
currentTextChunks = [];
+
function flushChunks() {
var modifiedTextChunks;
if ( currentTextChunks.length === 0 ) {

[MediaWiki-commits] [Gerrit] Fix APISite.search incorrect deprecate_arg used - change (pywikibot/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix APISite.search incorrect deprecate_arg used
..


Fix APISite.search incorrect deprecate_arg used

APISite.search listed 'number' as a deprecated argument
name for the new argument 'limit'.  However 'limit' isn't
a valid argument; 'total' is the valid argument name.

Change-Id: I3ea14e96de1bb87674c42859189c7ff2f791d436
---
M pywikibot/site.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pywikibot/site.py b/pywikibot/site.py
index 142e419..1e6e614 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3479,7 +3479,7 @@
 
 return rcgen
 
-@deprecate_arg(number, limit)
+@deprecated_args(number=total)
 def search(self, searchstring, namespaces=None, where=text,
getredirects=False, step=None, total=None, content=False):
 Iterate Pages that contain the searchstring.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea14e96de1bb87674c42859189c7ff2f791d436
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
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 its-phabricator-from-bugzilla f9fd2db7a62119ab9a6d1adfd3... - change (operations...plugins)

2014-11-24 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Add its-phabricator-from-bugzilla 
f9fd2db7a62119ab9a6d1adfd3110b6e59b7a872
..

Add its-phabricator-from-bugzilla f9fd2db7a62119ab9a6d1adfd3110b6e59b7a872

This plugin extracts the issue id using the bugzilla commentLink,
adds 2000 to the ids, and then takes actions on the resulting id on
phabricator. Using this plugin, changes that still use the bugzilla
bug numbers cause actions on the corresponding task in Phabricator.

For building this plugin, hooks-its commit
  3b8a1d4abaa6010faa0a18af8b7a00e68593f50c
got used.

Bug: T1327
Change-Id: I3e9f94c91c35f0eff87b52fc9cd4c1289f3cb20d
---
A its-phabricator-from-bugzilla.jar
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/gerrit/plugins 
refs/changes/21/175421/1

diff --git a/its-phabricator-from-bugzilla.jar 
b/its-phabricator-from-bugzilla.jar
new file mode 100644
index 000..20cba44
--- /dev/null
+++ b/its-phabricator-from-bugzilla.jar
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e9f94c91c35f0eff87b52fc9cd4c1289f3cb20d
Gerrit-PatchSet: 1
Gerrit-Project: operations/gerrit/plugins
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at

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

[MediaWiki-commits] [Gerrit] Fix indentation in package.json - change (mediawiki...cxserver)

2014-11-24 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Fix indentation in package.json
..

Fix indentation in package.json

Change-Id: Ie2c0f5ec9342bf45cc2e905458ec0e98dc9a34bb
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/package.json b/package.json
index 5e28257..bdaec56 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
request: *,
sax: 0.6.0,
winston: *,
-html-entities: 1.0.10
+   html-entities: 1.0.10
},
devDependencies: {
assert: 1.1.1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2c0f5ec9342bf45cc2e905458ec0e98dc9a34bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com

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

[MediaWiki-commits] [Gerrit] Hygiene: Goodbye mobile.stable.common - change (mediawiki...MobileFrontend)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Goodbye mobile.stable.common
..


Hygiene: Goodbye mobile.stable.common

Change-Id: I9f3ffdb8ac5c5eba375a880031e11d545097adf1
---
M includes/Resources.php
1 file changed, 12 insertions(+), 25 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index 2c15059..9d5fe50 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -206,10 +206,13 @@
 
'mobile.editor' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
-   'mobile.stable.common',
-   'mobile.overlays',
+   'mobile.startup',
+   'mobile.drawers',
'mediawiki.ui.input',
'mobile.settings',
+   'mobile.toast',
+   // Let's ensure toggle styles have loaded before adding 
edit section links
+   'mobile.toggling',
),
'messages' = array(
// editor.js
@@ -321,7 +324,7 @@
'mobile.stable',
'mobile.templates',
'mobile.editor.common',
-   'mobile.stable.common',
+   'mobile.overlays',
),
'styles' = array(
'less/modules/editor/VisualEditorOverlay.less',
@@ -688,23 +691,6 @@
),
),
 
-   // Important: This module is loaded on both mobile and desktop skin
-   // FIXME: Do not add anything to this module and please remove it
-   'mobile.stable.common' = $wgMFResourceFileModuleBoilerplate + array(
-   'dependencies' = array(
-   'mobile.startup',
-   'mediawiki.jqueryMsg',
-   'mediawiki.util',
-   'mobile.templates',
-   'mobile.overlays',
-   'jquery.cookie',
-   'mediawiki.ui.anchor',
-   'mobile.drawers',
-   'mobile.toast',
-   'mobile.redirect',
-   ),
-   ),
-
'mobile.references.beta' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
'mobile.references',
@@ -793,8 +779,9 @@
'dependencies' = array(
'mobile.startup',
'mobile.templates',
-   // Needs Drawer
-   'mobile.stable.common',
+   'mobile.drawers',
+   'mobile.ajax',
+   'mobile.toast',
),
'scripts' = array(
'javascripts/modules/watchstar/WatchstarApi.js',
@@ -861,7 +848,6 @@
'mobile.nearby' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
'mobile.ajax',
-   'mobile.stable.common',
// @todo FIXME: Kill this dependency!
'mobile.special.nearby.styles',
'mediawiki.language',
@@ -1155,7 +1141,6 @@
'mobile.special.mobilediff.scripts' = 
$wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
'mobile.loggingSchemas',
-   'mobile.stable.common',
),
'scripts' = array(
'javascripts/specials/mobilediff.js',
@@ -1244,7 +1229,6 @@
'mobile.loggingSchemas',
// FIXME: Review the modules that follow. Ensure they 
are in the correct module definition.
'mobile.user',
-   'mobile.stable.common',
'mediawiki.util',
'mobile.templates',
'mediawiki.language',
@@ -1257,6 +1241,9 @@
'mobile.issues',
'mobile.search',
'mobile.references',
+   'mobile.redirect',
+   // FIXME: only load when uploads enabled
+   'mobile.upload.ui',
),
'scripts' = array(
'javascripts/externals/micro.autosize.js',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f3ffdb8ac5c5eba375a880031e11d545097adf1
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] reprepro: add update source cassandra to trusty - change (operations/puppet)

2014-11-24 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

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

Change subject: reprepro: add update source cassandra to trusty
..

reprepro: add update source cassandra to trusty

RT: 8530
Change-Id: I8e17c087c833088866875d1c2766404b04012ac3
---
M modules/install-server/files/reprepro/distributions
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/175423/1

diff --git a/modules/install-server/files/reprepro/distributions 
b/modules/install-server/files/reprepro/distributions
index b413a92..be38854 100644
--- a/modules/install-server/files/reprepro/distributions
+++ b/modules/install-server/files/reprepro/distributions
@@ -65,7 +65,7 @@
 Architectures: source amd64 i386
 Components: main universe non-free
 UDebComponents: main
-Update: hwraid elasticsearch
+Update: hwraid cassandra elasticsearch
 Description: Wikimedia specific packages for Ubuntu Trusty Tahr
 SignWith: default
 DebOverride: deb-override

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e17c087c833088866875d1c2766404b04012ac3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Allow unexpectedSuccess and expectedFailure - change (pywikibot/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Allow unexpectedSuccess and expectedFailure
..


Allow unexpectedSuccess and expectedFailure

Python 3.4, and unittest2 0.8, error on unexpected successes
and warn on expected failure, if those conditions are not handled.

As these are used in pywikibot tests to capture current (usually wrong)
behaviour, and unexpected successes may be due to varying data and even
execution time in the case of script tests, it is not desirable
to fail the build as a consequence.  They need to be investigated
by a human to determine why the behaviour changed.

One way to handle them is to add hooks on the TestCase subclass,
_addUnexpectedSuccess and _addExpectedFailure.  This patch uses
that approach, reporting to stdout 'unexpected success' and
'expected failure', and marks the test as a success.  This closely
resembles the behaviour in Python 2.7, 3.3 and unittest2 0.6.

Change-Id: I8468cb4507414d55f38ec1f73beda311029f4f44
---
M tests/aspects.py
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  XZise: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/aspects.py b/tests/aspects.py
index 00ee838..4aad55e 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -78,6 +78,18 @@
 
 return self.assertItemsEqual(*args, **kwargs)
 
+def _addUnexpectedSuccess(self, result):
+Report and ignore.
+print(' unexpected success ', end='')
+sys.stdout.flush()
+result.addSuccess(self)
+
+def _addExpectedFailure(self, result, exc_info=None):
+Report and ignore.
+print(' expected failure ', end='')
+sys.stdout.flush()
+result.addSuccess(self)
+
 def assertPageInNamespaces(self, page, namespaces):
 
 Assert that Pages is in namespaces.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8468cb4507414d55f38ec1f73beda311029f4f44
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] reprepro: add update source cassandra to trusty - change (operations/puppet)

2014-11-24 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: reprepro: add update source cassandra to trusty
..


reprepro: add update source cassandra to trusty

RT: 8530
Change-Id: I8e17c087c833088866875d1c2766404b04012ac3
---
M modules/install-server/files/reprepro/distributions
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install-server/files/reprepro/distributions 
b/modules/install-server/files/reprepro/distributions
index b413a92..be38854 100644
--- a/modules/install-server/files/reprepro/distributions
+++ b/modules/install-server/files/reprepro/distributions
@@ -65,7 +65,7 @@
 Architectures: source amd64 i386
 Components: main universe non-free
 UDebComponents: main
-Update: hwraid elasticsearch
+Update: hwraid cassandra elasticsearch
 Description: Wikimedia specific packages for Ubuntu Trusty Tahr
 SignWith: default
 DebOverride: deb-override

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e17c087c833088866875d1c2766404b04012ac3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] mediawiki: allow toggling experimental hhvm settings - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: mediawiki: allow toggling experimental hhvm settings
..

mediawiki: allow toggling experimental hhvm settings

We allow adding specific keys to the hhvm.ini fastcgi settings depending
on a configuration flag; this will allow to have groups of hosts with
such features enabled without needing to copy the standard settings
around. We also add a deep_merge() function that allows recursively
merging of arrays.

Change-Id: I5d70d3aaddded11ea73f9842ef9beb241a074678
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/hhvm.pp
M modules/wmflib/README.md
A modules/wmflib/lib/puppet/parser/functions/deep_merge.rb
3 files changed, 94 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/175425/1

diff --git a/modules/mediawiki/manifests/hhvm.pp 
b/modules/mediawiki/manifests/hhvm.pp
index 6225a64..0b9c751 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -2,7 +2,10 @@
 #
 # Configures HHVM to serve MediaWiki in FastCGI mode.
 #
-class mediawiki::hhvm {
+# [*experimental_features*]
+#   Boolean parameter. Can be used on single hosts to enable
+#   experimental features.
+class mediawiki::hhvm($experimental_features = false) {
 requires_ubuntu('= trusty')
 
 include ::hhvm::admin
@@ -19,21 +22,38 @@
 floor(to_bytes($::memorytotal) / to_bytes('120M')),
 $::processorcount*4)
 
+
+$fcgi_standard_settings = {
+error_handling = {
+call_user_handler_on_fatals = true,
+},
+server = {
+source_root   = '/srv/mediawiki/docroot',
+error_document500 = '/srv/mediawiki/hhvm-fatal-error.php',
+error_document404 = '/srv/mediawiki/w/404.php',
+request_init_document = 
'/srv/mediawiki/wmf-config/HHVMRequestInit.php',
+thread_count  = $max_threads,
+},
+}
+
+$experimental_settings = {}
+
+if ($experimental_features) {
+$fcgi_settings = deep_merge(
+$fcgi_standard_settings,
+$experimental_settings)
+}
+else {
+$fcgi_settings = $fcgi_standard_settings
+}
+
+
 class { '::hhvm':
 user  = 'apache',
 group = 'apache',
 fcgi_settings = {
 hhvm = {
-error_handling = {
-call_user_handler_on_fatals = true,
-},
-server = {
-source_root   = '/srv/mediawiki/docroot',
-error_document500 = 
'/srv/mediawiki/hhvm-fatal-error.php',
-error_document404 = '/srv/mediawiki/w/404.php',
-request_init_document = 
'/srv/mediawiki/wmf-config/HHVMRequestInit.php',
-thread_count  = $max_threads,
-},
+$fcgi_settings
 },
 },
 }
diff --git a/modules/wmflib/README.md b/modules/wmflib/README.md
index 882a17a..144bce8 100644
--- a/modules/wmflib/README.md
+++ b/modules/wmflib/README.md
@@ -14,6 +14,23 @@
 $languages = [ 'finnish', 'french', 'greek', 'hebrew' ]
 $packages = apply_format('texlive-lang-%s', $languages)
 
+## deep_merge
+
+`deep_merge( hash $a, hash $b)`
+
+Merges two or more hashes together and returns the resulting hash.
+When there is a duplicate key, the key in the rightmost hash will
+win; however if the key is an hash, it will be merged itself as
+well.
+
+### Examples
+$hash1 = {'one' = 1, 'two', = { 'numeral' = 2}}
+$hash2 = {'two' = {'spanish' = 'dos'}, 'three', = 'tres'}
+$merged_hash = deep_merge($hash1, $hash2)
+# The resulting hash is equivalent to:
+# $merged_hash =  {'one' = 1, 'two' = {'numeral' = 2,
+#  'spanish' = 'dos'}, 'three' = 'tres'}
+
 
 ## ensure_directory
 
diff --git a/modules/wmflib/lib/puppet/parser/functions/deep_merge.rb 
b/modules/wmflib/lib/puppet/parser/functions/deep_merge.rb
new file mode 100644
index 000..df5d7a2
--- /dev/null
+++ b/modules/wmflib/lib/puppet/parser/functions/deep_merge.rb
@@ -0,0 +1,46 @@
+class Hash
+  def deep_merge(hash)
+hash.keys.each do |key|
+  if hash[key].is_a? Hash and self[key].is_a? Hash
+self[key].deep_merge(hash[key])
+next
+  end
+  self[key] = hash[key]
+end
+  end
+end
+
+module Puppet::Parser::Functions
+  newfunction(:deep_merge, :type = :rvalue, :doc = -'ENDHEREDOC') do |args|
+Merges two or more hashes together and returns the resulting hash.
+
+For example:
+
+$hash1 = {'one' = 1, 'two', = 2}
+$hash2 = {'two' = 'dos', 'three', = 'tres'}
+$merged_hash = deep_merge($hash1, $hash2)
+# The resulting hash is equivalent to:
+

[MediaWiki-commits] [Gerrit] mediawiki: adjust hhvm max threads to number of cpus as well - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: mediawiki: adjust hhvm max threads to number of cpus as well
..

mediawiki: adjust hhvm max threads to number of cpus as well

It seems HHVM can't work well whenever its thread count gets very high
compared to the available processors, so we also limit the max number of
running threads based on that as well.

This would result in:
* 96 threads on smaller appservers (we had 100)
* 128 threads on larger appservers (we had 536)

Change-Id: I204c55c5bea378ccbf65a363cfc8ad29b29bea27
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/hhvm.pp
1 file changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/modules/mediawiki/manifests/hhvm.pp 
b/modules/mediawiki/manifests/hhvm.pp
index 69ca841..6225a64 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -12,10 +12,12 @@
 include ::mediawiki::users
 include ::mediawiki::hhvm::housekeeping
 
-# Derive HHVM's thread count by dividing RAM by 120 MiB.
-# This works out to be 100 threads on 12 GiB servers and
-# 536 threads on 64 GiB servers.
-$max_threads = floor(to_bytes($::memorytotal) / to_bytes('120M'))
+# Derive HHVM's thread count by taking the smallest of:
+#  - the memory of the system divided by a typical thread memory allocation
+#  - processor count * 4 (we have hyperthreading)
+$max_threads = min(
+floor(to_bytes($::memorytotal) / to_bytes('120M')),
+$::processorcount*4)
 
 class { '::hhvm':
 user  = 'apache',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I204c55c5bea378ccbf65a363cfc8ad29b29bea27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Don't include redirects in json dumps - change (mediawiki...Wikibase)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Don't include redirects in json dumps
..


Don't include redirects in json dumps

Bug: 72678
Change-Id: I3c85ddcaf7b8947d08811135e9e56287f59aad3f
---
M repo/includes/Dumpers/JsonDumpGenerator.php
M repo/maintenance/dumpJson.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
3 files changed, 51 insertions(+), 6 deletions(-)

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



diff --git a/repo/includes/Dumpers/JsonDumpGenerator.php 
b/repo/includes/Dumpers/JsonDumpGenerator.php
index d443213..2148591 100644
--- a/repo/includes/Dumpers/JsonDumpGenerator.php
+++ b/repo/includes/Dumpers/JsonDumpGenerator.php
@@ -13,10 +13,13 @@
 use Wikibase\Lib\Serializers\Serializer;
 use Wikibase\Lib\Store\EntityLookup;
 use Wikibase\Lib\Store\StorageException;
+use Wikibase\Lib\Store\RedirectResolvingEntityLookup;
+use Wikibase\Lib\Store\UnresolvedRedirectException;
 use Wikibase\Repo\Store\EntityIdPager;
 
 /**
- * JsonDumpGenerator generates an JSON dump of a given set of entities.
+ * JsonDumpGenerator generates an JSON dump of a given set of entities, 
excluding
+ * redirects.
  *
  * @since 0.5
  *
@@ -83,7 +86,7 @@
 
/**
 * @param resource $out
-* @param EntityLookup $lookup
+* @param EntityLookup $lookup Must not resolve redirects
 * @param Serializer $entitySerializer
 *
 * @throws InvalidArgumentException
@@ -91,6 +94,9 @@
public function __construct( $out, EntityLookup $lookup, Serializer 
$entitySerializer ) {
if ( !is_resource( $out ) ) {
throw new InvalidArgumentException( '$out must be a 
file handle!' );
+   }
+   if ( $lookup instanceof RedirectResolvingEntityLookup ) {
+   throw new InvalidArgumentException( '$lookup must not 
resolve redirects!' );
}
 
$this-out = $out;
@@ -237,6 +243,9 @@
 
try {
$json = $this-generateJsonForEntityId( 
$entityId );
+   if ( $json === null ) {
+   continue;
+   }
 
if ( $dumpCount  0 ) {
$this-writeToDump( ,\n );
@@ -250,6 +259,13 @@
}
}
 
+   /**
+* @param EntityId $entityId
+*
+* @throws StorageException
+*
+* @return string|null
+*/
private function generateJsonForEntityId( EntityId $entityId ) {
try {
$entity = $this-entityLookup-getEntity( $entityId );
@@ -260,6 +276,8 @@
} catch( MWContentSerializationException $ex ) {
throw new StorageException( 'Deserialization error for '
. $entityId-getSerialization() );
+   } catch( UnresolvedRedirectException $e ) {
+   return null;
}
 
$data = $this-entitySerializer-getSerialized( $entity );
diff --git a/repo/maintenance/dumpJson.php b/repo/maintenance/dumpJson.php
index 3e00b25..9f1ae51 100644
--- a/repo/maintenance/dumpJson.php
+++ b/repo/maintenance/dumpJson.php
@@ -19,6 +19,7 @@
 use Wikibase\Repo\IO\EntityIdReader;
 use Wikibase\Repo\IO\LineReader;
 use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\Lib\Store\RevisionBasedEntityLookup;
 use Wikibase\Repo\WikibaseRepo;
 
 $basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH' 
) : __DIR__ . '/../../../..';
@@ -86,8 +87,10 @@
//TODO: allow injection for unit tests
$this-entityPerPage = 
WikibaseRepo::getDefaultInstance()-getStore()-newEntityPerPage();
 
-   // Use an uncached EntityRevisionLookup here to avoid memory 
leaks
-   $this-entityLookup = 
WikibaseRepo::getDefaultInstance()-getEntityLookup( 'uncached' );
+   // Use an uncached EntityRevisionLookup here to avoid leaking 
memory (we only need every entity once)
+   $revisionLookup = 
WikibaseRepo::getDefaultInstance()-getStore()-getEntityRevisionLookup( 
'uncached' );
+   // This is not purposefully not resolving redirects, as we 
don't want them in the dump
+   $this-entityLookup = new RevisionBasedEntityLookup( 
$revisionLookup );
}
 
/**
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php 
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index b680cd1..5b7443f 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -16,6 +16,7 @@
 use Wikibase\Lib\Serializers\DispatchingEntitySerializer;
 use

[MediaWiki-commits] [Gerrit] Adding *.commonists.org to wgCopyUploadsDomains - change (operations/mediawiki-config)

2014-11-24 Thread Steinsplitter (Code Review)

Steinsplitter has uploaded a new change for review.

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

Change subject: Adding *.commonists.org to wgCopyUploadsDomains
..

Adding *.commonists.org to wgCopyUploadsDomains

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a3b7b4d..6b06598 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10967,6 +10967,7 @@
'ua.vlasenko.net',  // Ukraine interesting 
photography source - bug 73045
'*.wikiportret.nl', // Wikiportret - bug 72953
'openfashion.momu.be',  // Open Fashion Antwerp 
Fashion Museum (MoMu)
+   '*.commonists.org', // Commonists - bug T75724
),
 ),
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4154652436c67489a21ce897cf33706ec9938c2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de

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

[MediaWiki-commits] [Gerrit] Fix indentation in package.json - change (mediawiki...cxserver)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix indentation in package.json
..


Fix indentation in package.json

Change-Id: Ie2c0f5ec9342bf45cc2e905458ec0e98dc9a34bb
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index 5e28257..bdaec56 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
request: *,
sax: 0.6.0,
winston: *,
-html-entities: 1.0.10
+   html-entities: 1.0.10
},
devDependencies: {
assert: 1.1.1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2c0f5ec9342bf45cc2e905458ec0e98dc9a34bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [T56567] Add -only and -onlytitle options to add_text.py - change (pywikibot/core)

2014-11-24 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: [T56567] Add -only and -onlytitle options to add_text.py
..

[T56567] Add -only and -onlytitle options to add_text.py

It makes the bot works only when the given regex matches the title
or text of the page.

Change-Id: Ifd3e92ff66b9e3a998193982a886d7ed13f6b64c
---
M scripts/add_text.py
1 file changed, 32 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/27/175427/1

diff --git a/scripts/add_text.py b/scripts/add_text.py
index a9489dc..8fca22d 100644
--- a/scripts/add_text.py
+++ b/scripts/add_text.py
@@ -38,6 +38,12 @@
 
 -noreorderAvoid to reorder cats and interwiki
 
+-only If used, only works in pages that given regex matches in
+  the text.
+
+-onlytitleIf used, only works in pages that given regex matches in
+  the title.
+
 --- Example ---
 1.
 # This is a script to add a template to the top of the pages with
@@ -117,9 +123,9 @@
 ]
 
 
-def add_text(page, addText, summary=None, regexSkip=None,
- regexSkipUrl=None, always=False, up=False, putText=True,
- oldTextGiven=None, reorderEnabled=True, create=False):
+def add_text(page, addText, summary=None, regexSkip=None, regexSkipUrl=None,
+always=False, up=False, putText=True, only=True,
+oldTextGiven=None, reorderEnabled=True, create=False):
 
 Add text to a page.
 
@@ -171,6 +177,12 @@
 u'''Exception! regex (or word) used with -except is in the page. Skip!
 Match was: %s''' % result)
 return (False, False, always)
+if only is not None:
+if not re.search(only, text):
+pywikibot.output(
+u'''Exception! regex (or word) used with -only isn't in the page. Skip!''')
+return (False, False, always)
+
 # If not up, text put below
 if not up:
 newtext = text
@@ -296,6 +308,8 @@
 textfile = None
 talkPage = False
 reorderEnabled = True
+only = None
+onlytitle = None
 namespaces = []
 
 # Put the text above or below the text?
@@ -340,6 +354,16 @@
 regexSkip = pywikibot.input(u'What text should I skip?')
 else:
 regexSkip = arg[8:]
+elif arg.startswith('-onlytitle'):
+if len(arg) == 10:
+onlytitle = pywikibot.input(u'What titles should I get?')
+else:
+onlytitle = arg[11:]
+elif arg.startswith('-only'):
+if len(arg) == 5:
+only = pywikibot.input(u'What texts should I get?')
+else:
+only = arg[6:]
 elif arg == '-up':
 up = True
 elif arg == '-noreorder':
@@ -371,8 +395,12 @@
 generator = pagegenerators.NamespaceFilterPageGenerator(
 generator, namespaces)
 for page in generator:
+if onlytitle and not re.search(onlytitle, page.title()):
+pywikibot.output(
+uThe title %s doesn't match the given regex % page.title())
+continue
 (text, newtext, always) = add_text(page, addText, summary, regexSkip,
-   regexSkipUrl, always, up, True,
+   regexSkipUrl, always, up, True, 
only,
reorderEnabled=reorderEnabled,
create=talkPage)
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd3e92ff66b9e3a998193982a886d7ed13f6b64c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup ladsgr...@gmail.com

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

[MediaWiki-commits] [Gerrit] Raise stash expiration limit on Commons for UW - change (operations/mediawiki-config)

2014-11-24 Thread MarkTraceur (Code Review)

MarkTraceur has uploaded a new change for review.

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

Change subject: Raise stash expiration limit on Commons for UW
..

Raise stash expiration limit on Commons for UW

We have a theory that people leave UW running overnight, and if it finishes
within 1-2 hours, even the lightest sleepers may lose their files.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a3b7b4d..2893a7b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1139,6 +1139,12 @@
'test2wiki' = true,
 ),
 
+// Raise stash time limit on Commons for UploadWizard
+'wgUploadStashMaxAge' = array(
+   'default' = 6 * 60 * 60, // 6 hours
+   'commonswiki' = 48 * 60 * 60, // 48 hours
+),
+
 # wgUploadNavigationUrl @{
 'wgUploadNavigationUrl' = array(
// Projects

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15b96595304b6dad10060e44c4081e79bdaed231
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org

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

[MediaWiki-commits] [Gerrit] Fix checkstyle and compilation. - change (apps...wikipedia)

2014-11-24 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Fix checkstyle and compilation.
..

Fix checkstyle and compilation.

- The search_w icon was still being referenced in one place.
- Another checkstyle error that got through.

Change-Id: Ie77f827316da4ae52efae7faaa37067eb5728815
---
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
2 files changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java 
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index de0835d..9cfb4a5 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -527,10 +527,6 @@
 }
 currentTheme = newTheme;
 prefs.edit().putInt(PrefKeys.getColorTheme(), currentTheme).apply();
-
-//update color filter for logo icon (used in ActionBar activities)...
-adjustDrawableToTheme(getResources().getDrawable(R.drawable.search_w));
-
 bus.post(new ThemeChangeEvent());
 }
 
diff --git 
a/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java 
b/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
index 63ffc4b..bb5a25f 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
@@ -9,7 +9,7 @@
 /**
  * Utility to add more entries to our shared WikidataCache.
  */
-public class WikidataDescriptionFeeder {
+public final class WikidataDescriptionFeeder {
 // do not instantiate!
 private WikidataDescriptionFeeder() {
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie77f827316da4ae52efae7faaa37067eb5728815
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add qchris to analytics contact group - change (operations/puppet)

2014-11-24 Thread QChris (Code Review)

Hello Ottomata,

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

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

to review the following change.

Change subject: Add qchris to analytics contact group
..

Add qchris to analytics contact group

Change-Id: I9b3f4c8cfa81bb5320e3873578b63158a1241779
---
M modules/icinga/files/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/175430/1

diff --git a/modules/icinga/files/contactgroups.cfg 
b/modules/icinga/files/contactgroups.cfg
index 47eb717..ac9e181 100644
--- a/modules/icinga/files/contactgroups.cfg
+++ b/modules/icinga/files/contactgroups.cfg
@@ -21,7 +21,7 @@
 
 define contactgroup {
 contactgroup_name   analytics
-members 
ezachte,dtaraborelli,otto,milimetric,dandreescu,nuria,lzia,ironholds,halfak,tnegrin
+members 
ezachte,dtaraborelli,otto,milimetric,dandreescu,nuria,lzia,ironholds,halfak,tnegrin,qchris
 }
 
 define contactgroup {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b3f4c8cfa81bb5320e3873578b63158a1241779
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Start loving tablets more. - change (apps...wikipedia)

2014-11-24 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Start loving tablets more.
..

Start loving tablets more.

- Now providing dimension constants for 7 and 10 tablets, for both
  landscape and portrait orientation, for precise control over appearance.
- Fine-tuned the constants for default page margins (and enabled
  dynamically setting the margins in the WebView) for various screen sizes.
- Fine-tuned the font size of the page title and Wikidata description for
  various screen sizes.
- Increased the default text size for large tablets.

Change-Id: I23bb555e59f4756106bae9b14e16c7e11b9f3db4
---
M wikipedia/assets/bundle.js
M wikipedia/assets/styles.css
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/values-sw600dp-land/dimens.xml
A wikipedia/res/values-sw600dp-port/dimens.xml
M wikipedia/res/values-sw600dp/dimens.xml
M wikipedia/res/values-sw720dp-land/dimens.xml
A wikipedia/res/values-sw720dp-port/dimens.xml
A wikipedia/res/values-sw720dp/dimens.xml
M wikipedia/res/values/dimens.xml
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M www/js/sections.js
14 files changed, 80 insertions(+), 16 deletions(-)


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

diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index da4f26a..9d92a55 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -434,6 +434,11 @@
 clearContents();
 });
 
+bridge.registerListener( setMargins, function( payload ) {
+document.body.style.marginLeft = payload.marginLeft + px;
+document.body.style.marginRight = payload.marginRight + px;
+});
+
 bridge.registerListener( setPaddingTop, function( payload ) {
 document.body.style.paddingTop = payload.paddingTop + px;
 });
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index aed0fad..9077894 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -147,13 +147,12 @@
 }
 body {
   font-family: Helvetica Neue, Helvetica, Nimbus Sans L, Arial, 
Liberation Sans, sans-serif;
-  line-height: 1.4;
+  line-height: 1.5;
   color: #252525;
   background: #fff;
 }
 .content {
-  line-height: 1.65;
-  margin: .8em 16px 0;
+  margin: .8em 0px 0;
   word-wrap: break-word;
 }
 @media all and (max-width: 280px) {
diff --git a/wikipedia/res/layout/fragment_page.xml 
b/wikipedia/res/layout/fragment_page.xml
index c46811d..07d0904 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -58,8 +58,8 @@
 android:fontFamily=serif
 android:paddingTop=16dp
 android:paddingBottom=16dp
-android:paddingRight=16dp
-android:paddingLeft=16dp/
+
android:paddingRight=@dimen/activity_horizontal_margin
+
android:paddingLeft=@dimen/activity_horizontal_margin/
 TextView
 android:id=@+id/page_description_text
 android:layout_width=match_parent
@@ -67,9 +67,10 @@
 android:layout_gravity=bottom
 android:visibility=invisible
 android:fontFamily=serif
+android:textSize=@dimen/descriptionTextSize
 android:paddingBottom=16dp
-android:paddingRight=16dp
-android:paddingLeft=16dp/
+
android:paddingRight=@dimen/activity_horizontal_margin
+
android:paddingLeft=@dimen/activity_horizontal_margin/
 /FrameLayout
 /FrameLayout
 /FrameLayout
diff --git a/wikipedia/res/values-sw600dp-land/dimens.xml 
b/wikipedia/res/values-sw600dp-land/dimens.xml
index 3f644c6..eb1f2e4 100644
--- a/wikipedia/res/values-sw600dp-land/dimens.xml
+++ b/wikipedia/res/values-sw600dp-land/dimens.xml
@@ -6,4 +6,7 @@
 --
 dimen name=activity_horizontal_margin64dp/dimen
 
+dimen name=titleTextSize32sp/dimen
+dimen name=descriptionTextSize18sp/dimen
+
 /resources
\ No newline at end of file
diff --git a/wikipedia/res/values-sw600dp-port/dimens.xml 
b/wikipedia/res/values-sw600dp-port/dimens.xml
new file mode 100644
index 000..cca5310
--- /dev/null
+++ b/wikipedia/res/values-sw600dp-port/dimens.xml
@@ -0,0 +1,12 @@
+resources
+
+!--
+ Customize dimensions originally defined in res/values/dimens.xml 
(such as
+ screen margins) for sw600dp devices (e.g. 7 tablets) in landscape 
here.
+--
+dimen name=activity_horizontal_margin32dp/dimen
+
+dimen name=titleTextSize28sp/dimen
+

[MediaWiki-commits] [Gerrit] Increase kill timeout on kafka shutdown - change (operations...kafka)

2014-11-24 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Increase kill timeout on kafka shutdown
..


Increase kill timeout on kafka shutdown

On heavy loaded kafka brokers 20 seconds are not enough for a clean
shutdown. Timeout increased to 60 seconds.

Change-Id: I5441a1c5eddf33e1bdf5d7a0905017629e60cf13
---
M debian/changelog
M debian/kafka-mirror.init
M debian/kafka-server.kafka.init
3 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index a623c0e..7a737e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kafka (0.8.1.1-5) precise; urgency=low
+
+  * Increase kill timeout on shutdown.
+
+ -- Federico Giraud fgir...@yelp.com  Mon, 03 Nov 2014 14:09:20 -0800
+
 kafka (0.8.1.1-4) precise; urgency=low
 
   * Export $CLASSPATH from init scripts
diff --git a/debian/kafka-mirror.init b/debian/kafka-mirror.init
index 5c45236..b542d07 100755
--- a/debian/kafka-mirror.init
+++ b/debian/kafka-mirror.init
@@ -194,7 +194,7 @@
if [ -f $KAFKA_MIRROR_PID ]; then
start-stop-daemon --stop --pidfile $KAFKA_MIRROR_PID \
--user $KAFKA_USER \
-   --retry=TERM/20/KILL/5 /dev/null
+   --retry=TERM/60/KILL/5 /dev/null
if [ $? -eq 1 ]; then
log_progress_msg $DESC is not running but pid file 
exists, cleaning up
elif [ $? -eq 3 ]; then
diff --git a/debian/kafka-server.kafka.init b/debian/kafka-server.kafka.init
index 4218636..8024ead 100755
--- a/debian/kafka-server.kafka.init
+++ b/debian/kafka-server.kafka.init
@@ -146,7 +146,7 @@
if [ -f $KAFKA_PID ]; then
start-stop-daemon --stop --pidfile $KAFKA_PID \
--user $KAFKA_USER \
-   --retry=TERM/20/KILL/5 /dev/null
+   --retry=TERM/60/KILL/5 /dev/null
if [ $? -eq 1 ]; then
log_progress_msg $DESC is not running but pid file 
exists, cleaning up
elif [ $? -eq 3 ]; then

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5441a1c5eddf33e1bdf5d7a0905017629e60cf13
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/kafka
Gerrit-Branch: master
Gerrit-Owner: Plucas plu...@yelp.com
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Plucas plu...@yelp.com

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

[MediaWiki-commits] [Gerrit] Add qchris to analytics contact group - change (operations/puppet)

2014-11-24 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add qchris to analytics contact group
..


Add qchris to analytics contact group

Change-Id: I9b3f4c8cfa81bb5320e3873578b63158a1241779
---
M modules/icinga/files/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/icinga/files/contactgroups.cfg 
b/modules/icinga/files/contactgroups.cfg
index 47eb717..ac9e181 100644
--- a/modules/icinga/files/contactgroups.cfg
+++ b/modules/icinga/files/contactgroups.cfg
@@ -21,7 +21,7 @@
 
 define contactgroup {
 contactgroup_name   analytics
-members 
ezachte,dtaraborelli,otto,milimetric,dandreescu,nuria,lzia,ironholds,halfak,tnegrin
+members 
ezachte,dtaraborelli,otto,milimetric,dandreescu,nuria,lzia,ironholds,halfak,tnegrin,qchris
 }
 
 define contactgroup {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b3f4c8cfa81bb5320e3873578b63158a1241779
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] varnish: remove redirection to the hhvm pool - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: varnish: remove redirection to the hhvm pool
..

varnish: remove redirection to the hhvm pool

Change-Id: I39064328aabd1e7e5147e464e879a22e39c839fb
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M templates/varnish/bits.inc.vcl.erb
M templates/varnish/mobile-backend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
3 files changed, 0 insertions(+), 26 deletions(-)


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

diff --git a/templates/varnish/bits.inc.vcl.erb 
b/templates/varnish/bits.inc.vcl.erb
index 403733b..face120 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -31,12 +31,6 @@
error 403 HTTP method not allowed.;
}
 
-% if vcl_config.fetch(cluster_tier, 1) == 1 -%
-   if ( req.http.Cookie ~ hhvm=true ) {
-   set req.backend = hhvm_appservers;
-   }
-% end -%
-
if (req.http.host == %= cluster_options.fetch( bits_domain, 
bits.wikimedia.org )%) {
/* For https-only wikis, the redirect from http to https for bits 
assets should occur
in varnish instead of apache, since the apache redirect and 
mediawiki doesn't
diff --git a/templates/varnish/mobile-backend.inc.vcl.erb 
b/templates/varnish/mobile-backend.inc.vcl.erb
index 39dd29c..36e7ca4 100644
--- a/templates/varnish/mobile-backend.inc.vcl.erb
+++ b/templates/varnish/mobile-backend.inc.vcl.erb
@@ -19,17 +19,6 @@
}
 % end -%
 
-% if vcl_config.fetch(cluster_tier, 1) == 1 -%
-   /* Use the hhvm backend for any request to the standard appservers */
-   if ( req.http.X-Orig-Cookie ~ hhvm=true ) {
-   if (req.backend == api) {
-   set req.backend = hhvm_api;
-   } else {
-   set req.backend = hhvm_appservers;
-   }
-   }
-% end -%
-
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET  req.request != HEAD) {
/* We only deal with GET and HEAD by default */
diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index 9e27f3c..30f23e3 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -36,15 +36,6 @@
if (req.http.host ~ ^test\.) {
set req.backend = test_wikipedia;
}
-
-   /* Use the hhvm backend for any request to the standard appservers. */
-   if ( req.http.Cookie ~ hhvm=true ) {
-   if (req.backend == api) {
-   set req.backend = hhvm_api;
-   } else {
-   set req.backend = hhvm_appservers;
-   }
-   }
 % end -%
 
call pass_requests;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39064328aabd1e7e5147e464e879a22e39c839fb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mediawiki: convert hhvm appservers to be part of the common ... - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: mediawiki: convert hhvm appservers to be part of the common pool
..

mediawiki: convert hhvm appservers to be part of the common pool

Change-Id: I253d02302825d54823e7be57096e0cd1eca0f2e8
---
D hieradata/mainrole/appserver_hhvm.yaml
M hieradata/regex.yaml
M manifests/role/mediawiki.pp
3 files changed, 3 insertions(+), 16 deletions(-)


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

diff --git a/hieradata/mainrole/appserver_hhvm.yaml 
b/hieradata/mainrole/appserver_hhvm.yaml
deleted file mode 100644
index 62c4e1f..000
--- a/hieradata/mainrole/appserver_hhvm.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-cluster: appserver_hhvm
-role::mediawiki::webserver::pool: hhvm_appservers
-role::mediawiki::webserver::additional_pool: hhvm_api
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1a3a5c8..ddbbc9c 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -1,7 +1,7 @@
 # mw1017-1032, mw1053 are apaches (trusty)
 hhvm_appservers:
   __regex: !ruby/regexp /^mw10(1[7-9]|2[0-9]|3[0-2]|53)\.eqiad\.wmnet$/
-  mainrole: appserver_hhvm
+  mainrole: appserver
   admin::groups:
 - deployment
 
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index dfa2632..760 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -35,7 +35,7 @@
 }
 }
 
-class role::mediawiki::webserver( $pool, $workers_limit = undef, 
$additional_pool = undef ) {
+class role::mediawiki::webserver( $pool, $workers_limit = undef) {
 include ::role::mediawiki::common
 include ::apache::monitoring
 include ::lvs::configuration
@@ -45,16 +45,7 @@
 workers_limit = $workers_limit,
 }
 
-# Horrible, temporarily hack for hhvm - which is sharing servers for api 
and normal
-# appservers; this will go away soon
-if $additional_pool != undef {
-$ips = [
-$lvs::configuration::lvs_service_ips[$::realm][$pool][$::site],
-
$lvs::configuration::lvs_service_ips[$::realm][$additional_pool][$::site]
-]
-} else {
-$ips = $lvs::configuration::lvs_service_ips[$::realm][$pool][$::site]
-}
+$ips = $lvs::configuration::lvs_service_ips[$::realm][$pool][$::site]
 
 class { 'lvs::realserver':
 realserver_ips = $ips,
@@ -136,4 +127,3 @@
 }
 
 }
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I253d02302825d54823e7be57096e0cd1eca0f2e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] lvs: remove the HHVM specialized pools - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: lvs: remove the HHVM specialized pools
..

lvs: remove the HHVM specialized pools

Change-Id: I831a105ef4f01b1e7857f1ad97e9e252e9617abe
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 0 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/175434/1

diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 13a2cdc..0c6192a 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -36,9 +36,7 @@
 ],
 /^(lvs100[36])$/ = [
 $sip['apaches'][$::site],
-$sip['hhvm_appservers'][$::site],
 $sip['api'][$::site],
-$sip['hhvm_api'][$::site],
 $sip['rendering'][$::site],
 $sip['search_pool1'][$::site],
 $sip['search_pool2'][$::site],
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index 3718c08..07a6f47 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -167,17 +167,11 @@
 'apaches' = {
 'eqiad' = 10.2.2.1,
 },
-'hhvm_appservers' = {
-'eqiad' = 10.2.2.2,
-},
 'rendering' = {
 'eqiad' = 10.2.2.21,
 },
 'api' = {
 'eqiad' = 10.2.2.22,
-},
-'hhvm_api' = {
-'eqiad' = 10.2.2.3,
 },
 'search_pool1' = {
 'eqiad' = 10.2.2.11,
@@ -242,10 +236,6 @@
 'text' = {
 },
 'apaches' = {
-},
-'hhvm_appservers' = {
-},
-'hhvm_apaches' = {
 },
 'rendering' = {
 },
@@ -604,21 +594,6 @@
 'RunCommand' = $runcommand_monitor_options
 },
 },
-hhvm_appservers = {
-'description' = Main MediaWiki application server cluster 
(HHVM), hhvm-appservers.svc.eqiad.wmnet,
-'class' = low-traffic,
-'sites' = [ eqiad ],
-'ip' = $service_ips['hhvm_appservers'][$::site],
-'bgp' = yes,
-'depool-threshold' = .3,
-'monitors' = {
-'ProxyFetch' = {
-'url' = [ 'http://en.wikipedia.org/wiki/Main_Page' ],
-},
-'IdleConnection' = $idleconnection_monitor_options,
-'RunCommand' = $runcommand_monitor_options
-},
-},
 rendering = {
 'description' = MediaWiki thumbnail rendering cluster, 
rendering.svc.eqiad.wmnet,
 'class' = low-traffic,
@@ -645,21 +620,6 @@
 'ProxyFetch' = {
 'url' = [ 'http://en.wikipedia.org/w/api.php' ],
 },
-'IdleConnection' = $idleconnection_monitor_options,
-'RunCommand' = $runcommand_monitor_options
-},
-},
-hhvm_api = {
-'description' = MediaWiki API cluster (HHVM), 
hhvm-api.svc.eqiad.wmnet,
-'class' = low-traffic,
-'sites' = [ eqiad ],
-'ip' = $service_ips['hhvm_api'][$::site],
-'bgp' = yes,
-'depool-threshold' = .6,
-'monitors' = {
-'ProxyFetch' = {
-'url' = [ 'http://en.wikipedia.org/w/api.php' ],
-},
 'IdleConnection' = $idleconnection_monitor_options,
 'RunCommand' = $runcommand_monitor_options
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I831a105ef4f01b1e7857f1ad97e9e252e9617abe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] codfw: provision ms-be 2013/2014/2015 - change (operations/dns)

2014-11-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: codfw: provision ms-be 2013/2014/2015
..


codfw: provision ms-be 2013/2014/2015

RT #8804

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

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  RobH: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8c973a5..08eb2d1 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2409,6 +2409,7 @@
 27  1H IN PTR   es2005.codfw.wmnet.
 28  1H IN PTR   es2006.codfw.wmnet.
 29  1H IN PTR   es2007.codfw.wmnet.
+30  1H IN PTR   ms-be2013.codfw.wmnet.
 
 $ORIGIN 1.192.{{ zonename }}.
 1   1H IN PTR   lvs2001.codfw.wmnet.
@@ -2458,6 +2459,7 @@
 29  1H IN PTR   es2008.codfw.wmnet.
 30  1H IN PTR   es2009.codfw.wmnet.
 31  1H IN PTR   es2010.codfw.wmnet.
+32  1H IN PTR   ms-be2014.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
@@ -2496,6 +2498,7 @@
 15  1H IN PTR   ms-be2010.codfw.wmnet.
 16  1H IN PTR   ms-be2011.codfw.wmnet.
 17  1H IN PTR   ms-be2012.codfw.wmnet.
+18  1H IN PTR   ms-be2015.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index da25518..b1c09f2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2082,6 +2082,9 @@
 ms-be2010   1H  IN A10.192.32.15
 ms-be2011   1H  IN A10.192.32.16
 ms-be2012   1H  IN A10.192.32.17
+ms-be2013   1H  IN A10.192.0.30
+ms-be2014   1H  IN A10.192.16.32
+ms-be2015   1H  IN A10.192.32.18
 ms-fe2001   1H  IN A10.192.0.23
 ms-fe2002   1H  IN A10.192.0.24
 ms-fe2003   1H  IN A10.192.16.25

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1039b9c06327ae2370fe6b2669e3d024684c6faf
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: RobH r...@wikimedia.org
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 French support to dn_template - change (pywikibot/core)

2014-11-24 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Add French support to dn_template
..

Add French support to dn_template

Requested and confirmed on IRC and French Wikipedia.
https://fr.wikipedia.org/w/index.php?diff=109292075oldid=109291315

Change-Id: Ie3ee521600a5169b50ed3187a22097d643fe89ec
---
M scripts/solve_disambiguation.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/36/175436/1

diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 9f26db8..fc03782 100644
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -89,6 +89,7 @@
 # Disambiguation Needed template
 dn_template = {
 'en': u'{{dn}}',
+'fr': u'{{Lien vers un homonyme}}',
 }
 
 # disambiguation page name format for primary topic disambiguations

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3ee521600a5169b50ed3187a22097d643fe89ec
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add its-phabricator-from-bugzilla f9fd2db7a62119ab9a6d1adfd3... - change (operations...plugins)

2014-11-24 Thread Chad (Code Review)

Chad has submitted this change and it was merged.

Change subject: Add its-phabricator-from-bugzilla 
f9fd2db7a62119ab9a6d1adfd3110b6e59b7a872
..


Add its-phabricator-from-bugzilla f9fd2db7a62119ab9a6d1adfd3110b6e59b7a872

This plugin extracts the issue id using the bugzilla commentLink,
adds 2000 to the ids, and then takes actions on the resulting id on
phabricator. Using this plugin, changes that still use the bugzilla
bug numbers cause actions on the corresponding task in Phabricator.

For building this plugin, hooks-its commit
  3b8a1d4abaa6010faa0a18af8b7a00e68593f50c
got used.

Bug: T1327
Change-Id: I3e9f94c91c35f0eff87b52fc9cd4c1289f3cb20d
---
A its-phabricator-from-bugzilla.jar
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/its-phabricator-from-bugzilla.jar 
b/its-phabricator-from-bugzilla.jar
new file mode 100644
index 000..20cba44
--- /dev/null
+++ b/its-phabricator-from-bugzilla.jar
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e9f94c91c35f0eff87b52fc9cd4c1289f3cb20d
Gerrit-PatchSet: 3
Gerrit-Project: operations/gerrit/plugins
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] install-server add ms-be 2013/14/15 - change (operations/puppet)

2014-11-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: install-server add ms-be 2013/14/15
..

install-server add ms-be 2013/14/15

Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 30f6662..9783e68 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2096,6 +2096,21 @@
fixed-address ms-be2012.codfw.wmnet;
 }
 
+host ms-be2013 {
+   hardware ethernet 54:9F:35:08:4A:18;
+   fixed-address ms-be2013.codfw.wmnet;
+}
+
+host ms-be2014 {
+   hardware ethernet 54:9F:35:08:38:10;
+   fixed-address ms-be2014.codfw.wmnet;
+}
+
+host ms-be2015 {
+   hardware ethernet 54:9F:35:08:40:F0;
+   fixed-address ms-be2015.codfw.wmnet;
+}
+
 host ms-be3001 {
hardware ethernet 24:B6:FD:F6:13:AC;
fixed-address ms-be3001.esams.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Various docstring improvements - change (pywikibot/core)

2014-11-24 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Various docstring improvements
..

Various docstring improvements

- Move documentation of fixes from replace script into fixes module.
- Remove duplicate -page argument documentation in replace script.
- Tidy pagegenerators help for Sphinx parsing.

Change-Id: I8a3f83c319c3847673e994a433e128b5f4161862
---
M pywikibot/fixes.py
M pywikibot/pagegenerators.py
M scripts/replace.py
3 files changed, 15 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/38/175438/1

diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py
index 723631d..61af56b 100644
--- a/pywikibot/fixes.py
+++ b/pywikibot/fixes.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8  -*-
 File containing all standard fixes.
-
 #
 # (C) Pywikibot team, 2008-2010
 #
 # Distributed under the terms of the MIT license.
 #
 __version__ = '$Id$'
-#
 
-help = u
+help = 
+  Currently available predefined fixes are:
+
   * HTML- Convert HTML tags to wiki syntax, and
   fix XHTML.
   * isbn- Fix badly formatted ISBNs.
@@ -31,9 +31,10 @@
   * fckeditor   - Try to convert FCKeditor HTML tags to wiki
   syntax.
   
https://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html
-
 
 
+__doc__ = __doc__ + help
+
 fixes = {
 # These replacements will convert HTML to wiki syntax where possible, and
 # make remaining tags XHTML compliant.
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index f2e8360..a4b5b43 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -103,7 +103,7 @@
   so check your edits!
 
 -limit:n  When used with any other argument that specifies a set
-  of pages, work on no more than n pages in total
+  of pages, work on no more than n pages in total.
 
 -linksWork on all pages that are linked from a certain page.
   Argument can also be given as -links:linkingpagetitle.
@@ -136,7 +136,7 @@
 
 -step:n   When used with any other argument that specifies a set
   of pages, only retrieve n pages at a time from the wiki
-  server
+  server.
 
 -titleregex   Work on titles that match the given regular expression.
 
@@ -157,15 +157,15 @@
   Argument can be given as -unwatched:n where
   n is the maximum number of articles to work on.
 
--usercontribs Work on all articles that were edited by a certain user :
-  Example : -usercontribs:DumZiBoT
+-usercontribs Work on all articles that were edited by a certain user.
+  (Example : -usercontribs:DumZiBoT)
 
 -weblink  Work on all articles that contain an external link to
   a given URL; may be given as -weblink:url
 
 -withoutinterwiki Work on all pages that don't have interlanguage links.
   Argument can be given as -withoutinterwiki:n where
-  n is some number (??).
+  n is the total to fetch.
 
 -mysqlquery   Takes a Mysql query string like
   SELECT page_namespace, page_title, FROM page
@@ -199,7 +199,8 @@
   config.py for instructions.
 
 -page Work on a single page. Argument can also be given as
-  -page:pagetitle.
+  -page:pagetitle, and supplied multiple times for
+  multiple pages.
 
 -grep A regular expression that needs to match the article
   otherwise the page won't be returned.
diff --git a/scripts/replace.py b/scripts/replace.py
index cd9fcfb..f0ea489 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -10,15 +10,11 @@
 
 params;
 
+Furthermore, the following command line parameters are supported:
+
 -xml  Retrieve information from a local XML dump (pages-articles
   or pages-meta-current, see https://download.wikimedia.org).
   Argument can also be given as -xml:filename.
-
--page Only edit a specific page.
-  Argument can also be given as -page:pagetitle. You can
-  give this parameter multiple times to edit multiple pages.
-
-Furthermore, the following command line parameters are supported:
 
 -regexMake replacements using regular expressions. If this argument
   isn't given, the bot will make simple text replacements.
@@ -70,7 +66,7 @@
   fixes.py and user-fixes.py.
   The -regex and -nocase argument and given replacements will
   be ignored if you use -fix.
-

[MediaWiki-commits] [Gerrit] API: Fix namespace handling in list=alldeletedrevs with from... - change (mediawiki/core)

2014-11-24 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: API: Fix namespace handling in list=alldeletedrevs with 
from/to/predix
..

API: Fix namespace handling in list=alldeletedrevs with from/to/predix

We don't have just one namespace like the code we copied this from. And
to avoid a repeat of bug 25702, we have to handle the case where the
title/prefix might be being transformed differently in all the requested
namespaces.

Bug: T75711
Change-Id: I5267847fe876c971aaf358d2c6fe4006e4645939
---
M includes/api/ApiQueryAllDeletedRevisions.php
1 file changed, 54 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/175439/1

diff --git a/includes/api/ApiQueryAllDeletedRevisions.php 
b/includes/api/ApiQueryAllDeletedRevisions.php
index 0b1accb..4e95f5b 100644
--- a/includes/api/ApiQueryAllDeletedRevisions.php
+++ b/includes/api/ApiQueryAllDeletedRevisions.php
@@ -135,21 +135,64 @@
 
if ( $mode == 'all' ) {
if ( $params['namespace'] !== null ) {
-   $this-addWhereFld( 'ar_namespace', 
$params['namespace'] );
+   $namespaces = $params['namespace'];
+   $this-addWhereFld( 'ar_namespace', $namespaces 
);
+   } else {
+   $namespaces = MWNamespace::getValidNamespaces();
}
 
-   $from = $params['from'] === null
-   ? null
-   : $this-titlePartToKey( $params['from'], 
$params['namespace'] );
-   $to = $params['to'] === null
-   ? null
-   : $this-titlePartToKey( $params['to'], 
$params['namespace'] );
-   $this-addWhereRange( 'ar_title', $dir, $from, $to );
+   // For from/to/prefix, we have to consider the potential
+   // transformations of the title in all specified 
namespaces.
+   // Generally there will be only one transformation, but 
wikis with
+   // some namespaces case-sensitive could have two.
+   if ( $params['from'] !== null || $params['to'] !== null 
) {
+   $isDirNewer = ( $dir === 'newer' );
+   $after = ( $isDirNewer ? '=' : '=' );
+   $before = ( $isDirNewer ? '=' : '=' );
+   $where = array();
+   foreach ( $namespaces as $ns ) {
+   $w = array();
+   if ( $params['from'] !== null ) {
+   $w[] = 'ar_title' . $after .
+   $db-addQuotes( 
$this-titlePartToKey( $params['from'], $ns ) );
+   }
+   if ( $params['to'] !== null ) {
+   $w[] = 'ar_title' . $before .
+   $db-addQuotes( 
$this-titlePartToKey( $params['to'], $ns ) );
+   }
+   $w = $db-makeList( $w, LIST_AND );
+   $where[$w][] = $ns;
+   }
+   if ( count( $where ) == 1 ) {
+   $where = key( $where );
+   $this-addWhere( $where );
+   } else {
+   $where2 = array();
+   foreach ( $where as $w = $ns ) {
+   $where2[] = $db-makeList( 
array( $w, 'ar_namespace' = $ns ), LIST_AND );
+   }
+   $this-addWhere( $db-makeList( 
$where2, LIST_OR ) );
+   }
+   }
 
if ( isset( $params['prefix'] ) ) {
-   $this-addWhere( 'ar_title' . $db-buildLike(
-   $this-titlePartToKey( 
$params['prefix'], $params['namespace'] ),
-   $db-anyString() ) );
+   $where = array();
+   foreach ( $namespaces as $ns ) {
+   $w = 'ar_title' . $db-buildLike(
+   $this-titlePartToKey( 
$params['prefix'], $ns ),
+   $db-anyString() );
+   $where[$w][] = $ns;
+

[MediaWiki-commits] [Gerrit] install-server add ms-be 2013/2014/2015 - change (operations/puppet)

2014-11-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: install-server add ms-be 2013/2014/2015
..


install-server add ms-be 2013/2014/2015

RT #8804

Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 15 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 30f6662..9783e68 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2096,6 +2096,21 @@
fixed-address ms-be2012.codfw.wmnet;
 }
 
+host ms-be2013 {
+   hardware ethernet 54:9F:35:08:4A:18;
+   fixed-address ms-be2013.codfw.wmnet;
+}
+
+host ms-be2014 {
+   hardware ethernet 54:9F:35:08:38:10;
+   fixed-address ms-be2014.codfw.wmnet;
+}
+
+host ms-be2015 {
+   hardware ethernet 54:9F:35:08:40:F0;
+   fixed-address ms-be2015.codfw.wmnet;
+}
+
 host ms-be3001 {
hardware ethernet 24:B6:FD:F6:13:AC;
fixed-address ms-be3001.esams.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] install-server: add swift cache partition - change (operations/puppet)

2014-11-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: install-server: add swift cache partition
..


install-server: add swift cache partition

Shrink root and partitions holding container databases, a fourth partition will
be raid1 and used to provide ssd block caching via bcache.

Root shrinks from 50GB to 30GB, our current utilization is ~27% (i.e. 15G).

Container database partition changes from 90G min to 60G min (120G max),
rationale being that some machines have 256G SSD and some 150G SSD, yet the
same weight in swift. This should accomodate growth on larger SSD while
allowing decent caching on small SSD. Container partition utilization is on
average ~20G (was ~16G beginning of June) so it isn't expected to grow fast
(we'll likely run out of storage space first anyway).

Another option would be to raid1 the two SSDs and switch to lvm to host root,
swap and the cache. That however seems overkill, the bits we really care about
are the partitions holding container databases (sdn3/sdm3) and those will need
to live off raid/lvm anyway.

Note that if caching turns out later to be ineffective, we can drop the fourth
partition in place and grow sdn3/sdm3 back.

Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
---
M modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  Faidon Liambotis: Looks good to me, but someone else must approve



diff --git a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg 
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
index 6597b9d..f63ebd9 100644
--- a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -22,16 +22,19 @@
 # Define physical partitions
 d-ipartman-auto/expert_recipe  string  \
multiraid ::\
-   6   80006   raid\
+   3   80003   raid\
$primary{ } method{ raid }  \
.   \
100010001000raid\
$primary{ } method{ raid }  \
.   \
-   100 500 -1  xfs \
+   6   500 12  xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs }   \
+   . \
+   3   1   -1  raid\
+   $primary{ } method{ raid }  \
.
 
 # Parameters are:
@@ -43,6 +46,9 @@
.   \
1   2   0   swap-   \
/dev/sdm2#/dev/sdn2 \
+   . \
+   1   2   0   none-   \
+   /dev/sdm4#/dev/sdn4 \
.
 
 d-ipartman-md/confirm  boolean true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
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 the right DB in getOriginalEmail() instead of the sharedDb - change (mediawiki...BounceHandler)

2014-11-24 Thread 01tonythomas (Code Review)

01tonythomas has uploaded a new change for review.

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

Change subject: Use the right DB in getOriginalEmail() instead of the sharedDb
..

Use the right DB in getOriginalEmail() instead of the sharedDb

Change-Id: I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4
(cherry picked from commit 35b13e88f4cd2bd4743103ae07a1a4fc51e5671a)
---
M includes/ProcessBounceEmails.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler 
refs/changes/40/175440/1

diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index d52ed91..16f7757 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -121,7 +121,8 @@
// the required database.
$wikiId = $failedUser['wikiId'];
$rawUserId = $failedUser['rawUserId'];
-   $dbr = self::getBounceRecordDB( DB_SLAVE, $wikiId );
+   $lb = wfGetLB( $wikiId );
+   $dbr = $lb-getConnection( DB_SLAVE, array(), $wikiId );
 
$res = $dbr-selectRow(
'user',
@@ -131,6 +132,7 @@
),
__METHOD__
);
+   wfGetLB( $wikiId )-reuseConnection( $dbr );
if( $res !== false ) {
$rawEmail = $res-user_email;
return $rawEmail;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: wmf/1.25wmf9
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] first try at jenkins plugin to check prod vs ldap ssh keys - change (operations/puppet)

2014-11-24 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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

Change subject: first try at jenkins plugin to check prod vs ldap ssh keys
..

first try at jenkins plugin to check prod vs ldap ssh keys

note that this relies on the structure of the data.yaml file
staying unchanged, and it also needs ldaplist on the jenkins
host

Change-Id: Ia6ad6d3f50d36982c532d0919cf219be40339a75
---
A modules/admin/data/check_datayaml_ssh_keys.py
1 file changed, 213 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/175442/1

diff --git a/modules/admin/data/check_datayaml_ssh_keys.py 
b/modules/admin/data/check_datayaml_ssh_keys.py
new file mode 100644
index 000..e4cb215
--- /dev/null
+++ b/modules/admin/data/check_datayaml_ssh_keys.py
@@ -0,0 +1,213 @@
+'''
+draft jenkins test to ensure changes to data.yaml do not
+include ssh keys stored in ldap (hence possible labs keys)
+'''
+
+import yaml
+import re
+import subprocess
+import sys
+
+
+class LdapKeys(object):
+'''
+retrieval of keys from ldap
+'''
+
+@staticmethod
+def get_key_from_line(line):
+'''
+get and return the part of the line that has
+(part of) a key, or None if there is nothing
+
+not sure if key is legit without the key name/prompt
+but we'll ignore the issue
+'''
+if line is None:
+return None
+
+if (line.startswith('ssh-rsa AAA') or
+line.startswith('ssh-dss AAA') or
+line.startswith('ecdsa')):
+fields = line.split(' ')
+return fields[1]
+elif line.startswith('AAA'):
+return line.rsplit(' ', 1)[0]
+return None
+
+def __init__(self):
+self.ldap_keys_found = {}
+
+def get_ldap_keys(self):
+'''
+get all ldap keys for all users, via 'ldaplist'
+maybe it would be better to rely on a standard ldap client
+instead of our script?
+'''
+command = ['ldaplist', '-l', 'passwd', '-a', 'sshPublicKey']
+proc = subprocess.Popen(command, stdout=subprocess.PIPE)
+out, err_unused = proc.communicate()
+if not out:
+return {}
+
+entries = out.splitlines()
+if not entries:
+return None
+parser = self.parse_ldap_entries()
+parser.send(None)
+for entry in entries:
+entry = entry.strip()
+parser.send(entry)
+return self.ldap_keys_found
+
+def get_username_from_dn(self, line):
+'''
+from the distinguished name entry in ldap,
+get the username and return it
+'''
+# expect dn: uid=username,ou=people...
+username_pattern = '^dn: uid=(.*),ou=people'
+
+result = re.match(username_pattern, line)
+if result:
+username = result.group(1)
+if username not in self.ldap_keys_found:
+self.ldap_keys_found[username] = []
+return username
+return None
+
+def parse_ldap_entries(self):
+'''
+this coroutine requires that the first
+call to it is send(None), for initialization
+
+pass in line from ldap output stripped via send()
+returns nothing, key and user information is
+stashed in ldap_keys_found
+'''
+username = None
+returnme = (None, None)
+while username is None:
+line = yield
+if line is None:
+yield
+elif line.startswith('dn: '):
+username = self.get_username_from_dn(line)
+if username is not None:
+break
+user_keys = []
+key_contents = key_line = None
+
+line = yield
+while line is not None:
+
+if line.startswith('dn: '):
+# start of new user, stash key for old user if any
+key_contents = LdapKeys.get_key_from_line(key_line)
+if key_contents is not None:
+user_keys.append(key_contents)
+if username is not None and user_keys:
+self.ldap_keys_found[username] = user_keys
+
+username = self.get_username_from_dn(line)
+user_keys = []
+key_contents = key_line = None
+
+elif line.startswith('#') or not line.strip():
+# comments, whitespace are skipped
+pass
+
+elif line.startswith('sshPublicKey: '):
+# stash previous key contents if any
+key_contents = LdapKeys.get_key_from_line(key_line)
+if key_contents is not None:
+user_keys.append(key_contents)
+
+# start collecting new key contents
+key_line = line[len('sshPublicKey: '):]

[MediaWiki-commits] [Gerrit] Add French support to dn_template - change (pywikibot/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Add French support to dn_template
..


Add French support to dn_template

Requested and confirmed on IRC and French Wikipedia.
https://fr.wikipedia.org/w/index.php?diff=109292075oldid=109291315

Change-Id: Ie3ee521600a5169b50ed3187a22097d643fe89ec
---
M scripts/solve_disambiguation.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 9f26db8..fc03782 100644
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -89,6 +89,7 @@
 # Disambiguation Needed template
 dn_template = {
 'en': u'{{dn}}',
+'fr': u'{{Lien vers un homonyme}}',
 }
 
 # disambiguation page name format for primary topic disambiguations

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3ee521600a5169b50ed3187a22097d643fe89ec
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Optimise non-js experience for Opera Mini - change (mediawiki...MobileFrontend)

2014-11-24 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Optimise non-js experience for Opera Mini
..

Optimise non-js experience for Opera Mini

Optimise for usability/readability not design.
It's more important that search icon and input appear on same line

Change-Id: Ib50a6809fdfa6740fba8ad57f6d6f11820347124
---
M less/ui.less
1 file changed, 13 insertions(+), 3 deletions(-)


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

diff --git a/less/ui.less b/less/ui.less
index db402e1..bad94eb 100644
--- a/less/ui.less
+++ b/less/ui.less
@@ -124,9 +124,19 @@
 /* Search */
 
 .client-nojs {
-   .header .search {
-   margin-right: -36px;
-   padding-right: 36px;
+   .header {
+   .search,
+   .fulltext-search {
+   display: block;
+   float: left;
+   }
+
+   .search {
+   // Assume the smallest possible screen size.
+   // We want people to be able to search we don't care if 
it looks pretty.
+   width: 80px;
+   margin-right: 8px;
+   }
}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib50a6809fdfa6740fba8ad57f6d6f11820347124
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] build: Set up phplint and phpunit via composer-test - change (cdb)

2014-11-24 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: build: Set up phplint and phpunit via composer-test
..

build: Set up phplint and phpunit via composer-test

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


  git pull ssh://gerrit.wikimedia.org:29418/cdb refs/changes/44/175444/1

diff --git a/composer.json b/composer.json
index 4ea2604..d25753f 100644
--- a/composer.json
+++ b/composer.json
@@ -14,13 +14,17 @@
 }
 ],
 minimum-stability: dev,
+autoload: {
+classmap: [src/]
+},
 require: {
 php: =5.3.2
 },
 require-dev: {
+jakub-onderka/php-parallel-lint: 0.8.*,
 phpunit/phpunit: *
 },
-autoload: {
-classmap: [src/]
+scripts: {
+test: parallel-lint . --exclude vendor  phpunit
 }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 000..519324d
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=UTF-8?
+phpunit bootstrap=vendor/autoload.php colors=true strict=true
+   testsuites
+   testsuite name=CDB Test Suite
+   directory./test/directory
+   /testsuite
+   /testsuites
+/phpunit

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id179c2ecb3ffe2a2b7a0cb87e8cbc4303db8a25d
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use the right DB in getOriginalEmail() instead of the sharedDb - change (mediawiki...BounceHandler)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Use the right DB in getOriginalEmail() instead of the sharedDb
..


Use the right DB in getOriginalEmail() instead of the sharedDb

Change-Id: I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4
(cherry picked from commit 35b13e88f4cd2bd4743103ae07a1a4fc51e5671a)
---
M includes/ProcessBounceEmails.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index d52ed91..16f7757 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -121,7 +121,8 @@
// the required database.
$wikiId = $failedUser['wikiId'];
$rawUserId = $failedUser['rawUserId'];
-   $dbr = self::getBounceRecordDB( DB_SLAVE, $wikiId );
+   $lb = wfGetLB( $wikiId );
+   $dbr = $lb-getConnection( DB_SLAVE, array(), $wikiId );
 
$res = $dbr-selectRow(
'user',
@@ -131,6 +132,7 @@
),
__METHOD__
);
+   wfGetLB( $wikiId )-reuseConnection( $dbr );
if( $res !== false ) {
$rawEmail = $res-user_email;
return $rawEmail;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: wmf/1.25wmf9
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fixed wfGetLb reuseConnection() statement - change (mediawiki...BounceHandler)

2014-11-24 Thread 01tonythomas (Code Review)

01tonythomas has uploaded a new change for review.

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

Change subject: Fixed wfGetLb reuseConnection() statement
..

Fixed wfGetLb reuseConnection() statement

Change-Id: Iade3c80d369512d7d93058196d4e270b32d94427
---
M includes/ProcessBounceEmails.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index 16f7757..13609de 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -132,7 +132,7 @@
),
__METHOD__
);
-   wfGetLB( $wikiId )-reuseConnection( $dbr );
+   $lb-reuseConnection( $dbr );
if( $res !== false ) {
$rawEmail = $res-user_email;
return $rawEmail;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iade3c80d369512d7d93058196d4e270b32d94427
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com

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

[MediaWiki-commits] [Gerrit] dsh: add new mediawiki appservers - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: dsh: add new mediawiki appservers
..

dsh: add new mediawiki appservers

Change-Id: I829be698a996f4ad7f6575817da3aafa26f657a2
---
M modules/dsh/files/group/apaches
M modules/dsh/files/group/mediawiki-installation
M modules/dsh/files/group/mw-eqiad
3 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/175446/1

diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches
index 1870bd9..546e5c6 100644
--- a/modules/dsh/files/group/apaches
+++ b/modules/dsh/files/group/apaches
@@ -230,9 +230,17 @@
 mw1236
 mw1237
 mw1238
+mw1239
 mw1240
 mw1241
 mw1242
 mw1244
 mw1245
 mw1246
+mw1247
+mw1248
+mw1249
+mw1250
+mw1251
+mw1252
+mw1253
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index 5067815..c2de0ec 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -239,9 +239,17 @@
 mw1236
 mw1237
 mw1238
+mw1239
 mw1240
 mw1241
 mw1242
 mw1244
 mw1245
 mw1246
+mw1247
+mw1248
+mw1249
+mw1250
+mw1251
+mw1252
+mw1253
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 9bf722c..3ca3985 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -230,12 +230,20 @@
 mw1236
 mw1237
 mw1238
+mw1239
 mw1240
 mw1241
 mw1242
 mw1244
 mw1245
 mw1246
+mw1247
+mw1248
+mw1249
+mw1250
+mw1251
+mw1252
+mw1253
 terbium
 snapshot1001
 snapshot1002

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I829be698a996f4ad7f6575817da3aafa26f657a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fixed wfGetLb reuseConnection() statement - change (mediawiki...BounceHandler)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Fixed wfGetLb reuseConnection() statement
..


Fixed wfGetLb reuseConnection() statement

Change-Id: Iade3c80d369512d7d93058196d4e270b32d94427
---
M includes/ProcessBounceEmails.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index 16f7757..13609de 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -132,7 +132,7 @@
),
__METHOD__
);
-   wfGetLB( $wikiId )-reuseConnection( $dbr );
+   $lb-reuseConnection( $dbr );
if( $res !== false ) {
$rawEmail = $res-user_email;
return $rawEmail;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iade3c80d369512d7d93058196d4e270b32d94427
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] dsh: add new mediawiki appservers - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: dsh: add new mediawiki appservers
..


dsh: add new mediawiki appservers

Change-Id: I829be698a996f4ad7f6575817da3aafa26f657a2
---
M modules/dsh/files/group/apaches
M modules/dsh/files/group/mediawiki-installation
M modules/dsh/files/group/mw-eqiad
3 files changed, 24 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches
index 1870bd9..546e5c6 100644
--- a/modules/dsh/files/group/apaches
+++ b/modules/dsh/files/group/apaches
@@ -230,9 +230,17 @@
 mw1236
 mw1237
 mw1238
+mw1239
 mw1240
 mw1241
 mw1242
 mw1244
 mw1245
 mw1246
+mw1247
+mw1248
+mw1249
+mw1250
+mw1251
+mw1252
+mw1253
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index 5067815..c2de0ec 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -239,9 +239,17 @@
 mw1236
 mw1237
 mw1238
+mw1239
 mw1240
 mw1241
 mw1242
 mw1244
 mw1245
 mw1246
+mw1247
+mw1248
+mw1249
+mw1250
+mw1251
+mw1252
+mw1253
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 9bf722c..3ca3985 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -230,12 +230,20 @@
 mw1236
 mw1237
 mw1238
+mw1239
 mw1240
 mw1241
 mw1242
 mw1244
 mw1245
 mw1246
+mw1247
+mw1248
+mw1249
+mw1250
+mw1251
+mw1252
+mw1253
 terbium
 snapshot1001
 snapshot1002

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I829be698a996f4ad7f6575817da3aafa26f657a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] SWAT update for BounceHandler - change (mediawiki/core)

2014-11-24 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

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

Change subject: SWAT update for BounceHandler
..

SWAT update for BounceHandler

Grabs:
  I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/175447/1

diff --git a/extensions/BounceHandler b/extensions/BounceHandler
index c160911..cec3827 16
--- a/extensions/BounceHandler
+++ b/extensions/BounceHandler
-Subproject commit c160911831a12448eb0c8d3eb1dc5517847d7016
+Subproject commit cec3827feca909c5d55f2ddeffbf15bf7f61be79

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3a11c4e7e22a88cab56f23e35c01ca022798b4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf9
Gerrit-Owner: Manybubbles never...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] dsh: add two more servers to the list - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: dsh: add two more servers to the list
..

dsh: add two more servers to the list

Change-Id: I69515cc692b2436727847105954d334784883462
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/dsh/files/group/apaches
M modules/dsh/files/group/mediawiki-installation
M modules/dsh/files/group/mw-eqiad
3 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches
index 546e5c6..995ba2f 100644
--- a/modules/dsh/files/group/apaches
+++ b/modules/dsh/files/group/apaches
@@ -244,3 +244,5 @@
 mw1251
 mw1252
 mw1253
+mw1254
+mw1255
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index c2de0ec..347cb0f 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -253,3 +253,5 @@
 mw1251
 mw1252
 mw1253
+mw1254
+mw1255
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 3ca3985..eed58dc 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -244,6 +244,8 @@
 mw1251
 mw1252
 mw1253
+mw1254
+mw1255
 terbium
 snapshot1001
 snapshot1002

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69515cc692b2436727847105954d334784883462
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] dsh: add two more servers to the list - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: dsh: add two more servers to the list
..


dsh: add two more servers to the list

Change-Id: I69515cc692b2436727847105954d334784883462
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/dsh/files/group/apaches
M modules/dsh/files/group/mediawiki-installation
M modules/dsh/files/group/mw-eqiad
3 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches
index 546e5c6..995ba2f 100644
--- a/modules/dsh/files/group/apaches
+++ b/modules/dsh/files/group/apaches
@@ -244,3 +244,5 @@
 mw1251
 mw1252
 mw1253
+mw1254
+mw1255
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index c2de0ec..347cb0f 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -253,3 +253,5 @@
 mw1251
 mw1252
 mw1253
+mw1254
+mw1255
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 3ca3985..eed58dc 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -244,6 +244,8 @@
 mw1251
 mw1252
 mw1253
+mw1254
+mw1255
 terbium
 snapshot1001
 snapshot1002

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69515cc692b2436727847105954d334784883462
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
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 lessphp to 011afcca8e - change (mediawiki/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Update lessphp to 011afcca8e
..


Update lessphp to 011afcca8e

Source:

* 
https://github.com/leafo/lessphp/blob/011afcca8e6f1000a6e789921ba805fa578271a3/lessc.inc.php

Changes:

* https://github.com/leafo/lessphp/compare/2cc77e3c7b...011afcca8e

Change-Id: Ic21b97e52ec99b8eef094a902ee346cf40a9f174
---
M includes/libs/lessc.inc.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/libs/lessc.inc.php b/includes/libs/lessc.inc.php
index 61ed771..2caa0b6 100644
--- a/includes/libs/lessc.inc.php
+++ b/includes/libs/lessc.inc.php
@@ -1,7 +1,7 @@
 ?php
 // @codingStandardsIgnoreFile File external to MediaWiki. Ignore coding 
conventions checks.
 /**
- * lessphp v0.4.0@2cc77e3c7b
+ * lessphp v0.4.0@011afcca8e
  * http://leafo.net/lessphp
  *
  * LESS CSS compiler, adapted from http://lesscss.org
@@ -374,9 +374,9 @@
$other = array_merge($other, $stack);
 
if ($split) {
-   return array(array_merge($vars, $imports), $other);
+   return array(array_merge($imports, $vars), $other);
} else {
-   return array_merge($vars, $imports, $other);
+   return array_merge($imports, $vars, $other);
}
}
 
@@ -1036,7 +1036,7 @@
}
}
 
-   if(!is_null($mime)) // fallback if the MIME 
type is still unknown
+   if(!is_null($mime)) // fallback if the mime 
type is still unknown
$url = sprintf('data:%s;base64,%s', 
$mime, base64_encode(file_get_contents($fullpath)));
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic21b97e52ec99b8eef094a902ee346cf40a9f174
Gerrit-PatchSet: 14
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Infobox: Check if entities isn't undefined - change (mediawiki...MobileFrontend)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Infobox: Check if entities isn't undefined
..


Infobox: Check if entities isn't undefined

Change-Id: I813023e3077ebbf870eff9723744a984ef2ddb74
Task: T75701
---
M javascripts/modules/infobox/Infobox.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/javascripts/modules/infobox/Infobox.js 
b/javascripts/modules/infobox/Infobox.js
index df734db..f2a0ab2 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -485,7 +485,7 @@
options.description = claims.description;
rows = options.rows;
$.each( rows, function ( i, row ) {
-   if ( claims.entities[ row.id ] ) {
+   if ( claims.entities  
claims.entities[ row.id ] ) {
row.values = self._getValues( 
claims.entities[ row.id ] );
} else {
row.values = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I813023e3077ebbf870eff9723744a984ef2ddb74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
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 Monolog provider for beta logging - change (operations/mediawiki-config)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Use Monolog provider for beta logging
..


Use Monolog provider for beta logging

Convert the logging configuration for beta from the default
MWLoggerLegacySpi provider to MWLoggerMonologSpi. The Monolog
configuration attempts to preserve the legacy behavior of sending log
events as udp packets to a udp2log service. It also adds handlers that
log directly to logstash via an intermediate redis queue. Once we have
this event stream working reliably we can change the current log2udp
relay rules to exclude MediaWiki events.

With a few more changes on the log event delivery side we should be able
to eliminate the log2udp relay entirely. MediaWiki-Vagrant has
configuration now to accept apache2 and hhvm errors directly via
forwarded rsyslog events. It should be straight forward to replicate
this beta and eventually production.

The udp2log handler configuration still relies on the legacy global
logging variables at this time.

Required MediaWiki changes: I06295cc, If311308
Bug: T845

Change-Id: I1943cfec5765f48b327aa95ca4d7a03c30c7682c
---
M wmf-config/logging-labs.php
1 file changed, 715 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/logging-labs.php b/wmf-config/logging-labs.php
index 04ebeef..32cbddb 100644
--- a/wmf-config/logging-labs.php
+++ b/wmf-config/logging-labs.php
@@ -43,3 +43,718 @@
 
 $wgDebugLogPrefix = $randomHash . : ;
 
+// Monolog logging configuration
+// Note: the legacy handlers still use $wgDebugLogGroups and other legacy
+// logging config variables to determine logging output.
+$wgMWLoggerDefaultSpi = array(
+   'class' = 'MWLoggerMonologSpi',
+   'args' = array( array(
+   'loggers' = array(
+   // Beta logs everything, in prod this would be a null 
logger
+   '@default' = array(
+   'handlers' = array( 'wgDebugLogFile' ),
+   'processors' = array( 'psr' ),
+   ),
+   '404' = array(
+   'handlers' = array( '404', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'antispoof' = array(
+   'handlers' = array( 'antispoof', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'api' = array(
+   'handlers' = array( 'api', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'api-feature-usage' = array(
+   'handlers' = array( 'api-feature-usage', 
'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'badpass' = array(
+   'handlers' = array( 'badpass', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'BounceHandler' = array(
+   'handlers' = array( 'BounceHandler', 
'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'Bug40009' = array(
+   'handlers' = array( 'Bug40009', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'bug46577' = array(
+   'handlers' = array( 'bug46577', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'Bug54847' = array(
+   'handlers' = array( 'Bug54847', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'Bug58676' = array(
+   'handlers' = array( 'Bug58676', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'captcha' = array(
+   'handlers' = array( 'captcha', 'logstash' ),
+   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
+   ),
+   'CentralAuth' = array(
+

[MediaWiki-commits] [Gerrit] SWAT update for BounceHandler - change (mediawiki/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: SWAT update for BounceHandler
..


SWAT update for BounceHandler

Grabs:
  I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4

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

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



diff --git a/extensions/BounceHandler b/extensions/BounceHandler
index c160911..cec3827 16
--- a/extensions/BounceHandler
+++ b/extensions/BounceHandler
-Subproject commit c160911831a12448eb0c8d3eb1dc5517847d7016
+Subproject commit cec3827feca909c5d55f2ddeffbf15bf7f61be79

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3a11c4e7e22a88cab56f23e35c01ca022798b4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf9
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Adding mw1221-1226 dhcpd - change (operations/puppet)

2014-11-24 Thread Cmjohnson (Code Review)

Cmjohnson has uploaded a new change for review.

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

Change subject: Adding mw1221-1226 dhcpd
..

Adding mw1221-1226 dhcpd

Change-Id: Id1a328ca7c598e197ea3da32d05302a3bb54df45
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 30 insertions(+), 0 deletions(-)


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

diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 30f6662..6791387 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3274,6 +3274,36 @@
fixed-address mw1220.eqiad.wmnet;
 }
 
+host mw1221 {
+   hardware ethernet B0:83:FE:CF:12:F3;
+   fixed-address mw1221.eqiad.wmnet;
+}
+
+host mw1222 {
+   hardware ethernet B0:83:FE:CF:0D:C3;
+   fixed-address mw1222.eqiad.wmnet;
+}
+
+host mw1223 {
+   hardware ethernet B0:83:FE:CF:0D:B3;
+   fixed-address mw1223.eqiad.wmnet;
+}
+
+host mw1224 {
+   hardware ethernet B0:83:FE:CF:0B:A5;
+   fixed-address mw1224.eqiad.wmnet;
+}
+
+host mw1225 {
+   hardware ethernet B0:83:FE:CE:F9:B0;
+   fixed-address mw1225.eqiad.wmnet;
+}
+
+host mw1226 {
+   hardware ethernet B0:83:FE:CE:FB:13;
+   fixed-address mw1226.eqiad.wmnet;
+}
+
 host mw1227 {
hardware ethernet B0:83:FE:CF:0A:84;
fixed-address mw1227.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1a328ca7c598e197ea3da32d05302a3bb54df45
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Adding mw1221-1226 dhcpd - change (operations/puppet)

2014-11-24 Thread Cmjohnson (Code Review)

Cmjohnson has submitted this change and it was merged.

Change subject: Adding mw1221-1226 dhcpd
..


Adding mw1221-1226 dhcpd

Change-Id: Id1a328ca7c598e197ea3da32d05302a3bb54df45
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 9783e68..9ad5613 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3289,6 +3289,36 @@
fixed-address mw1220.eqiad.wmnet;
 }
 
+host mw1221 {
+   hardware ethernet B0:83:FE:CF:12:F3;
+   fixed-address mw1221.eqiad.wmnet;
+}
+
+host mw1222 {
+   hardware ethernet B0:83:FE:CF:0D:C3;
+   fixed-address mw1222.eqiad.wmnet;
+}
+
+host mw1223 {
+   hardware ethernet B0:83:FE:CF:0D:B3;
+   fixed-address mw1223.eqiad.wmnet;
+}
+
+host mw1224 {
+   hardware ethernet B0:83:FE:CF:0B:A5;
+   fixed-address mw1224.eqiad.wmnet;
+}
+
+host mw1225 {
+   hardware ethernet B0:83:FE:CE:F9:B0;
+   fixed-address mw1225.eqiad.wmnet;
+}
+
+host mw1226 {
+   hardware ethernet B0:83:FE:CE:FB:13;
+   fixed-address mw1226.eqiad.wmnet;
+}
+
 host mw1227 {
hardware ethernet B0:83:FE:CF:0A:84;
fixed-address mw1227.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1a328ca7c598e197ea3da32d05302a3bb54df45
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
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 Use Monolog provider for beta logging - change (operations/mediawiki-config)

2014-11-24 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Revert Use Monolog provider for beta logging
..

Revert Use Monolog provider for beta logging

This reverts commit e642f5fe31496903dd9cfe8c62ad7599a225481c.

PHP Fatal error:  Call to undefined method MWLoggerLegacyLogger::setFormatter() 
in /mnt/srv/mediawiki-staging/php-master/includes/debug/logger/monolog/Spi.php 
on line 222

Change-Id: I97c24085e8da08841ce4ee3fad2def27304e0cba
---
M wmf-config/logging-labs.php
1 file changed, 0 insertions(+), 715 deletions(-)


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

diff --git a/wmf-config/logging-labs.php b/wmf-config/logging-labs.php
index 32cbddb..04ebeef 100644
--- a/wmf-config/logging-labs.php
+++ b/wmf-config/logging-labs.php
@@ -43,718 +43,3 @@
 
 $wgDebugLogPrefix = $randomHash . : ;
 
-// Monolog logging configuration
-// Note: the legacy handlers still use $wgDebugLogGroups and other legacy
-// logging config variables to determine logging output.
-$wgMWLoggerDefaultSpi = array(
-   'class' = 'MWLoggerMonologSpi',
-   'args' = array( array(
-   'loggers' = array(
-   // Beta logs everything, in prod this would be a null 
logger
-   '@default' = array(
-   'handlers' = array( 'wgDebugLogFile' ),
-   'processors' = array( 'psr' ),
-   ),
-   '404' = array(
-   'handlers' = array( '404', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'antispoof' = array(
-   'handlers' = array( 'antispoof', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'api' = array(
-   'handlers' = array( 'api', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'api-feature-usage' = array(
-   'handlers' = array( 'api-feature-usage', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'badpass' = array(
-   'handlers' = array( 'badpass', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'BounceHandler' = array(
-   'handlers' = array( 'BounceHandler', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'Bug40009' = array(
-   'handlers' = array( 'Bug40009', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'bug46577' = array(
-   'handlers' = array( 'bug46577', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'Bug54847' = array(
-   'handlers' = array( 'Bug54847', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'Bug58676' = array(
-   'handlers' = array( 'Bug58676', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'captcha' = array(
-   'handlers' = array( 'captcha', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'CentralAuth' = array(
-   'handlers' = array( 'CentralAuth', 'logstash' 
),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'CentralAuth-Bug39996' = array(
-   'handlers' = array( 'CentralAuth-Bug39996', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'CentralAuthRename' = array(
-   'handlers' = array( 'CentralAuthRename', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-

[MediaWiki-commits] [Gerrit] Revert Use Monolog provider for beta logging - change (operations/mediawiki-config)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Revert Use Monolog provider for beta logging
..


Revert Use Monolog provider for beta logging

This reverts commit e642f5fe31496903dd9cfe8c62ad7599a225481c.

PHP Fatal error:  Call to undefined method MWLoggerLegacyLogger::setFormatter() 
in /mnt/srv/mediawiki-staging/php-master/includes/debug/logger/monolog/Spi.php 
on line 222

Change-Id: I97c24085e8da08841ce4ee3fad2def27304e0cba
---
M wmf-config/logging-labs.php
1 file changed, 0 insertions(+), 715 deletions(-)

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



diff --git a/wmf-config/logging-labs.php b/wmf-config/logging-labs.php
index 32cbddb..04ebeef 100644
--- a/wmf-config/logging-labs.php
+++ b/wmf-config/logging-labs.php
@@ -43,718 +43,3 @@
 
 $wgDebugLogPrefix = $randomHash . : ;
 
-// Monolog logging configuration
-// Note: the legacy handlers still use $wgDebugLogGroups and other legacy
-// logging config variables to determine logging output.
-$wgMWLoggerDefaultSpi = array(
-   'class' = 'MWLoggerMonologSpi',
-   'args' = array( array(
-   'loggers' = array(
-   // Beta logs everything, in prod this would be a null 
logger
-   '@default' = array(
-   'handlers' = array( 'wgDebugLogFile' ),
-   'processors' = array( 'psr' ),
-   ),
-   '404' = array(
-   'handlers' = array( '404', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'antispoof' = array(
-   'handlers' = array( 'antispoof', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'api' = array(
-   'handlers' = array( 'api', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'api-feature-usage' = array(
-   'handlers' = array( 'api-feature-usage', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'badpass' = array(
-   'handlers' = array( 'badpass', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'BounceHandler' = array(
-   'handlers' = array( 'BounceHandler', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'Bug40009' = array(
-   'handlers' = array( 'Bug40009', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'bug46577' = array(
-   'handlers' = array( 'bug46577', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'Bug54847' = array(
-   'handlers' = array( 'Bug54847', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'Bug58676' = array(
-   'handlers' = array( 'Bug58676', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'captcha' = array(
-   'handlers' = array( 'captcha', 'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'CentralAuth' = array(
-   'handlers' = array( 'CentralAuth', 'logstash' 
),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'CentralAuth-Bug39996' = array(
-   'handlers' = array( 'CentralAuth-Bug39996', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-   'CentralAuthRename' = array(
-   'handlers' = array( 'CentralAuthRename', 
'logstash' ),
-   'processors' = array( 'wiki', 'psr', 'pid', 
'uid', 'web' ),
-   ),
-

[MediaWiki-commits] [Gerrit] composer: Rename package to 'oojs-ui' and require php 5.3.3 - change (oojs/ui)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: composer: Rename package to 'oojs-ui' and require php 5.3.3
..


composer: Rename package to 'oojs-ui' and require php 5.3.3

The composer name is composed of publisher/package-name (similar
to GitHub paths). To allow easy forking and avoid name clashing,
consistently use 'oojs-ui' as the package name.

This hasn't been tested with PHP 5.3.2. MediaWiki and CSSJanus
both support PHP 5.3.3. and higher. Might as well match that.

Change-Id: Ib021b5524e15b3b3ba65110b6c23d214388a4758
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 7d0c612..fd56b8b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-   name: oojs/ui,
+   name: oojs/oojs-ui,
homepage: https://www.mediawiki.org/wiki/OOjs_UI;,
license: MIT,
require: {
-   php: =5.3.2
+   php: =5.3.3
},
autoload: {
classmap: [php/]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib021b5524e15b3b3ba65110b6c23d214388a4758
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Tag v0.2.1 - change (oojs/ui)

2014-11-24 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Tag v0.2.1
..

Tag v0.2.1

Change-Id: I83be50a638c9f0462b2f954f4ef6044c0e430018
---
M History.md
M README.md
M package.json
3 files changed, 9 insertions(+), 3 deletions(-)


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

diff --git a/History.md b/History.md
index 7c8e3d6..58f86cd 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,13 @@
 # OOjs UI Release History
 
+## v0.2.1 / 2014-11-24
+* Start the window opening transition before ready, not after (Roan Kattouw)
+* Add focus method to BookletLayout (Roan Kattouw)
+* Add missing History.md file now we're a proper repo (James D. Forrester)
+* README.md: Update introduction, badges, advice (James D. Forrester)
+* LabelElement: Kill inline styles (Bartosz Dziewoński)
+* composer: Rename package to 'oojs-ui' and require php 5.3.3 (Timo Tijhof)
+
 ## v0.2.0 / 2014-11-17
 * First versioned release
 
diff --git a/README.md b/README.md
index 6a75daf..22b480f 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,6 @@
 $ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require(./package.json).version);')...HEAD
 $ edit History.md
 
-node -e 'console.log(require(package.json).version);'
-
 # Update the version number
 $ edit package.json
 
diff --git a/package.json b/package.json
index b78b286..625e189 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   name: oojs-ui,
-  version: 0.2.0,
+  version: 0.2.1,
   description: User interface classes built on the OOjs framework.,
   keywords: [
 oojs-plugin,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83be50a638c9f0462b2f954f4ef6044c0e430018
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix rubocop style complaints - change (mediawiki...Flow)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix rubocop style complaints
..


Fix rubocop style complaints

Rubocop wants no space inside parenthese, while spaces within braces.

Change-Id: I8783fc6c8ced20b43e23e007feb73b677e7c3de3
---
M tests/browser/features/step_definitions/flow_no_javascript_steps.rb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/tests/browser/features/step_definitions/flow_no_javascript_steps.rb 
b/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
index cb1d083..765c458 100644
--- a/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
+++ b/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
@@ -3,13 +3,13 @@
 # Therefore it should run without any when_present clauses
 # If you need a when_present to make the test run, that is a bug
 
-Given(/^I am on a Flow page without JavaScript$/ ) do
+Given(/^I am on a Flow page without JavaScript$/) do
   visit(FlowPage)
 end
 
 Given(/^I am using user agent (.+)$/) do |user_agent|
   @user_agent = user_agent
-  @browser = browser(test_name(@scenario), {user_agent: user_agent})
+  @browser = browser(test_name(@scenario), { user_agent: user_agent })
   $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
 end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8783fc6c8ced20b43e23e007feb73b677e7c3de3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage sp...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Tag v0.2.1 - change (oojs/ui)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Tag v0.2.1
..


Tag v0.2.1

Change-Id: I83be50a638c9f0462b2f954f4ef6044c0e430018
---
M History.md
M README.md
M package.json
3 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/History.md b/History.md
index 7c8e3d6..58f86cd 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,13 @@
 # OOjs UI Release History
 
+## v0.2.1 / 2014-11-24
+* Start the window opening transition before ready, not after (Roan Kattouw)
+* Add focus method to BookletLayout (Roan Kattouw)
+* Add missing History.md file now we're a proper repo (James D. Forrester)
+* README.md: Update introduction, badges, advice (James D. Forrester)
+* LabelElement: Kill inline styles (Bartosz Dziewoński)
+* composer: Rename package to 'oojs-ui' and require php 5.3.3 (Timo Tijhof)
+
 ## v0.2.0 / 2014-11-17
 * First versioned release
 
diff --git a/README.md b/README.md
index 6a75daf..22b480f 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,6 @@
 $ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require(./package.json).version);')...HEAD
 $ edit History.md
 
-node -e 'console.log(require(package.json).version);'
-
 # Update the version number
 $ edit package.json
 
diff --git a/package.json b/package.json
index b78b286..625e189 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   name: oojs-ui,
-  version: 0.2.0,
+  version: 0.2.1,
   description: User interface classes built on the OOjs framework.,
   keywords: [
 oojs-plugin,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83be50a638c9f0462b2f954f4ef6044c0e430018
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] r::c::localssl: monitor based on $certname - change (operations/puppet)

2014-11-24 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: r::c::localssl: monitor based on $certname
..


r::c::localssl: monitor based on $certname

Change-Id: Ib9c498e2cf26c0c876a8ed580ae5dc6678211b36
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 9 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 734b101..fc7a0c2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -529,18 +529,10 @@
 define localssl($certname, $server_name=$::fqdn, $server_aliases=[], 
$default_server=false) {
 # Assumes that LVS service IPs are setup elsewhere
 
-# For unified or star certs we need to do a bit of
-# mapping; in other cases we should be OK with the raw name
-$check_cert = $certname ? {
-'unified.wikimedia.org' = '*.wikipedia.org',
-/^star\.(.+)$/  = *.$1,
-default = $certname
-}
-
 # Nagios monitoring
 monitoring::service { https_${name}:
 description   = HTTPS_${name},
-check_command = check_ssl_cert!${check_cert},
+check_command = check_ssl_cert!${certname},
 }
 
 install_certificate { $certname:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9c498e2cf26c0c876a8ed580ae5dc6678211b36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
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 version style that we already support - change (mediawiki/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Use version style that we already support
..


Use version style that we already support

Can't use FINAL without modifying code, so let's just increment for now.

Change-Id: Ife146884b097905340947afc3239f41d1e073494
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 50a1e9d..6c369d5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * Using single quotes is, therefore, important here.
  * @since 1.2
  */
-$wgVersion = '1.24.0-rc.FINAL';
+$wgVersion = '1.24.0-rc.2';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife146884b097905340947afc3239f41d1e073494
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: TTO at.li...@live.com.au
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] 1.24.0-rc.3 — no code changes — only renaming composer.json. - change (mediawiki/core)

2014-11-24 Thread MarkAHershberger (Code Review)

MarkAHershberger has uploaded a new change for review.

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

Change subject: 1.24.0-rc.3 — no code changes — only renaming composer.json.
..

1.24.0-rc.3 — no code changes — only renaming composer.json.

Change-Id: Ie9df269981414eb302af7231efd393f2fe9619f1
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/175453/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6c369d5..5caa555 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * Using single quotes is, therefore, important here.
  * @since 1.2
  */
-$wgVersion = '1.24.0-rc.2';
+$wgVersion = '1.24.0-rc.3';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9df269981414eb302af7231efd393f2fe9619f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: MarkAHershberger m...@nichework.com

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

[MediaWiki-commits] [Gerrit] 1.24.0-rc.3 — no code changes — only renaming composer.json. - change (mediawiki/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: 1.24.0-rc.3 — no code changes — only renaming composer.json.
..


1.24.0-rc.3 — no code changes — only renaming composer.json.

Change-Id: Ie9df269981414eb302af7231efd393f2fe9619f1
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6c369d5..5caa555 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * Using single quotes is, therefore, important here.
  * @since 1.2
  */
-$wgVersion = '1.24.0-rc.2';
+$wgVersion = '1.24.0-rc.3';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9df269981414eb302af7231efd393f2fe9619f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: TTO at.li...@live.com.au
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Removed ldap server role from virt1000. - change (operations/puppet)

2014-11-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Removed ldap server role from virt1000.
..

Removed ldap server role from virt1000.

We're going to use neptunium (or a different server to be named
later) as a dedicated ldap server.

RT 8417

Change-Id: Ie404572d49d0e9eb71cd8a3cde4a7220236e4613
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/175454/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 692fb58..f021f21 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2787,7 +2787,6 @@
 include standard
 include admin
 include role::dns::ldap
-include ldap::role::server::labs
 include ldap::role::client::labs
 include role::nova::controller
 include role::nova::manager

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie404572d49d0e9eb71cd8a3cde4a7220236e4613
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] r::c::ssl::misc: switch to r::c::localssl like prod SNI - change (operations/puppet)

2014-11-24 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: r::c::ssl::misc: switch to r::c::localssl like prod SNI
..

r::c::ssl::misc: switch to r::c::localssl like prod SNI

Change-Id: Ia261825e50d6473e6ee78bd2af38ad8774863e9a
---
M manifests/role/cache.pp
1 file changed, 13 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/175455/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index fc7a0c2..c0f6463 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -609,34 +609,23 @@
 }
 }
 
-class ssl::misc::certs {
-install_certificate { ['sni.wikimedia.org', 
'star.wmfusercontent.org']: }
-}
-
-# This class sets up multiple sites with multiple SSL certs using SNI
+# As above, but for misc instead of generic prod
 class ssl::misc {
+#TODO: kill the old wmf_ca
+include certificates::wmf_ca
+include certificates::wmf_ca_2014_2017
 include role::protoproxy::ssl::common
-require ::role::cache::ssl::misc::certs
 
-# Assumes that LVS service IPs are setup elsewhere
-
-protoproxy::localssl {
-'wikimedia':
-proxy_server_cert_name = 'sni.wikimedia.org',
-server_name= 'wikimedia.org',
-server_aliases = ['*.wikimedia.org'],
-default_server = true;
+localssl {
+'wikimedia.org':
+certname = 'sni.wikimedia.org',
+server_name = 'wikimedia.org',
+server_aliases = ['*.wikimedia.org'],
+default_server = true;
 'wmfusercontent.org':
-proxy_server_cert_name = 'star.wmfusercontent.org',
-server_name= 'wmfusercontent.org',
-server_aliases = ['*.wmfusercontent.org'];
-}
-
-# FIXME: Icinga monitoring with support for SNI
-
-monitoring::service { 'https':
-description   = 'HTTPS',
-check_command = check_ssl_cert!*.wikimedia.org,
+certname = 'star.wmfusercontent.org',
+server_name = 'wmfusercontent.org',
+server_aliases = ['*.wmfusercontent.org'],
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia261825e50d6473e6ee78bd2af38ad8774863e9a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Switch keystone over to use the new ldap server name, ldap-e... - change (operations/puppet)

2014-11-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Switch keystone over to use the new ldap server name, ldap-eqiad
..

Switch keystone over to use the new ldap server name, ldap-eqiad

Change-Id: I53c9a43b1db0e6807c8a8e938455d8f24ab1e7b9
---
M manifests/role/keystone.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/175456/1

diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index 4b6bd89..92bcc89 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -31,7 +31,7 @@
 }
 },
 ldap_host= $::realm ? {
-'production' = 'virt1000.wikimedia.org',
+'production' = 'ldap-eqiad.wikimedia.org',
 'labs'   = $nova_controller_hostname ? {
 undef   = $::ipaddress_eth0,
 default = $nova_controller_hostname,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53c9a43b1db0e6807c8a8e938455d8f24ab1e7b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert r::c::localssl: monitor based on $certname - change (operations/puppet)

2014-11-24 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Revert r::c::localssl: monitor based on $certname
..

Revert r::c::localssl: monitor based on $certname

This reverts commit 250f45794d6a58db326acdff0fe6a5e4576b0cc9.

Change-Id: I9bc199e5da9edab4bb30fd89f2fcb8727e0ca570
---
M manifests/role/cache.pp
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/175457/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index fc7a0c2..734b101 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -529,10 +529,18 @@
 define localssl($certname, $server_name=$::fqdn, $server_aliases=[], 
$default_server=false) {
 # Assumes that LVS service IPs are setup elsewhere
 
+# For unified or star certs we need to do a bit of
+# mapping; in other cases we should be OK with the raw name
+$check_cert = $certname ? {
+'unified.wikimedia.org' = '*.wikipedia.org',
+/^star\.(.+)$/  = *.$1,
+default = $certname
+}
+
 # Nagios monitoring
 monitoring::service { https_${name}:
 description   = HTTPS_${name},
-check_command = check_ssl_cert!${certname},
+check_command = check_ssl_cert!${check_cert},
 }
 
 install_certificate { $certname:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bc199e5da9edab4bb30fd89f2fcb8727e0ca570
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Switch keystone over to use the new ldap server name, ldap-e... - change (operations/puppet)

2014-11-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Switch keystone over to use the new ldap server name, ldap-eqiad
..


Switch keystone over to use the new ldap server name, ldap-eqiad

Change-Id: I53c9a43b1db0e6807c8a8e938455d8f24ab1e7b9
---
M manifests/role/keystone.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index 4b6bd89..92bcc89 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -31,7 +31,7 @@
 }
 },
 ldap_host= $::realm ? {
-'production' = 'virt1000.wikimedia.org',
+'production' = 'ldap-eqiad.wikimedia.org',
 'labs'   = $nova_controller_hostname ? {
 undef   = $::ipaddress_eth0,
 default = $nova_controller_hostname,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53c9a43b1db0e6807c8a8e938455d8f24ab1e7b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
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 r::c::localssl: monitor based on $certname - change (operations/puppet)

2014-11-24 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Revert r::c::localssl: monitor based on $certname
..


Revert r::c::localssl: monitor based on $certname

This reverts commit 250f45794d6a58db326acdff0fe6a5e4576b0cc9.

Change-Id: I9bc199e5da9edab4bb30fd89f2fcb8727e0ca570
---
M manifests/role/cache.pp
1 file changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index fc7a0c2..734b101 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -529,10 +529,18 @@
 define localssl($certname, $server_name=$::fqdn, $server_aliases=[], 
$default_server=false) {
 # Assumes that LVS service IPs are setup elsewhere
 
+# For unified or star certs we need to do a bit of
+# mapping; in other cases we should be OK with the raw name
+$check_cert = $certname ? {
+'unified.wikimedia.org' = '*.wikipedia.org',
+/^star\.(.+)$/  = *.$1,
+default = $certname
+}
+
 # Nagios monitoring
 monitoring::service { https_${name}:
 description   = HTTPS_${name},
-check_command = check_ssl_cert!${certname},
+check_command = check_ssl_cert!${check_cert},
 }
 
 install_certificate { $certname:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bc199e5da9edab4bb30fd89f2fcb8727e0ca570
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [WIP] Break down pageview metric - change (analytics/dashiki)

2014-11-24 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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

Change subject: [WIP] Break down pageview metric
..

[WIP] Break down pageview metric

TODO: 6 tests are still failing, code is ugly and not final.  This is a
checkpoint more than anything.

Bug link not available because bugzilla migration / phabricator /
scrumbugz are all confusing me at the moment

Change-Id: I809d0b748d567e98174d1cb630b85546238f4d5f
---
M src/app/apis/config-api.js
M src/app/apis/legacy-pageview-api.js
M src/app/config.js
M src/app/data-converters/separated-values.js
M src/app/data-converters/wikimetrics-timeseries.js
M src/app/startup.js
A src/components/breakdown-toggle/breakdown-toggle.html
A src/components/breakdown-toggle/breakdown-toggle.js
M src/components/visualizers/vega-timeseries/bindings.js
M src/components/wikimetrics-layout/wikimetrics-layout.html
M src/components/wikimetrics-visualizer/wikimetrics-visualizer.js
M src/css/styles.css
M stubs/available-metrics-stub.json
13 files changed, 235 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki 
refs/changes/58/175458/1

diff --git a/src/app/apis/config-api.js b/src/app/apis/config-api.js
index 49da83a..4d701c4 100644
--- a/src/app/apis/config-api.js
+++ b/src/app/apis/config-api.js
@@ -7,7 +7,7 @@
  * Encapsulating configuration requests on this object separates the 
wikimetricsAPI
  * as a data provider and the wikimetricsAPI as a (temporary) config provider.
  */
-define(['config'], function (siteConfig) {
+define(['config', 'knockout'], function (siteConfig, ko) {
 'use strict';
 
 function ConfigApi(config) {
@@ -45,7 +45,19 @@
 if (!promiseMetrics) {
 promiseMetrics = 
this._getJSON(this.config.configApi.urlCategorizedMetrics);
 }
-return promiseMetrics.done(callback);
+return promiseMetrics.pipe(function (config) {
+config.categorizedMetrics.forEach(function (category) {
+category.metrics.forEach(function (metric) {
+// whether the metric was configured to be broken down
+metric.breakdown = metric.breakdown || false;
+// whether to graph the available breakdowns
+metric.showBreakdown = ko.observable(false);
+// a list of available breakdowns
+metric.breakdowns = ko.observable([]);
+});
+});
+return config;
+}).done(callback);
 };
 
 /**
@@ -60,4 +72,4 @@
 };
 
 return new ConfigApi(siteConfig);
-});
\ No newline at end of file
+});
diff --git a/src/app/apis/legacy-pageview-api.js 
b/src/app/apis/legacy-pageview-api.js
index c8edacc..231427a 100644
--- a/src/app/apis/legacy-pageview-api.js
+++ b/src/app/apis/legacy-pageview-api.js
@@ -28,15 +28,14 @@
 };
 /**
  * Parameters
- *   metric  : an object representing  metric
- *   project : a Wiki project (English Wikipedia is 'enwiki', Commons is 
'commonswiki', etc.)
+ *   metric : an object representing a metric
+ *   project: a Wiki project database name (enwiki, commonswiki, etc.)
+ *   breakdown  : whether to materialize breakdowns in addition to the 
Total
  *
  * Returns
  *  A promise with that wraps data for the metric/project transformed via 
the converter
  */
-PageviewApi.prototype.getData = function (metric, project) {
-
-var metricName = metric.name;
+PageviewApi.prototype.getData = function (metric, project, breakdown) {
 
 //using christian's endpoint
 //  http://quelltextlich.at/wmf/projectcounts/daily/enwiki.csv
@@ -47,9 +46,10 @@
 }).toString();
 
 var opt = {
-label: project
+label: project,
+breakdown: breakdown,
+breakdowns: metric.breakdowns,
 };
-
 
 var converter = this.getDataConverter().bind(null, opt);
 
@@ -61,4 +61,4 @@
 };
 
 return new PageviewApi(siteConfig);
-});
\ No newline at end of file
+});
diff --git a/src/app/config.js b/src/app/config.js
index 3525f79..7b3e663 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -10,9 +10,8 @@
 // but the confiApi will be switched to mediawiki in the future
 configApi: {
 endpoint: 'metrics-staging.wmflabs.org',
-urlCategorizedMetrics: 
'https://metrics-staging.wmflabs.org/static/public/datafiles/available-metrics.json',
-//using stubs to iron any blockers with pageviews
-//urlCategorizedMetrics: 
'https://metrics.wmflabs.org/static/public/datafiles/available-metrics.json',
+//urlCategorizedMetrics: 
'https://metrics-staging.wmflabs.org/static/public/datafiles/available-metrics.json',
+urlCategorizedMetrics: '/stubs/available-metrics-stub.json',

[MediaWiki-commits] [Gerrit] Implement Search event logging. - change (apps...wikipedia)

2014-11-24 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Implement Search event logging.
..

Implement Search event logging.

Change-Id: I8c58836df6ff57a998470184d3501a2a65936921
---
A wikipedia/src/main/java/org/wikipedia/analytics/SearchFunnel.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
4 files changed, 108 insertions(+), 0 deletions(-)


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

diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/SearchFunnel.java 
b/wikipedia/src/main/java/org/wikipedia/analytics/SearchFunnel.java
new file mode 100644
index 000..f838e3b
--- /dev/null
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/SearchFunnel.java
@@ -0,0 +1,89 @@
+package org.wikipedia.analytics;
+
+import org.wikipedia.WikipediaApp;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class SearchFunnel extends Funnel {
+private static final String SCHEMA_NAME = MobileWikiAppSearch;
+private static final int REVISION = 10593635;
+
+private final String appInstallID;
+
+public SearchFunnel(WikipediaApp app) {
+super(app, SCHEMA_NAME, REVISION);
+//Retrieve this app installation's unique ID, used to record unique 
users of features
+appInstallID = app.getAppInstallID();
+}
+
+protected void log(Object... params) {
+final int defaultSampleRate = 20;
+
+//take the last 4 hex digits of the uuid, modulo the sampling 
coefficient.
+//if the result is 0, then we're one of the Chosen.
+final int uuidSubstrLen = 4;
+final int hexBase = 16;
+boolean chosen = 
Integer.parseInt(appInstallID.substring(appInstallID.length() - uuidSubstrLen), 
hexBase) % defaultSampleRate == 0;
+
+if (chosen) {
+super.log(getApp().getPrimarySite(), params);
+}
+}
+
+@Override
+protected JSONObject preprocessData(JSONObject eventData) {
+try {
+eventData.put(appInstallID, appInstallID);
+} catch (JSONException e) {
+// This isn't happening
+throw new RuntimeException(e);
+}
+return eventData;
+}
+
+public void searchStart() {
+log(
+action, start
+);
+}
+
+public void searchCancel() {
+log(
+action, cancel
+);
+}
+
+public void searchError() {
+log(
+action, cancel
+);
+}
+
+public void searchClick() {
+log(
+action, click
+);
+}
+
+public void searchAutoSwitch() {
+log(
+action, autoswitch
+);
+}
+
+public void searchQuery(boolean fullText) {
+log(
+action, query,
+typeOfSearch, fullText ? full : prefix
+);
+}
+
+public void searchResults(boolean fullText, int numResults, int 
delayMillis) {
+log(
+action, results,
+typeOfSearch, fullText ? full : prefix,
+numberOfResults, numResults,
+timeToDisplayResults, delayMillis
+);
+}
+}
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
index 22e1093..dd01eeb 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
@@ -141,6 +141,7 @@
 return;
 }
 
+searchFragment.getFunnel().searchQuery(true);
 currentSearchTerm = term;
 
 searchNoResults.setVisibility(View.GONE);
@@ -160,12 +161,14 @@
 }
 
 private void doSearch(final String searchTerm, final 
FullSearchArticlesTask.ContinueOffset continueOffset) {
+final long startMillis = System.currentTimeMillis();
 new FullSearchArticlesTask(app.getAPIForSite(app.getPrimarySite()), 
app.getPrimarySite(), searchTerm, BATCH_SIZE, continueOffset) {
 @Override
 public void onFinish(FullSearchResults results) {
 if (!isAdded()) {
 return;
 }
+searchFragment.getFunnel().searchResults(true, 
results.getResults().size(), (int)(System.currentTimeMillis() - startMillis));
 lastResults = results;
 totalResults.addAll(lastResults.getResults());
 
@@ -219,6 +222,7 @@
 if (!isAdded()) {
 return;
 }
+searchFragment.getFunnel().searchError();

[MediaWiki-commits] [Gerrit] mediawiki: enable experimental HHVM features on one host - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: mediawiki: enable experimental HHVM features on one host
..

mediawiki: enable experimental HHVM features on one host

Enable a few experimental features that may help smooth running of HHVM;
enable stats

Change-Id: Id1abb88a1c2d2d37b92e67a1ec4b0fadd5021df8
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/hosts/mw1053.yaml
M modules/mediawiki/manifests/hhvm.pp
2 files changed, 33 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/175460/1

diff --git a/hieradata/hosts/mw1053.yaml b/hieradata/hosts/mw1053.yaml
index e30aca3..a2931fd 100644
--- a/hieradata/hosts/mw1053.yaml
+++ b/hieradata/hosts/mw1053.yaml
@@ -1 +1,2 @@
 mainrole: appserver_hhvm
+mediawiki::hhvm::experimental_features: true
diff --git a/modules/mediawiki/manifests/hhvm.pp 
b/modules/mediawiki/manifests/hhvm.pp
index 8f3db74..c965ecc 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -36,7 +36,38 @@
 },
 }
 
-$experimental_settings = {}
+$experimental_settings = {
+server = {
+# limit threads to #cpus until this many requests; reduces
+# starvation of threads that are JIT-compiling
+warmup_throttle_request_count = 1000,
+# Limit number of child processes running at once
+light_process_count   = 10,
+# JobQueueWorker::dequeueMaybeExpiredImpl will by default
+# wait() indefinitely; if set, it will timeout after
+# thread_drop_cache_timeout_seconds seconds and call
+# DropCachePolicy::dropCache()
+thread_drop_cache_timeout_seconds = 5,
+#If this is set to true, and drop cache timeout gets
+#triggered, it will flush the thread stack upon killing
+#it; I don't really see why one would want to set this to
+#false if the other is different than 0
+thread_drop_stack = true,
+},
+http   = {
+# Log http client requests taking too much time
+slow_query_threshold  = 1,
+},
+stats  = {
+enable= true,
+web   = true,
+memory= true,
+memcache  = true,
+sql   = true,
+slot_duration = 30,
+max_slot  = 10,
+}
+}
 
 if ($experimental_features) {
 $fcgi_settings = deep_merge(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1abb88a1c2d2d37b92e67a1ec4b0fadd5021df8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Change command list from whitelist to blac... - change (VisualEditor/VisualEditor)

2014-11-24 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: [BREAKING CHANGE] Change command list from whitelist to 
blacklist
..

[BREAKING CHANGE] Change command list from whitelist to blacklist

Also have the toolbar automatically remove tools for which the
command is not available. This means surface widgets can define
their toolbars just by blacklisting commands.

Change-Id: If32d514a51bebb6614ca84f1061167e7fc50ecb0
---
M src/init/sa/ve.init.sa.Target.js
M src/init/ve.init.Target.js
M src/ui/ve.ui.Surface.js
M src/ui/ve.ui.Tool.js
M src/ui/ve.ui.Toolbar.js
M src/ui/widgets/ve.ui.SurfaceWidget.js
6 files changed, 48 insertions(+), 95 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/61/175461/1

diff --git a/src/init/sa/ve.init.sa.Target.js b/src/init/sa/ve.init.sa.Target.js
index 538c14b..0060e08 100644
--- a/src/init/sa/ve.init.sa.Target.js
+++ b/src/init/sa/ve.init.sa.Target.js
@@ -67,8 +67,7 @@
 
// Properties
this.setupDone = true;
-   this.surface = this.createSurface( dmDoc );
-   this.surface.addCommands( this.constructor.static.surfaceCommands );
+   this.surface = this.createSurface( dmDoc, { excludeCommands: 
this.constructor.static.excludeCommands } );
this.$element.append( this.surface.$element );
 
this.setupToolbar();
diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index 6b18fca..b1c9e69 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -145,32 +145,7 @@
}
 ];
 
-ve.init.Target.static.surfaceCommands = [
-   'undo',
-   'redo',
-   'bold',
-   'italic',
-   'link',
-   'clear',
-   'underline',
-   'subscript',
-   'superscript',
-   'code',
-   'strikethrough',
-   'indent',
-   'outdent',
-   'commandHelp',
-   'paragraph',
-   'heading1',
-   'heading2',
-   'heading3',
-   'heading4',
-   'heading5',
-   'heading6',
-   'preformatted',
-   'selectAll',
-   'pasteSpecial'
-];
+ve.init.Target.static.excludeCommands = [];
 
 /**
  * Surface paste rules
@@ -247,7 +222,6 @@
}
this.toolbar = new ve.ui.TargetToolbar( this, this.surface, config );
this.toolbar.setup( this.constructor.static.toolbarGroups );
-   this.surface.addCommands( this.constructor.static.surfaceCommands );
this.toolbar.$element.insertBefore( this.surface.$element );
 };
 
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 76f9372..0c8e085 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -14,8 +14,11 @@
  * @constructor
  * @param {HTMLDocument|Array|ve.dm.LinearData|ve.dm.Document} dataOrDoc 
Document data to edit
  * @param {Object} [config] Configuration options
+ * @cfg {string[]} [excludeCommands] List of commands to exclude
  */
 ve.ui.Surface = function VeUiSurface( dataOrDoc, config ) {
+   config = config || {};
+
var documentModel;
 
// Parent constructor
@@ -43,7 +46,8 @@
this.model = new ve.dm.Surface( documentModel );
this.view = new ve.ce.Surface( this.model, this, { $: this.$ } );
this.dialogs = this.createDialogWindowManager();
-   this.commands = {};
+   this.commands = [];
+   this.commandsByTrigger = {};
this.triggers = {};
this.pasteRules = {};
this.enabled = true;
@@ -53,6 +57,7 @@
this.filibuster = null;
 
// Initialization
+   this.setupCommands( config.excludeCommands );
this.$menus.append( this.context.$element );
this.$element
.addClass( 've-ui-surface' )
@@ -71,15 +76,6 @@
 OO.mixinClass( ve.ui.Surface, OO.EventEmitter );
 
 /* Events */
-
-/**
- * When a command is added to the surface.
- *
- * @event addCommand
- * @param {string} name Symbolic name of command and trigger
- * @param {ve.ui.Command} command Command that's been registered
- * @param {ve.ui.Trigger[]} triggers Triggers to associate with command
- */
 
 /**
  * When a surface is destroyed.
@@ -253,8 +249,8 @@
  * @param {string} trigger Trigger string
  * @returns {ve.ui.Command|undefined} Command
  */
-ve.ui.Surface.prototype.getCommand = function ( trigger ) {
-   return this.commands[trigger];
+ve.ui.Surface.prototype.getCommandByTrigger = function ( trigger ) {
+   return this.commandsByTrigger[trigger];
 };
 
 /**
@@ -300,7 +296,7 @@
  * @returns {boolean} Action or command was executed
  */
 ve.ui.Surface.prototype.execute = function ( action, method ) {
-   var trigger, obj, ret;
+   var trigger, command, obj, ret;
 
if ( !this.enabled ) {
return;
@@ -309,9 +305,10 @@
if ( action instanceof ve.ui.Trigger ) {
// Lookup command by trigger
trigger = action.toString();
-   if (

[MediaWiki-commits] [Gerrit] dsh: add more appservers to the groups - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: dsh: add more appservers to the groups
..

dsh: add more appservers to the groups

Change-Id: I05462540b99a283e05cb0931ac0c2fce461a042e
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/dsh/files/group/apaches
M modules/dsh/files/group/mediawiki-installation
M modules/dsh/files/group/mw-eqiad
3 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/175462/1

diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches
index 995ba2f..f862558 100644
--- a/modules/dsh/files/group/apaches
+++ b/modules/dsh/files/group/apaches
@@ -246,3 +246,6 @@
 mw1253
 mw1254
 mw1255
+mw1256
+mw1257
+mw1258
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index 347cb0f..413b8ec 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -255,3 +255,6 @@
 mw1253
 mw1254
 mw1255
+mw1256
+mw1257
+mw1258
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index eed58dc..847388f 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -246,6 +246,9 @@
 mw1253
 mw1254
 mw1255
+mw1256
+mw1257
+mw1258
 terbium
 snapshot1001
 snapshot1002

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05462540b99a283e05cb0931ac0c2fce461a042e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] dsh: add more appservers to the groups - change (operations/puppet)

2014-11-24 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: dsh: add more appservers to the groups
..


dsh: add more appservers to the groups

Change-Id: I05462540b99a283e05cb0931ac0c2fce461a042e
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/dsh/files/group/apaches
M modules/dsh/files/group/mediawiki-installation
M modules/dsh/files/group/mw-eqiad
3 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches
index 995ba2f..f862558 100644
--- a/modules/dsh/files/group/apaches
+++ b/modules/dsh/files/group/apaches
@@ -246,3 +246,6 @@
 mw1253
 mw1254
 mw1255
+mw1256
+mw1257
+mw1258
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index 347cb0f..413b8ec 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -255,3 +255,6 @@
 mw1253
 mw1254
 mw1255
+mw1256
+mw1257
+mw1258
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index eed58dc..847388f 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -246,6 +246,9 @@
 mw1253
 mw1254
 mw1255
+mw1256
+mw1257
+mw1258
 terbium
 snapshot1001
 snapshot1002

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05462540b99a283e05cb0931ac0c2fce461a042e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] API: Fix namespace handling in list=alldeletedrevs with from... - change (mediawiki/core)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: API: Fix namespace handling in list=alldeletedrevs with 
from/to/predix
..


API: Fix namespace handling in list=alldeletedrevs with from/to/predix

We don't have just one namespace like the code we copied this from. And
to avoid a repeat of bug 25702, we have to handle the case where the
title/prefix might be being transformed differently in all the requested
namespaces.

Bug: T75711
Change-Id: I5267847fe876c971aaf358d2c6fe4006e4645939
---
M includes/api/ApiQueryAllDeletedRevisions.php
1 file changed, 54 insertions(+), 11 deletions(-)

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



diff --git a/includes/api/ApiQueryAllDeletedRevisions.php 
b/includes/api/ApiQueryAllDeletedRevisions.php
index 0b1accb..4e95f5b 100644
--- a/includes/api/ApiQueryAllDeletedRevisions.php
+++ b/includes/api/ApiQueryAllDeletedRevisions.php
@@ -135,21 +135,64 @@
 
if ( $mode == 'all' ) {
if ( $params['namespace'] !== null ) {
-   $this-addWhereFld( 'ar_namespace', 
$params['namespace'] );
+   $namespaces = $params['namespace'];
+   $this-addWhereFld( 'ar_namespace', $namespaces 
);
+   } else {
+   $namespaces = MWNamespace::getValidNamespaces();
}
 
-   $from = $params['from'] === null
-   ? null
-   : $this-titlePartToKey( $params['from'], 
$params['namespace'] );
-   $to = $params['to'] === null
-   ? null
-   : $this-titlePartToKey( $params['to'], 
$params['namespace'] );
-   $this-addWhereRange( 'ar_title', $dir, $from, $to );
+   // For from/to/prefix, we have to consider the potential
+   // transformations of the title in all specified 
namespaces.
+   // Generally there will be only one transformation, but 
wikis with
+   // some namespaces case-sensitive could have two.
+   if ( $params['from'] !== null || $params['to'] !== null 
) {
+   $isDirNewer = ( $dir === 'newer' );
+   $after = ( $isDirNewer ? '=' : '=' );
+   $before = ( $isDirNewer ? '=' : '=' );
+   $where = array();
+   foreach ( $namespaces as $ns ) {
+   $w = array();
+   if ( $params['from'] !== null ) {
+   $w[] = 'ar_title' . $after .
+   $db-addQuotes( 
$this-titlePartToKey( $params['from'], $ns ) );
+   }
+   if ( $params['to'] !== null ) {
+   $w[] = 'ar_title' . $before .
+   $db-addQuotes( 
$this-titlePartToKey( $params['to'], $ns ) );
+   }
+   $w = $db-makeList( $w, LIST_AND );
+   $where[$w][] = $ns;
+   }
+   if ( count( $where ) == 1 ) {
+   $where = key( $where );
+   $this-addWhere( $where );
+   } else {
+   $where2 = array();
+   foreach ( $where as $w = $ns ) {
+   $where2[] = $db-makeList( 
array( $w, 'ar_namespace' = $ns ), LIST_AND );
+   }
+   $this-addWhere( $db-makeList( 
$where2, LIST_OR ) );
+   }
+   }
 
if ( isset( $params['prefix'] ) ) {
-   $this-addWhere( 'ar_title' . $db-buildLike(
-   $this-titlePartToKey( 
$params['prefix'], $params['namespace'] ),
-   $db-anyString() ) );
+   $where = array();
+   foreach ( $namespaces as $ns ) {
+   $w = 'ar_title' . $db-buildLike(
+   $this-titlePartToKey( 
$params['prefix'], $ns ),
+   $db-anyString() );
+   $where[$w][] = $ns;
+   }
+

[MediaWiki-commits] [Gerrit] Adds new JS behavior for Sprint Boards - change (phabricator...Sprint)

2014-11-24 Thread Christopher Johnson (WMDE) (Code Review)

Christopher Johnson (WMDE) has uploaded a new change for review.

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

Change subject: Adds new JS behavior for Sprint Boards
..

Adds new JS behavior for Sprint Boards

Renamed Burndown Application to Sprint Application
Removed Inheritance from PhabricatorProjectController for Board Classes

Change-Id: I5ba5160e66a1bbc2325d4357606cd3e4496caf45
---
A rsrc/behavior-sprint-boards.js
M src/__phutil_library_map__.php
M src/application/SprintApplication.php
M src/celerity/map.php
M src/controller/BurndownDataViewController.php
M src/controller/BurndownListController.php
A src/controller/SprintBoardMoveController.php
R src/controller/SprintController.php
A src/controller/SprintProjectBoardController.php
M src/controller/SprintProjectBoardImportController.php
M src/controller/SprintProjectBoardReorderController.php
M src/controller/SprintProjectBoardViewController.php
M src/controller/SprintProjectColumnDetailController.php
M src/controller/SprintProjectColumnEditController.php
M src/controller/SprintProjectColumnHideController.php
M src/controller/SprintProjectProfileController.php
M src/controller/SprintReportController.php
M src/tests/BurndownControllerTest.php
18 files changed, 551 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint 
refs/changes/63/175463/1

diff --git a/rsrc/behavior-sprint-boards.js b/rsrc/behavior-sprint-boards.js
new file mode 100644
index 000..3f9697d
--- /dev/null
+++ b/rsrc/behavior-sprint-boards.js
@@ -0,0 +1,275 @@
+/**
+ * @provides javelin-behavior-sprint-boards
+ */
+
+JX.behavior('sprint-boards', function(config) {
+
+function finditems(col) {
+return JX.DOM.scry(col, 'li', 'project-card');
+}
+
+function onupdate(col) {
+var data = JX.Stratcom.getData(col);
+var cards = finditems(col);
+
+// Update the count of tasks in the column header.
+if (!data.countTagNode) {
+data.countTagNode = JX.$(data.countTagID);
+JX.DOM.show(data.countTagNode);
+}
+
+var sum = 0;
+for (var ii = 0; ii  cards.length; ii++) {
+// TODO: Allow this to be computed in some more clever way.
+sum += 1;
+}
+
+// TODO: This is a little bit hacky, but we don't have a PHUIX version 
of
+// this element yet.
+
+var over_limit = (data.pointLimit  (sum  data.pointLimit));
+
+var display_value = sum;
+if (data.pointLimit) {
+display_value = sum + ' / ' + data.pointLimit;
+}
+JX.DOM.setContent(JX.$(data.countTagContentID), display_value);
+
+
+var panel_map = {
+'project-panel-empty': !cards.length,
+'project-panel-over-limit': over_limit
+};
+var panel = JX.DOM.findAbove(col, 'div', 'workpanel');
+for (var k in panel_map) {
+JX.DOM.alterClass(panel, k, !!panel_map[k]);
+}
+
+var color_map = {
+'phui-tag-shade-disabled': (sum === 0),
+'phui-tag-shade-blue': (sum  0  !over_limit),
+'phui-tag-shade-red': (over_limit)
+};
+for (var k in color_map) {
+JX.DOM.alterClass(data.countTagNode, k, !!color_map[k]);
+}
+}
+
+function onresponse(response, item, list) {
+list.unlock();
+JX.DOM.alterClass(item, 'drag-sending', false);
+JX.DOM.replace(item, JX.$H(response.task));
+}
+
+function getcolumns() {
+return JX.DOM.scry(JX.$(config.boardID), 'ul', 'project-column');
+}
+
+function colsort(u, v) {
+var ud = JX.Stratcom.getData(u).sort || [];
+var vd = JX.Stratcom.getData(v).sort || [];
+
+for (var ii = 0; ii  ud.length; ii++) {
+
+if (parseInt(ud[ii])  parseInt(vd[ii])) {
+return 1;
+}
+if (parseInt(ud[ii])  parseInt(vd[ii])) {
+return -1;
+}
+}
+
+return 0;
+}
+
+function getcontainer() {
+return JX.DOM.find(
+JX.$(config.boardID),
+'div',
+'aphront-multi-column-view');
+}
+
+function onbegindrag(item) {
+// If the longest column on the board is taller than the window, the 
board
+// will scroll vertically. Dragging an item to the longest column may
+// make it longer, by the total height of the board, plus the height of
+// the drop target.
+
+// If this happens, the scrollbar will jump around and the scroll 
position
+// can be adjusted in a disorienting way. To reproduce this, drag a 
task
+// to the bottom of the longest column on a scrolling board and wave 
the
+// task in and out of the column. The scroll bar will jump around and
+// it will be hard to lock onto a target.
+
+// To fix this, set the

[MediaWiki-commits] [Gerrit] Bring in elastica library via composer - change (mediawiki...Elastica)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Bring in elastica library via composer
..


Bring in elastica library via composer

Depends on Ie5a3560 in mediawiki/vendor

Change-Id: Ie6583a57e0878dd0ebd0aa7a58b28e185b63d44f
---
A .gitignore
M Elastica.php
D Elastica/LICENSE.txt
D Elastica/README.markdown
D Elastica/Vagrantfile
D Elastica/build.xml
D Elastica/changes.txt
D Elastica/composer.json
D Elastica/lib/Elastica/AbstractUpdateAction.php
D Elastica/lib/Elastica/Aggregation/AbstractAggregation.php
D Elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php
D Elastica/lib/Elastica/Aggregation/Avg.php
D Elastica/lib/Elastica/Aggregation/Cardinality.php
D Elastica/lib/Elastica/Aggregation/DateHistogram.php
D Elastica/lib/Elastica/Aggregation/DateRange.php
D Elastica/lib/Elastica/Aggregation/ExtendedStats.php
D Elastica/lib/Elastica/Aggregation/Filter.php
D Elastica/lib/Elastica/Aggregation/GeoDistance.php
D Elastica/lib/Elastica/Aggregation/GeohashGrid.php
D Elastica/lib/Elastica/Aggregation/GlobalAggregation.php
D Elastica/lib/Elastica/Aggregation/Histogram.php
D Elastica/lib/Elastica/Aggregation/IpRange.php
D Elastica/lib/Elastica/Aggregation/Max.php
D Elastica/lib/Elastica/Aggregation/Min.php
D Elastica/lib/Elastica/Aggregation/Missing.php
D Elastica/lib/Elastica/Aggregation/Nested.php
D Elastica/lib/Elastica/Aggregation/Range.php
D Elastica/lib/Elastica/Aggregation/ReverseNested.php
D Elastica/lib/Elastica/Aggregation/Stats.php
D Elastica/lib/Elastica/Aggregation/Sum.php
D Elastica/lib/Elastica/Aggregation/Terms.php
D Elastica/lib/Elastica/Aggregation/ValueCount.php
D Elastica/lib/Elastica/Bulk.php
D Elastica/lib/Elastica/Bulk/Action.php
D Elastica/lib/Elastica/Bulk/Action/AbstractDocument.php
D Elastica/lib/Elastica/Bulk/Action/CreateDocument.php
D Elastica/lib/Elastica/Bulk/Action/DeleteDocument.php
D Elastica/lib/Elastica/Bulk/Action/IndexDocument.php
D Elastica/lib/Elastica/Bulk/Action/UpdateDocument.php
D Elastica/lib/Elastica/Bulk/Response.php
D Elastica/lib/Elastica/Bulk/ResponseSet.php
D Elastica/lib/Elastica/Client.php
D Elastica/lib/Elastica/Cluster.php
D Elastica/lib/Elastica/Cluster/Health.php
D Elastica/lib/Elastica/Cluster/Health/Index.php
D Elastica/lib/Elastica/Cluster/Health/Shard.php
D Elastica/lib/Elastica/Cluster/Settings.php
D Elastica/lib/Elastica/Connection.php
D Elastica/lib/Elastica/Document.php
D Elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php
D Elastica/lib/Elastica/Exception/Bulk/ResponseException.php
D Elastica/lib/Elastica/Exception/Bulk/UdpException.php
D Elastica/lib/Elastica/Exception/BulkException.php
D Elastica/lib/Elastica/Exception/ClientException.php
D Elastica/lib/Elastica/Exception/Connection/GuzzleException.php
D Elastica/lib/Elastica/Exception/Connection/HttpException.php
D Elastica/lib/Elastica/Exception/Connection/ThriftException.php
D Elastica/lib/Elastica/Exception/ConnectionException.php
D Elastica/lib/Elastica/Exception/ElasticsearchException.php
D Elastica/lib/Elastica/Exception/ExceptionInterface.php
D Elastica/lib/Elastica/Exception/InvalidException.php
D Elastica/lib/Elastica/Exception/JSONParseException.php
D Elastica/lib/Elastica/Exception/NotFoundException.php
D Elastica/lib/Elastica/Exception/NotImplementedException.php
D Elastica/lib/Elastica/Exception/PartialShardFailureException.php
D Elastica/lib/Elastica/Exception/ResponseException.php
D Elastica/lib/Elastica/Exception/RuntimeException.php
D Elastica/lib/Elastica/Facet/AbstractFacet.php
D Elastica/lib/Elastica/Facet/DateHistogram.php
D Elastica/lib/Elastica/Facet/Filter.php
D Elastica/lib/Elastica/Facet/GeoCluster.php
D Elastica/lib/Elastica/Facet/GeoDistance.php
D Elastica/lib/Elastica/Facet/Histogram.php
D Elastica/lib/Elastica/Facet/Query.php
D Elastica/lib/Elastica/Facet/Range.php
D Elastica/lib/Elastica/Facet/Statistical.php
D Elastica/lib/Elastica/Facet/Terms.php
D Elastica/lib/Elastica/Facet/TermsStats.php
D Elastica/lib/Elastica/Filter/AbstractFilter.php
D Elastica/lib/Elastica/Filter/AbstractGeoDistance.php
D Elastica/lib/Elastica/Filter/AbstractGeoShape.php
D Elastica/lib/Elastica/Filter/AbstractMulti.php
D Elastica/lib/Elastica/Filter/Bool.php
D Elastica/lib/Elastica/Filter/BoolAnd.php
D Elastica/lib/Elastica/Filter/BoolNot.php
D Elastica/lib/Elastica/Filter/BoolOr.php
D Elastica/lib/Elastica/Filter/Exists.php
D Elastica/lib/Elastica/Filter/GeoBoundingBox.php
D Elastica/lib/Elastica/Filter/GeoDistance.php
D Elastica/lib/Elastica/Filter/GeoDistanceRange.php
D Elastica/lib/Elastica/Filter/GeoPolygon.php
D Elastica/lib/Elastica/Filter/GeoShapePreIndexed.php
D Elastica/lib/Elastica/Filter/GeoShapeProvided.php
D Elastica/lib/Elastica/Filter/GeohashCell.php
D Elastica/lib/Elastica/Filter/HasChild.php
D Elastica/lib/Elastica/Filter/HasParent.php
D Elastica/lib/Elastica/Filter/Ids.php
D Elastica/lib/Elastica/Filter/Indices.php
D Elastica/lib/Elastica/Filter/Limit.php
D

[MediaWiki-commits] [Gerrit] Adds new JS behavior for Sprint Boards - change (phabricator...Sprint)

2014-11-24 Thread Christopher Johnson (WMDE) (Code Review)

Christopher Johnson (WMDE) has submitted this change and it was merged.

Change subject: Adds new JS behavior for Sprint Boards
..


Adds new JS behavior for Sprint Boards

Renamed Burndown Controller to Sprint Controller
Removed Inheritance from PhabricatorProjectController for Board Classes

Change-Id: I5ba5160e66a1bbc2325d4357606cd3e4496caf45
---
A rsrc/behavior-sprint-boards.js
M src/__phutil_library_map__.php
M src/application/SprintApplication.php
M src/celerity/map.php
M src/controller/BurndownDataViewController.php
M src/controller/BurndownListController.php
R src/controller/SprintBoardColumnDetailController.php
R src/controller/SprintBoardColumnEditController.php
R src/controller/SprintBoardColumnHideController.php
A src/controller/SprintBoardController.php
R src/controller/SprintBoardImportController.php
A src/controller/SprintBoardMoveController.php
R src/controller/SprintBoardReorderController.php
R src/controller/SprintBoardViewController.php
R src/controller/SprintController.php
M src/controller/SprintProjectProfileController.php
M src/controller/SprintReportController.php
M src/tests/BurndownControllerTest.php
18 files changed, 531 insertions(+), 53 deletions(-)

Approvals:
  Christopher Johnson (WMDE): Verified; Looks good to me, approved



diff --git a/rsrc/behavior-sprint-boards.js b/rsrc/behavior-sprint-boards.js
new file mode 100644
index 000..3f9697d
--- /dev/null
+++ b/rsrc/behavior-sprint-boards.js
@@ -0,0 +1,275 @@
+/**
+ * @provides javelin-behavior-sprint-boards
+ */
+
+JX.behavior('sprint-boards', function(config) {
+
+function finditems(col) {
+return JX.DOM.scry(col, 'li', 'project-card');
+}
+
+function onupdate(col) {
+var data = JX.Stratcom.getData(col);
+var cards = finditems(col);
+
+// Update the count of tasks in the column header.
+if (!data.countTagNode) {
+data.countTagNode = JX.$(data.countTagID);
+JX.DOM.show(data.countTagNode);
+}
+
+var sum = 0;
+for (var ii = 0; ii  cards.length; ii++) {
+// TODO: Allow this to be computed in some more clever way.
+sum += 1;
+}
+
+// TODO: This is a little bit hacky, but we don't have a PHUIX version 
of
+// this element yet.
+
+var over_limit = (data.pointLimit  (sum  data.pointLimit));
+
+var display_value = sum;
+if (data.pointLimit) {
+display_value = sum + ' / ' + data.pointLimit;
+}
+JX.DOM.setContent(JX.$(data.countTagContentID), display_value);
+
+
+var panel_map = {
+'project-panel-empty': !cards.length,
+'project-panel-over-limit': over_limit
+};
+var panel = JX.DOM.findAbove(col, 'div', 'workpanel');
+for (var k in panel_map) {
+JX.DOM.alterClass(panel, k, !!panel_map[k]);
+}
+
+var color_map = {
+'phui-tag-shade-disabled': (sum === 0),
+'phui-tag-shade-blue': (sum  0  !over_limit),
+'phui-tag-shade-red': (over_limit)
+};
+for (var k in color_map) {
+JX.DOM.alterClass(data.countTagNode, k, !!color_map[k]);
+}
+}
+
+function onresponse(response, item, list) {
+list.unlock();
+JX.DOM.alterClass(item, 'drag-sending', false);
+JX.DOM.replace(item, JX.$H(response.task));
+}
+
+function getcolumns() {
+return JX.DOM.scry(JX.$(config.boardID), 'ul', 'project-column');
+}
+
+function colsort(u, v) {
+var ud = JX.Stratcom.getData(u).sort || [];
+var vd = JX.Stratcom.getData(v).sort || [];
+
+for (var ii = 0; ii  ud.length; ii++) {
+
+if (parseInt(ud[ii])  parseInt(vd[ii])) {
+return 1;
+}
+if (parseInt(ud[ii])  parseInt(vd[ii])) {
+return -1;
+}
+}
+
+return 0;
+}
+
+function getcontainer() {
+return JX.DOM.find(
+JX.$(config.boardID),
+'div',
+'aphront-multi-column-view');
+}
+
+function onbegindrag(item) {
+// If the longest column on the board is taller than the window, the 
board
+// will scroll vertically. Dragging an item to the longest column may
+// make it longer, by the total height of the board, plus the height of
+// the drop target.
+
+// If this happens, the scrollbar will jump around and the scroll 
position
+// can be adjusted in a disorienting way. To reproduce this, drag a 
task
+// to the bottom of the longest column on a scrolling board and wave 
the
+// task in and out of the column. The scroll bar will jump around and
+// it will be hard to lock onto a target.
+
+// To fix this, set the minimum board height to the current board 
height
+// plus the size of the drop

[MediaWiki-commits] [Gerrit] Turn on r::c::ssl::sni locall for varnishes - change (operations/puppet)

2014-11-24 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Turn on r::c::ssl::sni locall for varnishes
..

Turn on r::c::ssl::sni locall for varnishes

This switches the ulsfo caches from r::c::ssl::unified to ::sni
for actual prod traffic flow.  For eqiad/esams, it configures the
::sni -style local nginx service on the cache hosts themselves,
but LVS will still be sending the traffic to the ssl[13]00x
machines at these datacenters instead of the new local ssl
services until further changes are merged.

Change-Id: I24013da78641970733649749b6dd2c5eaf507d8e
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 16 insertions(+), 17 deletions(-)


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

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 734b101..8ecff79 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -556,18 +556,6 @@
 }
 }
 
-class ssl::unified {
-#TODO: kill the old wmf_ca
-include certificates::wmf_ca
-include certificates::wmf_ca_2014_2017
-include role::protoproxy::ssl::common
-
-localssl { 'unified':
-certname = 'unified.wikimedia.org',
-default_server = true,
-}
-}
-
 # ssl::sni To replace ssl::unified above after testing...
 class ssl::sni {
 #TODO: kill the old wmf_ca
@@ -745,6 +733,10 @@
 description = 'text Varnish cache server',
 }
 
+if $::realm == 'production' {
+include role::cache::ssl::sni
+}
+
 require geoip
 require geoip::dev # for VCL compilation using libGeoIP
 
@@ -904,6 +896,10 @@
 
 system::role { 'role::cache::upload':
 description = 'upload Varnish cache server',
+}
+
+if $::realm == 'production' {
+include role::cache::ssl::sni
 }
 
 class { 'lvs::realserver':
@@ -1081,6 +1077,10 @@
 
 class bits inherits role::cache::varnish::1layer {
 
+if $::realm == 'production' {
+include role::cache::ssl::sni
+}
+
 class { 'lvs::realserver':
 realserver_ips = 
$lvs::configuration::lvs_service_ips[$::realm]['bits'][$::site],
 }
@@ -1180,6 +1180,10 @@
 
 class mobile inherits role::cache::varnish::2layer {
 
+if $::realm == 'production' {
+include role::cache::ssl::sni
+}
+
 class { 'lvs::realserver':
 realserver_ips = 
$lvs::configuration::lvs_service_ips[$::realm]['mobile'][$::site],
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 692fb58..c250d6b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -484,7 +484,6 @@
 interface::add_ip6_mapped { 'main': }
 $cluster = 'cache_text'
 include role::cache::text
-include role::cache::ssl::sni
 include role::authdns::testns # test dns stuff too
 }
 
@@ -621,7 +620,6 @@
 
 $cluster = 'cache_bits'
 include role::cache::bits
-include role::cache::ssl::unified
 }
 
 node /^cp40(0[5-7]|1[3-5])\.ulsfo\.wmnet$/ {
@@ -635,7 +633,6 @@
 
 $cluster = 'cache_upload'
 include role::cache::upload
-include role::cache::ssl::unified
 }
 
 node /^cp40(0[89]|1[0678])\.ulsfo\.wmnet$/ {
@@ -649,7 +646,6 @@
 
 $cluster = 'cache_text'
 include role::cache::text
-include role::cache::ssl::unified
 }
 
 node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
@@ -663,7 +659,6 @@
 
 $cluster = 'cache_mobile'
 include role::cache::mobile
-include role::cache::ssl::unified
 }
 
 node 'dataset1001.wikimedia.org' {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24013da78641970733649749b6dd2c5eaf507d8e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Import: Cleanup header by removing LQT magic word and adding... - change (mediawiki...Flow)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Import: Cleanup header by removing LQT magic word and adding 
template
..


Import: Cleanup header by removing LQT magic word and adding template

In support of this, the script user Flow uses (for this and for
ensureFlowRevision) has been made to actually exist.

Change-Id: I45b140358c32196018159cfc0c6cf0d7f16e339a
---
M i18n/en.json
M i18n/qqq.json
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M includes/TalkpageManager.php
M tests/phpunit/Import/TalkpageImportOperationTest.php
6 files changed, 149 insertions(+), 13 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 369a75c..70bb26c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -378,6 +378,7 @@
flow-post-undo-hide: (undo hide),
flow-post-undo-delete: (undo delete),
flow-post-undo-suppress: (undo suppress),
+   flow-importer-lqt-converted-template: LQT page converted to Flow,
apihelp-flow-description: Allows actions to be taken on Flow pages.,
apihelp-flow-param-submodule: The Flow submodule to invoke.,
apihelp-flow-param-page: The page to take the action on.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index cfd195b..1e59ddc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -15,7 +15,7 @@
},
flow-desc: 
{{desc|name=Flow|url=http://www.mediawiki.org/wiki/Extension:Flow}};,
flow-talk-taken-over: Content to replace existing page content by 
for pages that are turned into Flow boards.,
-   flow-talk-username: Username used for the revision added when Flow 
takes over a talk page.,
+   flow-talk-username: Username used for the revision added when Flow 
takes over a talk page.  Avoid changing this unnecessarily, as it will cause a 
new user to be used for future actions.,
log-name-flow: {{doc-logpage}}\nName of the Flow log filter on the 
[[Special:Log]] page.,
logentry-delete-flow-delete-post: Text for a deletion log entry when 
a post was deleted. Parameters:\n* $1 - the user: link to the user page\n* $2 - 
the username. Can be used for GENDER.\n* $3 - the page where the post was 
moderated\n* $4 - permalink URL to the moderated 
post\n{{Related|Flow-logentry}},
logentry-delete-flow-restore-post: Text for a deletion log entry 
when a deleted post was restored. Parameters:\n* $1 - the user: link to the 
user page\n* $2 - the username. Can be used for GENDER.\n* $3 - the page where 
the post was moderated\n* $4 - permalink URL to the moderated 
post\n{{Related|Flow-logentry}},
@@ -382,6 +382,7 @@
flow-post-undo-hide: Automatic moderation summary when undoing a 
hide that was just performed.,
flow-post-undo-delete: Automatic moderation summary when undoing a 
delete that was just performed.,
flow-post-undo-suppress: Automatic moderation summary when undoing a 
suppress that was just performed.,
+   flow-importer-lqt-converted-template: Name of a wikitext template 
that is added to the header of Flow boards that were converted from 
LiquidThreads,
apihelp-flow-description: {{doc-apihelp-description|flow}},
apihelp-flow-param-submodule: {{doc-apihelp-param|flow|submodule}},
apihelp-flow-param-page: {{doc-apihelp-param|flow|page}},
diff --git a/includes/Import/LiquidThreadsApi/Objects.php 
b/includes/Import/LiquidThreadsApi/Objects.php
index 734b1a7..3554604 100644
--- a/includes/Import/LiquidThreadsApi/Objects.php
+++ b/includes/Import/LiquidThreadsApi/Objects.php
@@ -3,6 +3,8 @@
 namespace Flow\Import\LiquidThreadsApi;
 
 use ArrayIterator;
+use DateTime;
+use DateTimeZone;
 use Flow\Import\IImportHeader;
 use Flow\Import\IImportObject;
 use Flow\Import\IImportPost;
@@ -12,6 +14,8 @@
 use Flow\Import\IObjectRevision;
 use Flow\Import\IRevisionableObject;
 use Iterator;
+use Title;
+use User;
 
 abstract class PageRevisionedObject implements IRevisionableObject {
/** @var int **/
@@ -227,6 +231,55 @@
}
 }
 
+// Represents a revision the script makes on its own behalf, using a script 
user
+class ScriptedImportRevision implements IObjectRevision {
+   /** @var IImportObject **/
+   protected $parentObject;
+
+   /** @var User */
+   protected $destinationScriptUser;
+
+   /** @var string */
+   protected $revisionText;
+
+   /** @var string */
+   protected $timestamp;
+
+   /**
+* Creates a ScriptedImportRevision with the current timestamp, given a 
script user
+* and arbitrary text.
+*
+* @param IImportObject $parentObject Object this is a revision of
+* @parma User $destinationScriptUser User that performed this scripted 
edit
+* @param string $revisionText Text of revision
+*/
+   function __construct( IImportObject

[MediaWiki-commits] [Gerrit] Fix checkstyle and compilation. - change (apps...wikipedia)

2014-11-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix checkstyle and compilation.
..


Fix checkstyle and compilation.

- The search_w icon was still being referenced in one place.
- Another checkstyle error that got through.

Change-Id: Ie77f827316da4ae52efae7faaa37067eb5728815
---
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
2 files changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java 
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index de0835d..9cfb4a5 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -527,10 +527,6 @@
 }
 currentTheme = newTheme;
 prefs.edit().putInt(PrefKeys.getColorTheme(), currentTheme).apply();
-
-//update color filter for logo icon (used in ActionBar activities)...
-adjustDrawableToTheme(getResources().getDrawable(R.drawable.search_w));
-
 bus.post(new ThemeChangeEvent());
 }
 
diff --git 
a/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java 
b/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
index 63ffc4b..bb5a25f 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
@@ -9,7 +9,7 @@
 /**
  * Utility to add more entries to our shared WikidataCache.
  */
-public class WikidataDescriptionFeeder {
+public final class WikidataDescriptionFeeder {
 // do not instantiate!
 private WikidataDescriptionFeeder() {
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie77f827316da4ae52efae7faaa37067eb5728815
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

1 2 3 4 5 >

1 - 100 of 431 matches

Mail list logo