[MediaWiki-commits] [Gerrit] getMWVersion.php prints its result, don't print it here too - change (operations/mediawiki-config)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: getMWVersion.php prints its result, don't print it here too
..

getMWVersion.php prints its result, don't print it here too

Change-Id: Ie5e46a9feb6437088d1d425fea68950630d59b7a
---
M multiversion/getMWVersion
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/multiversion/getMWVersion b/multiversion/getMWVersion
index 1eefb30..2f73e3b 100755
--- a/multiversion/getMWVersion
+++ b/multiversion/getMWVersion
@@ -2,4 +2,4 @@
 https://gerrit.wikimedia.org/r/110672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] [SYNC] Synchronize with core - change (pywikibot/compat)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: [SYNC] Synchronize with core
..

[SYNC] Synchronize with core

* [BUGFIX] change site.lang to site.code [1]
* allow empty translations [2]

[1]
The i18n files use WMF language codes instead of ISO 639 language
codes. This means we also have to use these in our translations.

e.g. site code of the Alemannic wikipedia is 'als' whereas the
language code is 'gsw'. The i18n files use 'als', while we now
try to lookup 'gsw', which does not exist.

[2]
Check for 'trans is None' (= no translation found) instead of
for 'not trans' (= no translation found, or empty translation)

Can be relevant for empty configuration variables.

Change-Id: I519eae0c7c87d790c99c0c21658f87aa98409191
---
M pywikibot/i18n.py
1 file changed, 17 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/71/110671/1

diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 8ae944c..b62655d 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8  -*-
-""" Various i18n functions, both for the internal translation system
-and for TranslateWiki-based translations
+"""
+Various i18n functions, both for the internal translation system
+and for TranslateWiki-based translations
 """
 #
-# (C) Pywikipedia bot team, 2004-2013
+# (C) Pywikibot team, 2004-2014
 #
 # Distributed under the terms of the MIT license.
 #
@@ -257,9 +258,9 @@
 
 family = pywikibot.default_family
 # If a site is given instead of a code, use its language
-if hasattr(code, 'lang'):
+if hasattr(code, 'code'):
 family = code.family.name
-code = code.lang
+code = code.code
 
 # Check whether xdict has multiple projects
 if type(xdict) == dict:
@@ -337,8 +338,8 @@
 
 code_needed = False
 # If a site is given instead of a code, use its language
-if hasattr(code, 'lang'):
-lang = code.lang
+if hasattr(code, 'code'):
+lang = code.code
 # check whether we need the language code back
 elif type(code) == list:
 lang = code.pop()
@@ -363,7 +364,7 @@
 break
 except KeyError:
 continue
-if not trans:
+if trans is None:
 raise TranslationError("No English translation has been defined "
"for TranslateWiki key %r" % twtitle)
 # send the language code back via the given list
@@ -419,11 +420,11 @@
 >>> i18n.twntranslate('en', 'test-changing', {'num':2})
 Bot: Changing 2 pages.
 #use additional format strings
->>> i18n.twntranslate('fr', 'test-changing', {'num':1, 
'descr':'seulement'})
-Bot: Changer seulement une pages.
+>>> i18n.twntranslate('fr', 'test-changing', {'num': 1, 'descr': 
'seulement'})
+Robot: Changer seulement une pages.
 #use format strings also outside
->>> i18n.twntranslate('fr', 'test-changing', 0) % {'descr':'seulement'}
-Bot: Changer seulement un peu pages.
+>>> i18n.twntranslate('fr', 'test-changing', 10) % {'descr': 'seulement'}
+Robot: Changer seulement un peu pages.
 
 The translations are retrieved from i18n., based on the callers
 import table.
@@ -433,8 +434,8 @@
 if type(parameters) == dict:
 param = parameters
 # If a site is given instead of a code, use its language
-if hasattr(code, 'lang'):
-code = code.lang
+if hasattr(code, 'code'):
+code = code.code
 # we send the code via list and get the alternate code back
 code = [code]
 trans = twtranslate(code, twtitle, None)
@@ -492,8 +493,8 @@
 package = twtitle.split("-")[0]
 transdict = getattr(__import__("i18n", {}, {}, [package]), package).msg
 # If a site is given instead of a code, use its language
-if hasattr(code, 'lang'):
-code = code.lang
+if hasattr(code, 'code'):
+code = code.code
 return code in transdict and twtitle in transdict[code]
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I519eae0c7c87d790c99c0c21658f87aa98409191
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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

[MediaWiki-commits] [Gerrit] Fix for docstring - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: Fix for docstring
..

Fix for docstring

Change-Id: Ibfae093d8f209565f4f0b2afe9515add8e9c4394
---
M pywikibot/i18n.py
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/70/110670/1

diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 40835c0..4c9af6a 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -418,11 +418,11 @@
 >>> i18n.twntranslate('en', 'test-changing', {'num':2})
 Bot: Changing 2 pages.
 #use additional format strings
->>> i18n.twntranslate('fr', 'test-changing', {'num':1, 
'descr':'seulement'})
-Bot: Changer seulement une pages.
+>>> i18n.twntranslate('fr', 'test-changing', {'num': 1, 'descr': 
'seulement'})
+Robot: Changer seulement une pages.
 #use format strings also outside
->>> i18n.twntranslate('fr', 'test-changing', 0) % {'descr':'seulement'}
-Bot: Changer seulement un peu pages.
+>>> i18n.twntranslate('fr', 'test-changing', 10) % {'descr': 'seulement'}
+Robot: Changer seulement un peu pages.
 
 The translations are retrieved from i18n., based on the callers
 import table.

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

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

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

[MediaWiki-commits] [Gerrit] Handle the change with netmapper and varnish 3.0.4 & later - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Handle the change with netmapper and varnish 3.0.4 & later
..


Handle the change with netmapper and varnish 3.0.4 & later

Varnish has changed the way they handle the result of the vmod
function calls: after 3.0.4, a vmod function that returns null is
automatically changed to return an empty string.

This has also been verified by by Brandon, who found this related bug
https://www.varnish-cache.org/trac/ticket/1218

Now, with the future migration to 3.0.5 and beyond, netmapper will
always sets the resulting header as "", not NULL, and
if(response) will always be true.

We could obviously change all the other code to check for =="",
but I think keeping implicit bool-ness of headers is cleaner.

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

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



diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index d3f749d..a8e4a72 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -13,6 +13,11 @@
//  via HTTPS (check for X-Forwarded-Proto at the top of vcl_recv in 
mobile-frontend.vcl).
 
set req.http.X-Forwarded-By = netmapper.map("proxies", "" + client.ip);
+   // netmapper returns an empty string when not found, not NULL,
+   // need to normalize before using implicit bool cast
+   if (req.http.X-Forwarded-By == "") {
+   unset req.http.X-Forwarded-By;
+   }
 
if (!req.http.X-Forwarded-By) {
// direct request or unknown proxy
@@ -41,6 +46,11 @@
unset req.http.X-Stripped-XFF; // clean up our temp var
}
 
+   // Normalize X-CS2 to be used as bool
+   if (req.http.X-CS2 == "") {
+   unset req.http.X-CS2;
+   }
+
if ( req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\." ) {
set req.http.X-Subdomain = "ZERO";
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cd4518df540467b84a6ea4e5c246623a0768024
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dr0ptp4kt 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] TimeStripper, tzoneFixedOffset are now in pywikibot.textlib - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: TimeStripper, tzoneFixedOffset are now in pywikibot.textlib
..


TimeStripper, tzoneFixedOffset are now in pywikibot.textlib

This should solve the deadlocks during tests. This was caused by the

Site = pywikibot.Site()

in the import scope of archivebot.py. Calling Site() causes network
communication, which causes deadlocks if this happens during test
loading. During test execution is OK (obviously)

Change-Id: I11d74247613bb16974c883b192e5fc8f90ffd6e5
---
M pywikibot/textlib.py
M scripts/archivebot.py
M tests/timestripper_tests.py
3 files changed, 140 insertions(+), 134 deletions(-)

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



diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index cbaa951..5f1650a 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -19,6 +19,7 @@
 except ImportError:
 mwparserfromhell = False
 import pywikibot
+import datetime
 import re
 try:
 from HTMLParser import HTMLParser
@@ -1106,3 +1107,140 @@
 """Determines whether the page text contains the given section title."""
 m = re.search("=+[ ']*%s[ ']*=+" % section, pagetext)
 return bool(m)
+
+
+#-
+# Time parsing functionality (Archivebot)
+#-
+
+class tzoneFixedOffset(datetime.tzinfo):
+"""
+Class building tzinfo objects for fixed-offset time zones
+
+@offset: a number indicating fixed offset in minutes east from UTC
+@name: a string with name of the timezone"""
+
+def __init__(self, offset, name):
+self.__offset = datetime.timedelta(minutes=offset)
+self.__name = name
+
+def utcoffset(self, dt):
+return self.__offset
+
+def tzname(self, dt):
+return self.__name
+
+def dst(self, dt):
+return ZERO
+
+def __repr__(self):
+return "%s(%s, %s)" % (
+self.__class__.__name__,
+self.__offset.days * 86400 + self.__offset.seconds,
+self.__name
+)
+
+
+class TimeStripper(object):
+"""
+Find timetstamp in page text and returns it as timezone aware datetime 
object
+"""
+
+def __init__(self, site=None):
+if site is None:
+self.site = pywikibot.getSite()
+else:
+self.site = site
+
+self.origNames2monthNum = {}
+for n, (_long, _short) in enumerate(self.site.months_names):
+self.origNames2monthNum[_long] = n + 1
+self.origNames2monthNum[_short] = n + 1
+
+self.groups = [u'year', u'month',  u'hour',  u'time', u'day', 
u'minute', u'tzinfo']
+
+timeR = r'(?P(?P[0-2]\d)[:\.h](?P[0-5]\d))'
+timeznR = r'\((?P[A-Z]+)\)'
+yearR = r'(?P(19|20)\d\d)'
+monthR = ur'(?P(%s))' % (u'|'.join(self.origNames2monthNum))
+dayR = r'(?P(3[01]|[12]\d|0?[1-9]))'
+
+self.ptimeR = re.compile(timeR)
+self.timeznR = re.compile(timeznR)
+self.yearR = re.compile(yearR)
+self.pmonthR = re.compile(monthR, re.U)
+self.pdayR = re.compile(dayR)
+
+#order is important to avoid mismatch when searching
+self.patterns = [
+self.ptimeR,
+self.timeznR,
+self.yearR,
+self.pmonthR,
+self.pdayR,
+]
+
+def findmarker(self, text, base=u'@@', delta='@'):
+# find a string which is not part of text
+while base in text:
+base += delta
+return base
+
+def last_match_and_replace(self, txt, pat):
+"""
+Take the rightmost match, to prevent spurious earlier matches, and 
replace with marker
+"""
+m = None
+for m in pat.finditer(txt):
+pass
+
+if m:
+marker = self.findmarker(txt)
+txt = pat.sub(marker, txt)
+return (txt, m.groupdict())
+else:
+return (txt, None)
+
+def timestripper(self, line):
+"""
+Find timestamp in line and convert it to time zone aware datetime.
+All the following items must be matched, otherwise None is returned:
+-. year, month, hour, time, day, minute, tzinfo
+
+"""
+_line = line
+#match date fields
+dateDict = dict()
+for pat in self.patterns:
+line, matchDict = self.last_match_and_replace(line, pat)
+if matchDict:
+dateDict.update(matchDict)
+
+#all fields matched -> date valid
+if all(g in dateDict for g in self.groups):
+#remove 'time' key, now splitted in hour/minute and not needed by 
datetime
+del dateDict['time']
+
+#replace month name in original language with month number
+try:
+dateDict['month'] = self.origNames2monthNum[dateDict['month']]
+except Key

[MediaWiki-commits] [Gerrit] (Bug 55424) Add a link to nuke a user from Special:Contribut... - change (mediawiki...Nuke)

[Isarra (Code Review)]

Isarra has uploaded a new change for review.

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

Change subject: (Bug 55424) Add a link to nuke a user from Special:Contributions
..

(Bug 55424) Add a link to nuke a user from Special:Contributions

Change-Id: I1bb2907db948b8e26cfa2532a38b1e25f2dda1fc
---
A Nuke.hooks.php
M Nuke.i18n.php
M Nuke.php
3 files changed, 44 insertions(+), 9 deletions(-)


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

diff --git a/Nuke.hooks.php b/Nuke.hooks.php
new file mode 100755
index 000..2f08b01
--- /dev/null
+++ b/Nuke.hooks.php
@@ -0,0 +1,27 @@
+isAllowed( 'nuke' ) && $id ) {
+   $links[] = Linker::link(
+   SpecialPage::getTitleFor( 'Nuke' ),
+   wfMessage( 'nuke-linkoncontribs' )->escaped(),
+   array( 'title' => wfMessage( 
'nuke-linkoncontribs-text' )->parse() ),
+   array( 'target' => $nt->getPartialUrl() )
+   );
+   }
+   return true;
+   }
+}
diff --git a/Nuke.i18n.php b/Nuke.i18n.php
old mode 100644
new mode 100755
index 60a5ca3..3f8e0ad
--- a/Nuke.i18n.php
+++ b/Nuke.i18n.php
@@ -40,6 +40,8 @@
'nuke-nopages-global' => 'There are no new pages in 
[[Special:RecentChanges|recent changes]].',
'nuke-viewchanges' => 'view changes',
'nuke-namespace' => 'Limit to namespace:',
+   'nuke-linkoncontribs' => 'mass delete',
+   'nuke-linkoncontribs-text' => "Mass delete this user's created pages",
 );
 
 /** Message documentation (Message documentation)
@@ -56,7 +58,7 @@
  */
 $messages['qqq'] = array(
'nuke' => '{{doc-special|Nuke}}
-The Nuke extension allows for sysops to delete a large number of pages ("Mass 
delete"). 
+The Nuke extension allows for sysops to delete a large number of pages ("Mass 
delete").
 For more information, see http://www.mediawiki.org/wiki/Extension:Nuke',
'action-nuke' => '{{doc-action|nuke}}',
'nuke-desc' => 
'{{desc|name=Nuke|url=http://www.mediawiki.org/wiki/Extension:Nuke}}
@@ -92,7 +94,7 @@
'nuke-submit-delete' => 'Submit button to delete the selected pages.',
'right-nuke' => '{{doc-right|nuke}}',
'nuke-select' => 'Parameters:
-* $1 - two links: {{msg-mw|Powersearch-toggleall}} and 
{{msg-mw|Powersearch-togglenone}} which respectively selects all pages and 
de-selects all 
+* $1 - two links: {{msg-mw|Powersearch-toggleall}} and 
{{msg-mw|Powersearch-togglenone}} which respectively selects all pages and 
de-selects all
 pages
 {{Identical|Select}}',
'nuke-userorip' => 'Used as label for "target" input box.',
@@ -124,6 +126,9 @@
 * or empty string (if username is empty).
 {{Identical|View changes}}',
'nuke-namespace' => 'Label shown on [[Special:Nuke]] in front of the 
namespace input that allows choosing a namespace to filter the search by',
+   'nuke-linkoncontribs' => 'Link description used on 
[[Special:Contributions]] and [[Special:DeletedContributions]]. Only added if a 
user has rights to nuke pages.
+{{Identical|nuke}}',
+   'nuke-linkoncontribs-text' => "Tooltip for 
{{msg-mw|nuke-linkoncontribs}}.",
 );
 
 /** Afrikaans (Afrikaans)
@@ -416,7 +421,7 @@
 Lakait un notenn ha klikit war ar bouton evit o diverkañ.',
'nuke-defaultreason' => 'Diverkañ a-vras ar pajennoù bet ouzhpennet 
gant $1', # Fuzzy
'nuke-multiplepeople' => 'Diverkañ a-vras ar pajennoù nevez-ouzhpennet',
-   'nuke-tools' => "Talvezout a ra an ostilh-mañ da ziverkañ a-vras 
pajennoù bet ouzhpennet nevez zo gant un implijer enrollet pe gant ur chomlec'h 
IP. 
+   'nuke-tools' => "Talvezout a ra an ostilh-mañ da ziverkañ a-vras 
pajennoù bet ouzhpennet nevez zo gant un implijer enrollet pe gant ur chomlec'h 
IP.
 Merkañ ar c'homlec'h IP pe anv an implijer evit kaout roll ar pajennoù da 
ziverkañ, pe lezel gwenn evit an holl implijerien.",
'nuke-submit-user' => 'Mont',
'nuke-submit-delete' => 'Dilemel ar re diuzet',
@@ -446,7 +451,7 @@
 stavite ih u komentar i pritisnite dugme za njihovo brisanje.',
'nuke-defaultreason' => 'Masovno uklanjanje stranica koje je dodao $1', 
# Fuzzy
'nuke-multiplepeople' => 'više korisnika', # Fuzzy
-   'nuke-tools' => 'Ovaj alat omogućuje masovno brisanje stranica koje je 
nedavno dodao određeni korisnik ili IP adresa. 
+   'nuke-tools' => 'Ovaj alat omogućuje masovno brisanje stranica koje je 
nedavno dodao određeni korisnik ili IP adresa.
 Unesite korisničko ime ili IP adresu za izlistavanje stranica koje se brišu 
ili ostavite prazno za prikaz svih korisnika.',
'nuke-submit-user' => 'Idi',
'nuke-submit-delete' => 'Obriši označeno',
@@ -939,7 +944,7 @@
'nuke-desc' => 'Donne la possibilité aux administrateurs de 
[[Special:Nuke|supprimer en masse]] des pages',

[MediaWiki-commits] [Gerrit] Remove deprecated wgCopyrightIcon in favor of wgFooterIcons - change (operations/mediawiki-config)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Remove deprecated wgCopyrightIcon in favor of wgFooterIcons
..

Remove deprecated wgCopyrightIcon in favor of wgFooterIcons

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index dec5ba9..4de5af0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -846,7 +846,7 @@
 
 $wgUseHashTable = true;
 
-$wgCopyrightIcon = '';
+$wgFooterIcons['copyright']['copyright'] = '';
 
 # For Special:Cite, we only want it on wikipedia (but can't count on $site),
 # not on these fakers.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I962b6e2f93faf0e90c6c86c22c83e86630f93495
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] fix pep8 error in tests - change (analytics/wikimetrics)

[Milimetric (Code Review)]

Milimetric has submitted this change and it was merged.

Change subject: fix pep8 error in tests
..


fix pep8 error in tests

tests/test_metrics/test_revert_rate.py was missing some blank lines.

Change-Id: Ib110d5a01667d0b89f0dab211948338a0085529d
---
M tests/test_metrics/test_revert_rate.py
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/tests/test_metrics/test_revert_rate.py 
b/tests/test_metrics/test_revert_rate.py
index b0f22aa..6efec01 100644
--- a/tests/test_metrics/test_revert_rate.py
+++ b/tests/test_metrics/test_revert_rate.py
@@ -4,6 +4,7 @@
 from wikimetrics.metrics import RevertRate, TimeseriesChoices
 from wikimetrics.models import Cohort, MetricReport
 
+
 class RevertRateTest(DatabaseTest):
 
 def setUp(self):
@@ -20,6 +21,7 @@
 [2, 4, 5],  # User B reverts user A's edit #3 back to edit #2.
 ],
 )
+
 @nottest
 def test_single_revert(self):
 metric = RevertRate(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib110d5a01667d0b89f0dab211948338a0085529d
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] mediawiki.notification: Return the Notification object from ... - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: mediawiki.notification: Return the Notification object from 
.notify calls
..

mediawiki.notification: Return the Notification object from .notify calls

The implementation is solid, stable and already includes sanity checks
that make it difficult to shoot oneself in the foot.

This essentially makes the class no longer private; adjusted
documentation accordingly.

Bug: 57400
Change-Id: Icecc75e05a1f9a46e8de984c401a0292817d0d4c
---
M maintenance/jsduck/categories.json
M resources/mediawiki/mediawiki.notification.js
2 files changed, 10 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/110667/1

diff --git a/maintenance/jsduck/categories.json 
b/maintenance/jsduck/categories.json
index bbe1860..60f4e08 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -25,6 +25,7 @@
"mw.inspect",
"mw.inspect.reports",
"mw.notification",
+   "mw.Notification_",
"mw.user",
"mw.util",
"mw.plugin.*"
diff --git a/resources/mediawiki/mediawiki.notification.js 
b/resources/mediawiki/mediawiki.notification.js
index 4ede809..9da037b 100644
--- a/resources/mediawiki/mediawiki.notification.js
+++ b/resources/mediawiki/mediawiki.notification.js
@@ -8,17 +8,17 @@
preReadyNotifQueue = [];
 
/**
-* Creates a Notification object for 1 message.
-* Does not insert anything into the document (see #start).
+* A Notification object for 1 message.
 *
-* The "_" in the name is to avoid a bug 
(http://github.com/senchalabs/jsduck/issues/304)
+* The "_" in the name is to avoid a bug 
(http://github.com/senchalabs/jsduck/issues/304).
 * It is not part of the actual class name.
 *
 * @class mw.Notification_
 * @alternateClassName mw.Notification
-* @private
 *
-* @constructor
+* @constructor The constructor is not globally accessible; use 
mw.notification.notify instead.
+*  This does not insert anything into the document (see #start).
+* @private
 */
function Notification( message, options ) {
var $notification, $notificationTitle, $notificationContent;
@@ -255,7 +255,6 @@
 * Close/hide the notification.
 *
 * @param {Object} options An object containing options for the closing 
of the notification.
-*  These are typically only used internally.
 *
 *  - speed: Use a close speed different than the default 'slow'.
 *  - placeholder: Set to false to disable the placeholder transition.
@@ -332,6 +331,7 @@
 * Helper function, take a list of notification divs and call
 * a function on the Notification instance attached to them.
 *
+* @private
 * @param {jQuery} $notifications A jQuery object containing 
notification divs
 * @param {string} fn The name of the function to call on the 
Notification instance
 */
@@ -426,7 +426,7 @@
 * @param {HTMLElement|jQuery|mw.Message|string} message
 * @param {Object} options The options to use for the 
notification.
 *  See #defaults for details.
-* @return {Object} Object with a close function to close the 
notification
+* @return {mw.Notification} Notification object
 */
notify: function ( message, options ) {
var notif;
@@ -439,7 +439,8 @@
} else {
preReadyNotifQueue.push( notif );
}
-   return { close: $.proxy( notif.close, notif ) };
+
+   return notif;
},
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icecc75e05a1f9a46e8de984c401a0292817d0d4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Move toctoggle from mediawiki.util.js to separate file media... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Move toctoggle from mediawiki.util.js to separate file 
mediawiki.toc.js
..


Move toctoggle from mediawiki.util.js to separate file mediawiki.toc.js

* New file mediawiki.toc.js without global function.
* Keep minimal function mediaWiki.util.toggleToc() for compatibility.
* Mark mediaWiki.util.toggleToc() as deprecated.
* Adapt mediawiki.util.test.js.
* Add new file mediawiki.toc.test.js.
* Solves bug 60030 and allow multiple toc.

Bug: 60030
Change-Id: I3ca2acb70db98d00e3f1bd2227091bd32d8e18a5
---
M resources/Resources.php
A resources/mediawiki/mediawiki.toc.js
M resources/mediawiki/mediawiki.util.js
M tests/qunit/QUnitTestResources.php
A tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
6 files changed, 122 insertions(+), 53 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index 2f8f662..ff7e916 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -801,6 +801,14 @@
),
'targets' => array( 'desktop', 'mobile' ),
),
+   'mediawiki.toc' => array(
+   'scripts' => 'resources/mediawiki/mediawiki.toc.js',
+   'dependencies' => array(
+   'jquery.cookie',
+   ),
+   'messages' => array( 'showtoc', 'hidetoc' ),
+   'targets' => array( 'desktop', 'mobile' ),
+   ),
'mediawiki.Uri' => array(
'scripts' => 'resources/mediawiki/mediawiki.Uri.js',
'targets' => array( 'desktop', 'mobile' ),
@@ -819,11 +827,10 @@
'scripts' => 'resources/mediawiki/mediawiki.util.js',
'dependencies' => array(
'jquery.client',
-   'jquery.cookie',
'jquery.mwExtension',
'mediawiki.notify',
+   'mediawiki.toc',
),
-   'messages' => array( 'showtoc', 'hidetoc' ),
'position' => 'top', // For $wgPreloadJavaScriptMwUtil
'targets' => array( 'desktop', 'mobile' ),
),
diff --git a/resources/mediawiki/mediawiki.toc.js 
b/resources/mediawiki/mediawiki.toc.js
new file mode 100644
index 000..3279900
--- /dev/null
+++ b/resources/mediawiki/mediawiki.toc.js
@@ -0,0 +1,64 @@
+( function ( mw, $ ) {
+   'use strict';
+
+   // Table of contents toggle
+   mw.hook( 'wikipage.content' ).add( function ( $content ) {
+
+   /**
+* Hide/show the table of contents element
+*
+* @param {jQuery} $toggleLink A jQuery object of the toggle 
link.
+*/
+   function toggleToc( $toggleLink ) {
+   var $tocList = $content.find( '#toc ul:first' );
+
+   // This function shouldn't be called if there's no TOC,
+   // but just in case...
+   if ( $tocList.length ) {
+   if ( $tocList.is( ':hidden' ) ) {
+   $tocList.slideDown( 'fast' );
+   $toggleLink.text( mw.msg( 'hidetoc' ) );
+   $content.find( '#toc' ).removeClass( 
'tochidden' );
+   $.cookie( 'mw_hidetoc', null, {
+   expires: 30,
+   path: '/'
+   } );
+   } else {
+   $tocList.slideUp( 'fast' );
+   $toggleLink.text( mw.msg( 'showtoc' ) );
+   $content.find( '#toc' ).addClass( 
'tochidden' );
+   $.cookie( 'mw_hidetoc', '1', {
+   expires: 30,
+   path: '/'
+   } );
+   }
+   }
+   }
+
+   var $tocTitle, $tocToggleLink, hideTocCookie;
+   $tocTitle = $content.find( '#toctitle' );
+   $tocToggleLink = $content.find( '#togglelink' );
+   // Only add it if there is a TOC and there is no toggle added 
already
+   if ( $content.find( '#toc' ).length && $tocTitle.length && 
!$tocToggleLink.length ) {
+   hideTocCookie = $.cookie( 'mw_hidetoc' );
+   $tocToggleLink = $( '' )
+   .text( mw.msg( 'hidetoc' ) )
+   .click( function ( e ) {
+

[MediaWiki-commits] [Gerrit] gdash: add weekly graphs for frontend & ve dashboards - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: gdash: add weekly graphs for frontend & ve dashboards
..


gdash: add weekly graphs for frontend & ve dashboards

Change-Id: If8d67f2e241073dcecf34fae648622c30a8274c1
---
R files/gdash/dashboards/frontend/10.mediaWikiLoadComplete.mobile.hour.graph
R files/gdash/dashboards/frontend/11.mediaWikiLoadComplete.mobile.day.graph
A files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph
A files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph
R files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.hour.graph
R files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.day.graph
A files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph
R files/gdash/dashboards/frontend/7.totalPageLoadTime.mobile.hour.graph
R files/gdash/dashboards/frontend/8.totalPageLoadTime.mobile.day.graph
A files/gdash/dashboards/frontend/9.totalPageLoadTime.mobile.week.graph
A files/gdash/dashboards/ve/2.activation.week.graph
R files/gdash/dashboards/ve/3.saveComplete.day.graph
A files/gdash/dashboards/ve/4.saveComplete.week.graph
13 files changed, 84 insertions(+), 0 deletions(-)

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



diff --git 
a/files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.mobile.hour.graph 
b/files/gdash/dashboards/frontend/10.mediaWikiLoadComplete.mobile.hour.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.mobile.hour.graph
rename to 
files/gdash/dashboards/frontend/10.mediaWikiLoadComplete.mobile.hour.graph
diff --git 
a/files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.mobile.day.graph 
b/files/gdash/dashboards/frontend/11.mediaWikiLoadComplete.mobile.day.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.mobile.day.graph
rename to 
files/gdash/dashboards/frontend/11.mediaWikiLoadComplete.mobile.day.graph
diff --git 
a/files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph 
b/files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph
new file mode 100644
index 000..a68aece
--- /dev/null
+++ b/files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph
@@ -0,0 +1,14 @@
+title 'mediaWikiLoadStart to document.onload on mobile sites, last week'
+linewidth 1
+linemode 'connected'
+hide_legend 'false'
+from '-1week'
+vtitle 'milliseconds'
+
+field :q2, :color => 'blue',
+   :alias => 'Median',
+   :data  => 
'frontend.navtiming.mediaWikiLoadComplete.mobile.overall.median'
+
+field :q3, :color => 'red',
+   :alias => '75th percentile',
+   :data  => 
'frontend.navtiming.mediaWikiLoadComplete.mobile.overall.75percentile'
diff --git 
a/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph 
b/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph
new file mode 100644
index 000..3c51647
--- /dev/null
+++ b/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph
@@ -0,0 +1,14 @@
+title 'navigationStart to loadEventEnd on desktop sites, last week'
+linewidth 1
+linemode 'connected'
+hide_legend 'false'
+from '-1week'
+vtitle 'milliseconds'
+
+field :q2, :color => 'blue',
+   :alias => 'Median',
+   :data  => 
'frontend.navtiming.totalPageLoadTime.desktop.overall.median'
+
+field :q3, :color => 'red',
+   :alias => '75th percentile',
+   :data  => 
'frontend.navtiming.totalPageLoadTime.desktop.overall.75percentile'
diff --git 
a/files/gdash/dashboards/frontend/3.mediaWikiLoadComplete.desktop.hour.graph 
b/files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.hour.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/3.mediaWikiLoadComplete.desktop.hour.graph
rename to 
files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.hour.graph
diff --git 
a/files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.day.graph 
b/files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.day.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.day.graph
rename to 
files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.day.graph
diff --git 
a/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph 
b/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph
new file mode 100644
index 000..f556de5
--- /dev/null
+++ b/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph
@@ -0,0 +1,14 @@
+title 'mediaWikiLoadStart to document.onload on desktop sites, last week'
+linewidth 1
+linemode 'connected'
+hide_legend 'false'
+from '-1week'
+vtitle 'milliseconds'
+
+field :q2, :color => 'blue',
+   :alias => 'Median',
+   :data  => 
'frontend.navtiming.mediaWikiLoadComplete.desktop

[MediaWiki-commits] [Gerrit] gdash: add weekly graphs for frontend & ve dashboards - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: gdash: add weekly graphs for frontend & ve dashboards
..

gdash: add weekly graphs for frontend & ve dashboards

Change-Id: If8d67f2e241073dcecf34fae648622c30a8274c1
---
R files/gdash/dashboards/frontend/10.mediaWikiLoadComplete.mobile.hour.graph
R files/gdash/dashboards/frontend/11.mediaWikiLoadComplete.mobile.day.graph
A files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph
A files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph
R files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.hour.graph
R files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.day.graph
A files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph
R files/gdash/dashboards/frontend/7.totalPageLoadTime.mobile.hour.graph
R files/gdash/dashboards/frontend/8.totalPageLoadTime.mobile.day.graph
A files/gdash/dashboards/frontend/9.totalPageLoadTime.mobile.week.graph
A files/gdash/dashboards/ve/2.activation.week.graph
R files/gdash/dashboards/ve/3.saveComplete.day.graph
A files/gdash/dashboards/ve/4.saveComplete.week.graph
13 files changed, 84 insertions(+), 0 deletions(-)


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

diff --git 
a/files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.mobile.hour.graph 
b/files/gdash/dashboards/frontend/10.mediaWikiLoadComplete.mobile.hour.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.mobile.hour.graph
rename to 
files/gdash/dashboards/frontend/10.mediaWikiLoadComplete.mobile.hour.graph
diff --git 
a/files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.mobile.day.graph 
b/files/gdash/dashboards/frontend/11.mediaWikiLoadComplete.mobile.day.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.mobile.day.graph
rename to 
files/gdash/dashboards/frontend/11.mediaWikiLoadComplete.mobile.day.graph
diff --git 
a/files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph 
b/files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph
new file mode 100644
index 000..a68aece
--- /dev/null
+++ b/files/gdash/dashboards/frontend/12.mediaWikiLoadComplete.mobile.week.graph
@@ -0,0 +1,14 @@
+title 'mediaWikiLoadStart to document.onload on mobile sites, last week'
+linewidth 1
+linemode 'connected'
+hide_legend 'false'
+from '-1week'
+vtitle 'milliseconds'
+
+field :q2, :color => 'blue',
+   :alias => 'Median',
+   :data  => 
'frontend.navtiming.mediaWikiLoadComplete.mobile.overall.median'
+
+field :q3, :color => 'red',
+   :alias => '75th percentile',
+   :data  => 
'frontend.navtiming.mediaWikiLoadComplete.mobile.overall.75percentile'
diff --git 
a/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph 
b/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph
new file mode 100644
index 000..3c51647
--- /dev/null
+++ b/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph
@@ -0,0 +1,14 @@
+title 'navigationStart to loadEventEnd on desktop sites, last week'
+linewidth 1
+linemode 'connected'
+hide_legend 'false'
+from '-1week'
+vtitle 'milliseconds'
+
+field :q2, :color => 'blue',
+   :alias => 'Median',
+   :data  => 
'frontend.navtiming.totalPageLoadTime.desktop.overall.median'
+
+field :q3, :color => 'red',
+   :alias => '75th percentile',
+   :data  => 
'frontend.navtiming.totalPageLoadTime.desktop.overall.75percentile'
diff --git 
a/files/gdash/dashboards/frontend/3.mediaWikiLoadComplete.desktop.hour.graph 
b/files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.hour.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/3.mediaWikiLoadComplete.desktop.hour.graph
rename to 
files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.hour.graph
diff --git 
a/files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.day.graph 
b/files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.day.graph
similarity index 100%
rename from 
files/gdash/dashboards/frontend/4.mediaWikiLoadComplete.desktop.day.graph
rename to 
files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.day.graph
diff --git 
a/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph 
b/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph
new file mode 100644
index 000..f556de5
--- /dev/null
+++ b/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.week.graph
@@ -0,0 +1,14 @@
+title 'mediaWikiLoadStart to document.onload on desktop sites, last week'
+linewidth 1
+linemode 'connected'
+hide_legend 'false'
+from '-1week'
+vtitle 'milliseconds'
+
+field :q2, :color => 'blue',
+   :alias => 'Median',
+   :d

[MediaWiki-commits] [Gerrit] Fixing mobile menu so that it displays correcting in no-JS a... - change (mediawiki...MobileFrontend)

[Kaldari (Code Review)]

Kaldari has uploaded a new change for review.

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

Change subject: Fixing mobile menu so that it displays correcting in no-JS and 
RTL
..

Fixing mobile menu so that it displays correcting in no-JS and RTL

Bug: 60186
Change-Id: I7aaa4ffc0a5a4fa2e292d7d9971d7103449baf17
---
M less/common/mainmenu.less
1 file changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/less/common/mainmenu.less b/less/common/mainmenu.less
index 979f38b..41a29d6 100644
--- a/less/common/mainmenu.less
+++ b/less/common/mainmenu.less
@@ -35,7 +35,7 @@
&:first-child {
border-bottom: @menuBorder solid @menuBorderColor;
 
-   li:first-child a {
+   li:first-child {
border-top: none;
}
}
@@ -44,6 +44,8 @@
position: relative; // ensure the logout link in beta can be 
position absolute
font-size: 1.2em;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.6);
+   border-bottom: 1px solid #3e3e3e;
+   border-top: 1px solid #717171;
 
&:hover {
background-color: #5C5C5C;
@@ -73,13 +75,12 @@
a {
color: white;
display: block;
-   padding: 13px 10px 11px 42px;
+   padding: 13px 10px 11px 34px;
line-height: 22px;
background-repeat: no-repeat;
.background-size(24px, 24px);
-   background-position: 4% 50%;
-   border-bottom: 1px solid #3e3e3e;
-   border-top: 1px solid #717171;
+   background-position: left center;
+   margin-left: 8px;
&:hover {
text-decoration: none;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aaa4ffc0a5a4fa2e292d7d9971d7103449baf17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] Don't allow less than 1 thread in mw-update-l10n - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: Don't allow less than 1 thread in mw-update-l10n
..


Don't allow less than 1 thread in mw-update-l10n

This is showing nasty errors all over the place.

Change-Id: I6cff4b0e58fc093403494309f52213b2187c5ae9
---
M files/scap/mw-update-l10n
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Aaron Schulz: Looks good to me, but someone else must approve
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/files/scap/mw-update-l10n b/files/scap/mw-update-l10n
index 3823a54..81d5c40 100755
--- a/files/scap/mw-update-l10n
+++ b/files/scap/mw-update-l10n
@@ -43,6 +43,10 @@
 CPUS=`grep -c 'model name' /proc/cpuinfo`
 THREADS=`expr $CPUS - 2`
 
+if [ $THREADS -lt 1 ]; then
+   THREADS=1
+fi
+
 mwExtVerDbSets=$($BINDIR/mwversionsinuse --extended --withdb) || die
 # Regenerate the extension message file list for all active MediaWiki versions
 for i in ${mwExtVerDbSets[@]}; do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cff4b0e58fc093403494309f52213b2187c5ae9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki.api: Remove misleading comment about JSONP - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: mediawiki.api: Remove misleading comment about JSONP
..

mediawiki.api: Remove misleading comment about JSONP

The non-existent parameter this is discussing has been removed a long
time ago, but the comment somehow stayed.

Change-Id: I3cb4583646a8b85fd2383c7d0917de6f6c414049
---
M resources/mediawiki.api/mediawiki.api.js
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/110662/1

diff --git a/resources/mediawiki.api/mediawiki.api.js 
b/resources/mediawiki.api/mediawiki.api.js
index cdc6767..1449878 100644
--- a/resources/mediawiki.api/mediawiki.api.js
+++ b/resources/mediawiki.api/mediawiki.api.js
@@ -233,12 +233,6 @@
apiPromise = this.get( {
action: 'tokens',
type: type
-   }, {
-   // Due to the API assuming we're logged 
out if we pass the callback-parameter,
-   // we have to disable jQuery's callback 
system, and instead parse JSON string,
-   // by setting 'jsonp' to false.
-   // TODO: This concern seems genuine but 
no other module has it. Is it still
-   // needed and/or should we pass this by 
default?
} )
.done( function ( data ) {
// If token type is not available for 
this user,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cb4583646a8b85fd2383c7d0917de6f6c414049
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Add Wikiversity to site list in ParsoidConfig - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Add Wikiversity to site list in ParsoidConfig
..


Add Wikiversity to site list in ParsoidConfig

Bug: 60182
Change-Id: I95932a9ac3b31900fd07dd81ec4e78c2cf889e18
---
M lib/mediawiki.ParsoidConfig.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index 42a9d08..9fd6f13 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -41,9 +41,9 @@
self.interwikiMap[dbLangPrefix + 'wiktionary'] = 'http://' + 
lang +
'.wiktionary.org/w/api.php';
 
-   // Wikivoyage, Wikibooks, Wikisource, Wikiquote all follow the 
same
-   // pattern
-   ['voyage', 'books', 'source', 'quote'].forEach(function(suffix) 
{
+   // Wikivoyage, Wikibooks, Wikisource, Wikiquote, Wikiversity 
all follow
+   // the same pattern
+   ['voyage', 'books', 'source', 'quote', 
'versity'].forEach(function(suffix) {
self.interwikiMap[dbLangPrefix + 'wiki' + suffix] = 
'http://' + lang + '.wiki' +
suffix + '.org/w/api.php';
});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95932a9ac3b31900fd07dd81ec4e78c2cf889e18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Subramanya Sastry 
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 several users who now have quite a few commits - change (integration/zuul-config)

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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

Change subject: Add several users who now have quite a few commits
..

Add several users who now have quite a few commits

This adds: Hydriz, Jackmcbarn, Jarry1250, Platonides,
and This, that and the other (TTO).

Platonides is of course a trusted person who has been around
forever. Some of the other users added here are newer, however
all of these users have at least a "page" worth of merged commits
in gerrit.

Change-Id: Ic64f9a58173ab79e30ab5459c1648f7b559827f8
---
M layout.yaml
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/61/110661/1

diff --git a/layout.yaml b/layout.yaml
index 2e45d13..3b5518a 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -37,7 +37,7 @@
   # TODO: Figure out a way to not have to repeat this from pipeline 
'test'.
   # This email_filter and the one for 'test' can be removed once we 
have fixed bug 45499.
   email_filter:
-- 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|tomasz@twkozlowski\.net|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net)).*$
+- 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|tomasz@twkozlowski\.net|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net|at\.light@live\.com\.au|jackmcbarn@gmail\.com|platonides@gmail\.com|jarry1250@gmail\.com|admin@alphacorp\.tk|01tonythomas@gmail\.com)).*$
 - event: comment-added
   comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$
 success-message: 'Build succeeded.'
@@ -154,6 +154,7 @@
- ^drenfro@vistaprint\.com$  # AlephNull
 
   # Trusted long term users:
+   - ^admin@alphacorp\.tk$ # Hydriz
- ^benestar\.wikimedia@googlemail\.com$
- ^bryan\.tongminh@gm

[MediaWiki-commits] [Gerrit] Story 1625: Drop the preview screen - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Story 1625: Drop the preview screen
..


Story 1625: Drop the preview screen

Fix back button in process and add a browser test to cover it

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

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



diff --git a/javascripts/modules/editor/VisualEditorOverlay.js 
b/javascripts/modules/editor/VisualEditorOverlay.js
index bb36829..5536af6 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -46,13 +46,18 @@
// Save button
this.$( '.continue' ).on( 'click', $.proxy( this, 
'prepareForSave' ) );
this.$( '.submit' ).on( 'click', $.proxy( this, 'save' 
) );
+   this.$( '.back' ).on( 'click', $.proxy( this, 
'switchToEditor' ) );
this._super( options );
+   },
+   switchToEditor: function() {
+   this._showHidden( '.initial-header' );
+   this.$( '.surface' ).show();
+   this.docToSave = false;
},
prepareForSave: function() {
var self = this,
doc = 
this.target.surface.getModel().getDocument();
-   // Disable VE surface
-   this.target.surface.getView().disable();
+   this.$( '.surface' ).hide();
self._showHidden( '.save-header, .save-panel' );
self.$( '.submit' ).prop( 'disabled', true );
this.$spinner.show();
diff --git a/tests/browser/features/editor-ve.feature 
b/tests/browser/features/editor-ve.feature
index ed9a4a0..25df2da 100644
--- a/tests/browser/features/editor-ve.feature
+++ b/tests/browser/features/editor-ve.feature
@@ -11,3 +11,13 @@
 And I click continue
 And I click submit
   Then I see a toast confirmation
+
+Scenario: Going back from save screen in VisualEditor
+  Given I am in alpha mode
+And I am logged into the mobile website
+  When I am on the Selenium Edit Test article
+And I click edit
+And I type ABCDEFG into VisualEditor
+And I click continue
+And I click the escape button
+  Then I see the VisualEditor
diff --git a/tests/browser/features/step_definitions/common_article_steps.rb 
b/tests/browser/features/step_definitions/common_article_steps.rb
index a2f817f..69452b8 100644
--- a/tests/browser/features/step_definitions/common_article_steps.rb
+++ b/tests/browser/features/step_definitions/common_article_steps.rb
@@ -2,6 +2,10 @@
   on(ArticlePage).edit_button_element.when_present.click
 end
 
+Then(/^I see the VisualEditor$/) do
+  on(ArticlePage).editor_ve_element.when_present.should exist
+end
+
 Given(/^I type (.+) into the editor$/) do |text|
   on(ArticlePage).editor_text_area_element.when_present.send_keys(text)
 end
@@ -13,6 +17,10 @@
   end
 end
 
+Given(/^I click the escape button$/) do
+  on(ArticlePage).escape_button_element.when_present.click
+end
+
 Given(/^I click continue$/) do
   on(ArticlePage).continue_button_element.when_present.click
 end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 82683f3..3fc0ebb 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -50,6 +50,7 @@
 
   # editor
   textarea(:editor_text_area, class:"wikitext-editor")
+  button(:escape_button, class:"back icon")
   button(:continue_button, class:"continue icon")
   button(:submit_button, class:"submit icon")
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fe0aed425119268d372e7409478d627416f06b4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Awjrichards 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Clean up interwiki map - change (mediawiki...deploy)

[jenkins-bot (Code Review)]

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

Change subject: Clean up interwiki map
..


Clean up interwiki map

Also, split the ones that actually need to bypass the proxy from the others.

Change-Id: I9c192c78b1b7b64c8429810b926184713690be52
---
M conf/wmf/localsettings.js
1 file changed, 16 insertions(+), 10 deletions(-)

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



diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index 78b0ef3..9729ab1 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -1,23 +1,29 @@
 exports.setup = function( parsoidConfig ) {
 // Map from DB name to API URL
-var dbname, interwikiMap = {
-'testwiki': 'http://test.wikipedia.org/w/api.php',
-'test2wiki': 'http://test2.wikipedia.org/w/api.php',
+var dbname,
+interwikiMap = {
+'testwiki': 'http://test.wikipedia.org/w/api.php',
+'test2wiki': 'http://test2.wikipedia.org/w/api.php',
 
-'sewikimedia': 'http://se.wikimedia.org/w/api.php',
+'sewikimedia': 'http://se.wikimedia.org/w/api.php' },
 
-'boardwiki': 'https://board.wikimedia.org/w/api.php',
-'collabwiki': 'https://collab.wikimedia.org/w/api.php',
-'officewiki': 'https://office.wikimedia.org/w/api.php',
-'wikimaniateamwiki': 
'https://wikimaniateam.wikimedia.org/w/api.php',
+privateInterwikiMap = {
+'boardwiki': 'https://board.wikimedia.org/w/api.php',
+'collabwiki': 'https://collab.wikimedia.org/w/api.php',
+'officewiki': 'https://office.wikimedia.org/w/api.php',
+'wikimaniateamwiki': 
'https://wikimaniateam.wikimedia.org/w/api.php',
 
-'labswiki': 'https://wikitech.wikimedia.org/w/api.php'
+'labswiki': 'https://wikitech.wikimedia.org/w/api.php' 
// Not private but can't use proxy
 };
 
 for ( dbname in interwikiMap ) {
+parsoidConfig.setInterwiki( dbname, interwikiMap[dbname] );
+}
+
+for ( dbname in privateInterwikiMap ) {
 // Disable proxying for special wikis
 // TODO: See if we can go direct for some of those too
-parsoidConfig.setInterwiki( dbname, interwikiMap[dbname], null 
);
+parsoidConfig.setInterwiki( dbname, 
privateInterwikiMap[dbname], null );
 }
 
 parsoidConfig.usePHPPreProcessor = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c192c78b1b7b64c8429810b926184713690be52
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Helder.wiki 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed getDBname() for DatabaseSQLite - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fixed getDBname() for DatabaseSQLite
..


Fixed getDBname() for DatabaseSQLite

Change-Id: Ie1a575bb96141b59880358d066e710b2f868f880
---
M includes/db/DatabaseSqlite.php
1 file changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 5aaeb65..fa827d1 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -38,12 +38,6 @@
/** @var resource */
protected $mLastResult;
 
-   /**
-* @var string
-* @todo Seems to serve no purpose. Remove?
-*/
-   private $mName;
-
/** @var PDO */
protected $mConn;
 
@@ -63,7 +57,7 @@
'foreign' => isset( $args[6] ) ? $args[6] : 
false
);
}
-   $this->mName = $p['dbname'];
+   $this->mDBname = $p['dbname'];
parent::__construct( $p );
// parent doesn't open when $user is false, but we can work 
with $dbName
if ( $p['dbname'] && !$this->isOpen() ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1a575bb96141b59880358d066e710b2f868f880
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add Wikiversity to site list in ParsoidConfig - change (mediawiki...parsoid)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Add Wikiversity to site list in ParsoidConfig
..

Add Wikiversity to site list in ParsoidConfig

Bug: 60182
Change-Id: I95932a9ac3b31900fd07dd81ec4e78c2cf889e18
---
M lib/mediawiki.ParsoidConfig.js
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index 42a9d08..9fd6f13 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -41,9 +41,9 @@
self.interwikiMap[dbLangPrefix + 'wiktionary'] = 'http://' + 
lang +
'.wiktionary.org/w/api.php';
 
-   // Wikivoyage, Wikibooks, Wikisource, Wikiquote all follow the 
same
-   // pattern
-   ['voyage', 'books', 'source', 'quote'].forEach(function(suffix) 
{
+   // Wikivoyage, Wikibooks, Wikisource, Wikiquote, Wikiversity 
all follow
+   // the same pattern
+   ['voyage', 'books', 'source', 'quote', 
'versity'].forEach(function(suffix) {
self.interwikiMap[dbLangPrefix + 'wiki' + suffix] = 
'http://' + lang + '.wiki' +
suffix + '.org/w/api.php';
});

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

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

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

[MediaWiki-commits] [Gerrit] [Browser test] WIP New test for VE Page Settings menu. - change (mediawiki...VisualEditor)

[Jhall (Code Review)]

Jhall has uploaded a new change for review.

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

Change subject: [Browser test] WIP New test for VE Page Settings menu.
..

[Browser test] WIP New test for VE Page Settings menu.

Change-Id: I7c7c92d8078a88d999452e008fec7cd107451582
---
M modules/ve-mw/test/browser/features/step_definitions/references_steps.rb
A modules/ve-mw/test/browser/features/step_definitions/tools_steps.rb
A modules/ve-mw/test/browser/features/support/pages/random_page.rb
M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
A modules/ve-mw/test/browser/features/tools.feature
5 files changed, 114 insertions(+), 1 deletion(-)


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

diff --git 
a/modules/ve-mw/test/browser/features/step_definitions/references_steps.rb 
b/modules/ve-mw/test/browser/features/step_definitions/references_steps.rb
index ea1afad..267dfcf 100644
--- a/modules/ve-mw/test/browser/features/step_definitions/references_steps.rb
+++ b/modules/ve-mw/test/browser/features/step_definitions/references_steps.rb
@@ -8,7 +8,7 @@
 
 When(/^I click Edit for VisualEditor$/) do
   on(VisualEditorPage) do |page|
-page.edit_ve_element.when_present.click
+page.edit_ve_element.when_present(15).click
 # Attempt to dismiss "beta warning" pop-up multiple times, since SauceLabs 
sometimes fails on the first attempt to dismiss.
   try = 10
   try.times do
diff --git 
a/modules/ve-mw/test/browser/features/step_definitions/tools_steps.rb 
b/modules/ve-mw/test/browser/features/step_definitions/tools_steps.rb
new file mode 100644
index 000..c37cbdf
--- /dev/null
+++ b/modules/ve-mw/test/browser/features/step_definitions/tools_steps.rb
@@ -0,0 +1,48 @@
+When(/^I click the (.+) menu option$/) do |menu_option|
+  on(VisualEditorPage) do |page|
+page.tools_menu_element.when_present.click
+# page.tools_categories_element.when_present.click
+page.tools_languages_element.when_present.click
+# page.tools_page_settings_element.when_present.click
+# page.switch_to_source_editing_element.when_present.click
+  end
+end
+
+Given(/^I am at a random page$/) do
+  visit(RandomPage)
+end
+
+
+And(/^I click the Categories frame option$/) do
+  on(VisualEditorPage).tools_categories_element.when_present.click
+end
+
+And(/^I click the Languages frame option$/) do
+  on(VisualEditorPage).tools_languages_frame_option_element.when_present.click
+end
+
+Then(/^the legend Languages should appear in the frame$/) do
+  on(VisualEditorPage).languages_legend_element.should be_visible
+end
+
+And(/^I enter a (.+) category label$/) do |content|
+  on(VisualEditorPage).add_category_element.when_present.send_keys(content)
+end
+
+And(/^I might (.+) a sort option with label (.+)$/) do |adding_sort, 
sort_label|
+  if (adding_sort == 'add')
+
on(VisualEditorPage).add_category_sort_element.when_present.send_keys(sort_label)
+  end
+end
+
+When(/^I click to confirm the new category$/) do
+  on(VisualEditorPage).confirm_category_element.when_present.click
+end
+
+When(/^I click the Apply Changes button$/) do
+  on(VisualEditorPage).apply_changes_element.when_present.click
+end
+
+Then(/^I can click the X on the frame$/) do
+  on(VisualEditorPage).frame_close_element.when_present.click
+end
\ No newline at end of file
diff --git a/modules/ve-mw/test/browser/features/support/pages/random_page.rb 
b/modules/ve-mw/test/browser/features/support/pages/random_page.rb
new file mode 100644
index 000..083517e
--- /dev/null
+++ b/modules/ve-mw/test/browser/features/support/pages/random_page.rb
@@ -0,0 +1,9 @@
+class RandomPage
+  include PageObject
+
+  include URL
+  page_url URL.url("Special:Random")
+
+  div(:feedback, class: "errorbox")
+
+end
diff --git 
a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
index 2bc997b..5578a86 100644
--- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
@@ -33,7 +33,13 @@
   span(:subheading3, text: "Sub-heading 3")
   span(:subheading4, text: "Sub-heading 4")
   span(:switch_to_source_editing, class: "oo-ui-iconedElement-icon 
oo-ui-icon-source")
+  # span(:tools_categories, class: "oo-ui-iconedElement-icon oo-ui-icon-tag")
+  span(:tools_categories, text: "Categories")
+  # span(:tools_languages, class: "oo-ui-iconedElement-icon 
oo-ui-icon-language")
+  span(:tools_languages, text: "Languages")
   span(:tools_menu, class: "oo-ui-iconedElement-icon oo-ui-icon-menu")
+  span(:tools_page_settings, class: "oo-ui-iconedElement-icon 
oo-ui-icon-settings")
+  span(:transclusion, class: "oo-ui-iconedElement-icon oo-ui-icon-template")
   span(:ve_bold_text, class: "oo-ui-iconedElement-icon oo-ui-icon-bold-b")
   span(:ve_bullets, class

[MediaWiki-commits] [Gerrit] Add Jack Phoenix. He's been here for about 6 years. - change (integration/zuul-config)

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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

Change subject: Add Jack Phoenix. He's been here for about 6 years.
..

Add Jack Phoenix. He's been here for about 6 years.

p.s. Also fix Nemo's username.

Change-Id: I74e2793f1e2d0e4e3b4e9685a8951ed949de12d9
---
M layout.yaml
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/58/110658/1

diff --git a/layout.yaml b/layout.yaml
index fdf96e9..2e45d13 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -37,7 +37,7 @@
   # TODO: Figure out a way to not have to repeat this from pipeline 
'test'.
   # This email_filter and the one for 'test' can be removed once we 
have fixed bug 45499.
   email_filter:
-- 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|tomasz@twkozlowski\.net|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it)).*$
+- 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|tomasz@twkozlowski\.net|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net)).*$
 - event: comment-added
   comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$
 success-message: 'Build succeeded.'
@@ -160,9 +160,10 @@
- ^d_entous@yahoo\.com$
- ^daniel@nadir-seen-fire\.com$
- ^dereckson@espace-win\.org$
-   - ^federicoleva@tiscali\.it$  # Nemo Bis
+   - ^federicoleva@tiscali\.it$  # Nemo bis
- ^hartman\.wiki@gmail\.com$
- ^jamesin\.hongkong\.1@gmail\.com$  # Mwjames
+   - ^jack@countervandalism\.net$ # Jack Phoenix
- ^krenair@gmail\.com$
- ^liangent@gmail\.com$
- ^mah@everybody\.org$

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

Gerrit-MessageType: newchan

[MediaWiki-commits] [Gerrit] Fixed getDBname() for DatabaseSQLite - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed getDBname() for DatabaseSQLite
..

Fixed getDBname() for DatabaseSQLite

Change-Id: Ie1a575bb96141b59880358d066e710b2f868f880
---
M includes/db/DatabaseSqlite.php
1 file changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/110656/1

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 5aaeb65..fa827d1 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -38,12 +38,6 @@
/** @var resource */
protected $mLastResult;
 
-   /**
-* @var string
-* @todo Seems to serve no purpose. Remove?
-*/
-   private $mName;
-
/** @var PDO */
protected $mConn;
 
@@ -63,7 +57,7 @@
'foreign' => isset( $args[6] ) ? $args[6] : 
false
);
}
-   $this->mName = $p['dbname'];
+   $this->mDBname = $p['dbname'];
parent::__construct( $p );
// parent doesn't open when $user is false, but we can work 
with $dbName
if ( $p['dbname'] && !$this->isOpen() ) {

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

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

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

[MediaWiki-commits] [Gerrit] Added some lock()/unlock() support for SQLite using lock fil... - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Added some lock()/unlock() support for SQLite using lock file 
emulation
..

Added some lock()/unlock() support for SQLite using lock file emulation

Change-Id: Ifd70d06055c74715c52758615c3081dde409c9a6
---
M includes/db/DatabaseSqlite.php
1 file changed, 22 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/110657/1

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index fa827d1..2e23d73 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -41,8 +41,11 @@
/** @var PDO */
protected $mConn;
 
+   /** @var FSLockManager (hopefully on the same server as the DB) */
+   protected $lockMgr;
+
function __construct( $p = null ) {
-   global $wgSharedDB;
+   global $wgSharedDB, $wgSQLiteDataDir;
 
if ( !is_array( $p ) ) { // legacy calling pattern
wfDeprecated( __METHOD__ . " method called without 
parameter array.", "1.22" );
@@ -67,6 +70,8 @@
}
}
}
+
+   $this->lockMgr = new FSLockManager( array( 'lockDirectory' => 
"$wgSQLiteDataDir/locks" ) );
}
 
/**
@@ -866,6 +871,22 @@
return $s;
}
 
+   public function lock( $lockName, $method, $timeout = 5 ) {
+   global $wgSQLiteDataDir;
+
+   if ( !is_dir( "$wgSQLiteDataDir/locks" ) ) { // create dir as 
needed
+   if ( !is_writable( $wgSQLiteDataDir ) || !mkdir( 
"$wgSQLiteDataDir/locks" ) ) {
+   throw new DBError( "Cannot create directory 
\"$wgSQLiteDataDir/locks\"." );
+   }
+   }
+
+   return $this->lockMgr->lock( array( $lockName ), 
LockManager::LOCK_EX, $timeout )->isOK();
+   }
+
+   public function unlock( $lockName, $method ) {
+   return $this->lockMgr->unlock( array( $lockName ), 
LockManager::LOCK_EX )->isOK();
+   }
+
/**
 * Build a concatenation list to feed into a SQL query
 *

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

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

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

[MediaWiki-commits] [Gerrit] Make MobileViewTarget scroll to desired section - change (mediawiki...VisualEditor)

[JGonera (Code Review)]

JGonera has uploaded a new change for review.

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

Change subject: Make MobileViewTarget scroll to desired section
..

Make MobileViewTarget scroll to desired section

Implements
https://wikimedia.mingle.thoughtworks.com/projects/mobile/cards/1626

Change-Id: I9f41ec6fb88f6f21e698553216ccf2c3231589c1
---
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 54 insertions(+), 5 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index 2400045..0cd88d9 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -14,14 +14,17 @@
  *
  * @constructor
  * @param {jQuery} $container Container to render target into
+ * @param {number} section Number of the section target should scroll to
  */
-ve.init.mw.MobileViewTarget = function VeInitMwMobileViewTarget( $el ) {
+ve.init.mw.MobileViewTarget = function VeInitMwMobileViewTarget( $el, section 
) {
var currentUri = new mw.Uri();
 
// Parent constructor
ve.init.mw.Target.call(
this, $el, mw.config.get( 'wgRelevantPageName' ), 
currentUri.query.oldid
);
+
+   this.section = section;
 
// Events
this.connect( this, {
@@ -78,4 +81,53 @@
  */
 ve.init.mw.MobileViewTarget.prototype.onSurfaceReady = function () {
this.$document[0].focus();
+   this.restoreEditSection();
+};
+
+// FIXME: this is a copy and paste from ve.init.mw.ViewPageTarget
+// should we create a common abstract parent class?
+/**
+ * Move the cursor in the editor to section specified by this.section.
+ */
+ve.init.mw.MobileViewTarget.prototype.restoreEditSection = function () {
+   if ( this.section !== null ) {
+   var offset, offsetNode, nextNode,
+   target = this,
+   surfaceView = this.surface.getView(),
+   surfaceModel = surfaceView.getModel(),
+   $section = this.$document.find( 'h1, h2, h3, h4, h5, 
h6' ).eq( this.section - 1 ),
+   headingNode = $section.data( 'view' ),
+   lastHeadingLevel = -1;
+
+   if ( $section.length ) {
+   this.initialEditSummary = '/* ' +
+   ve.graphemeSafeSubstring( $section.text(), 0, 
244 ) + ' */ ';
+   }
+
+   if ( headingNode ) {
+   // Find next sibling which isn't a heading
+   offsetNode = headingNode;
+   while ( offsetNode instanceof ve.ce.HeadingNode && 
offsetNode.getModel().getAttribute( 'level' ) > lastHeadingLevel ) {
+   lastHeadingLevel = 
offsetNode.getModel().getAttribute( 'level' );
+   // Next sibling
+   nextNode = 
offsetNode.parent.children[ve.indexOf( offsetNode, offsetNode.parent.children ) 
+ 1];
+   if ( !nextNode ) {
+   break;
+   }
+   offsetNode = nextNode;
+   }
+   offset = 
surfaceModel.getDocument().data.getNearestContentOffset(
+   offsetNode.getModel().getOffset(), 1
+   );
+   surfaceModel.setSelection( new ve.Range( offset ) );
+   // Scroll to heading:
+   // Wait for toolbar to animate in so we can account for 
its height
+   setTimeout( function () {
+   var $window = $( OO.ui.Element.getWindow( 
target.$element ) );
+   $window.scrollTop( 
headingNode.$element.offset().top - target.toolbar.$element.height() );
+   }, 200 );
+   }
+
+   this.section = null;
+   }
 };
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 6a51218..bc4e430 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1400,10 +1400,7 @@
 };
 
 /**
- * Move the cursor in the editor to a given section.
- *
- * @method
- * @param {number} section Section to move cursor to
+ * Move the cursor in the editor to section specified by this.section.
  */
 ve.init.mw.ViewPageTarget.prototype.restoreEditSection = function () {
if ( this.section !== null ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/110655
To unsub

[MediaWiki-commits] [Gerrit] update for pwd - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: update for pwd
..


update for pwd

Change-Id: Ibe148ebe3d7a45ac5bc477bc20ac60cb6110790e
---
M tests/browser/features/keepgoing.feature
M tests/browser/features/step_definitions/common_steps.rb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/browser/features/keepgoing.feature 
b/tests/browser/features/keepgoing.feature
index 7e95d83..059f3f9 100644
--- a/tests/browser/features/keepgoing.feature
+++ b/tests/browser/features/keepgoing.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org
+
 Feature: Encourage new users to Keep Going
 
   Scenario: I see a KeepGoing message after completing my edit
diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 6c9eb5d..139f138 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -22,7 +22,7 @@
 
 Given(/^I register a new account with a random username$/) do
   username = 'NewUser' + Time.now.to_i.to_s
-  pwd = 'test'
+  pwd = ENV["MEDIAWIKI_PASSWORD"]
   visit(CreateAccountPage) do |page|
 # undo auto complete
 page.username_field_element.when_present.send_keys(username)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe148ebe3d7a45ac5bc477bc20ac60cb6110790e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix double parsing of the 'description' key in Special:Version. - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix double parsing of the 'description' key in Special:Version.
..


Fix double parsing of the 'description' key in Special:Version.

$description is parseInline()'d right after the if-else loop, on line 682.

Follow-up to 357eb3d488b9d8caf575bc6990d9906ecc256554.

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

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



diff --git a/includes/specials/SpecialVersion.php 
b/includes/specials/SpecialVersion.php
index e8aa9b4..c38b009 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -675,7 +675,7 @@
}
} elseif ( isset( $extension['description'] ) ) {
// Non localized version
-   $description = $out->parseInline( 
$extension['description'] );
+   $description = $extension['description'];
} else {
$description = '';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ad4f5cedc590e5abef269363998457d828fd574
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Brian Wolff 
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 for pwd - change (mediawiki...MobileFrontend)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

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

Change subject: update for pwd
..

update for pwd

Change-Id: Ibe148ebe3d7a45ac5bc477bc20ac60cb6110790e
---
M tests/browser/features/step_definitions/common_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 6c9eb5d..c149587 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -22,7 +22,7 @@
 
 Given(/^I register a new account with a random username$/) do
   username = 'NewUser' + Time.now.to_i.to_s
-  pwd = 'test'
+  pwd = ENV["MEDIAWIKI_USER"]
   visit(CreateAccountPage) do |page|
 # undo auto complete
 page.username_field_element.when_present.send_keys(username)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe148ebe3d7a45ac5bc477bc20ac60cb6110790e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 

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

[MediaWiki-commits] [Gerrit] Mark disambiguation and redirect pages in the link inspector - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Mark disambiguation and redirect pages in the link inspector
..

Mark disambiguation and redirect pages in the link inspector

Bug: 50240
Change-Id: If975398e4d6b13eea6207ee80b33067e65acd724
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/styles/ve.ui.MWWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
5 files changed, 72 insertions(+), 10 deletions(-)


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

diff --git a/VisualEditor.php b/VisualEditor.php
index d94213e..7bddaf7 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -719,6 +719,8 @@
'visualeditor-linkinspector-illegal-title',
'visualeditor-linkinspector-suggest-external-link',
'visualeditor-linkinspector-suggest-matching-page',
+   'visualeditor-linkinspector-suggest-disambig-page',
+   'visualeditor-linkinspector-suggest-redirect-page',
'visualeditor-linkinspector-suggest-new-page',
'visualeditor-media-input-placeholder',
'visualeditor-meta-tool',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c924dde..7309ecc 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -110,6 +110,8 @@
 "visualeditor-linkinspector-illegal-title": "Invalid page title",
 "visualeditor-linkinspector-suggest-external-link": "External link",
 "visualeditor-linkinspector-suggest-matching-page": "Matching page",
+"visualeditor-linkinspector-suggest-disambig-page": "Disambiguation page",
+"visualeditor-linkinspector-suggest-redirect-page": "Redirect page",
 "visualeditor-linkinspector-suggest-new-page": "New page",
 "visualeditor-loadwarning": "Error loading data from server: $1. Would you 
like to retry?",
 "visualeditor-loadwarning-token": "Error loading edit token from server: 
$1. Would you like to retry?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index b3a7ae5..aead46a 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -115,6 +115,8 @@
 "visualeditor-linkinspector-illegal-title": "Warning that the entered text 
is not a valid page title.",
 "visualeditor-linkinspector-suggest-external-link": "Label for an external 
(Web) link in the link inspector.\n{{Identical|External link}}",
 "visualeditor-linkinspector-suggest-matching-page": "Label for suggested 
matching local wiki page or pages in the link inspector",
+"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested 
disambiguation pages in the link inspector",
+"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested 
redirect pages in the link inspector",
 "visualeditor-linkinspector-suggest-new-page": "Label for a new page in 
the link inspector.\n{{Identical|New page}}",
 "visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the 
editor fails to load properly.\n\nParameters:\n* $1 - the error message from 
the server, in English. e.g. \"parsoidserver-http-bad-status: 404\"",
 "visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown when 
the editor fails to load properly.\n\nParameters:\n* $1 - the error message 
from the server.",
@@ -186,4 +188,4 @@
 "visualeditor-wikitext-warning": "Contents of notification displayed when 
Wikitext has been detected.\n\nRefers to:\n* 
{{msg-mw|Visualeditor-wikitext-warning-link}}\n* 
{{msg-mw|Visualeditor-ca-editsource}}",
 "visualeditor-wikitext-warning-link": "Link to page describing what 
Wikitext is.\n\nUsed in:\n* {{msg-mw|Visualeditor-wikitext-warning}}.",
 "visualeditor-wikitext-warning-title": "Title of notification displayed 
when Wikitext has been detected"
-}
\ No newline at end of file
+}
diff --git a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css 
b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
index 3e361f9..82487f9 100644
--- a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
+++ b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
@@ -23,6 +23,8 @@
 
 .ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=existingPage],
 .ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=matchingPage],
+.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=disambigPage],
+.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=redirectPage],
 .ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=externalLink] {
color: #0645AD;
 }
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index ff904d6..952823d 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetI

[MediaWiki-commits] [Gerrit] Don't throw JS errors when opening MWExtensionInspector on t... - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

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

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

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

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


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

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

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf0e9cf7ccaa37e607374ced150db732926a19f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 

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

[MediaWiki-commits] [Gerrit] Render paragraphs when indent-pre is suppressed in blocklevels - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Render paragraphs when indent-pre is suppressed in blocklevels
..

Render paragraphs when indent-pre is suppressed in blocklevels

Bug: 51262
Change-Id: Ibd04a36d5f8e4a0432bd6eb22942af61c239fa3f
---
M lib/dom.handlePres.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 58 insertions(+), 33 deletions(-)


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

diff --git a/lib/dom.handlePres.js b/lib/dom.handlePres.js
index 9368e5b..f3cc7e9 100644
--- a/lib/dom.handlePres.js
+++ b/lib/dom.handlePres.js
@@ -3,6 +3,27 @@
 var DU = require('./mediawiki.DOMUtils.js').DOMUtils,
Util = require('./mediawiki.Util.js').Util;
 
+function fixedIndentPreText(str, isLastChild) {
+   if (isLastChild) {
+   return str.replace(/\n(?!$)/g, "\n ");
+   } else {
+   return str.replace(/\n/g, "\n ");
+   }
+}
+
+function reinsertLeadingSpace(elt, isLastChild) {
+   var children = elt.childNodes;
+   for (var i = 0, n = children.length; i < n; i++) {
+   var c = children[i];
+   if (DU.isText(c)) {
+   c.data = fixedIndentPreText(c.data, isLastChild && i 
=== n-1);
+   } else {
+   // recurse
+   reinsertLeadingSpace(c, isLastChild && i === n-1);
+   }
+   }
+}
+
 function handlePres(document, env) {
/* --
 * Block tags change the behaviour of indent-pres.  This behaviour
@@ -17,35 +38,15 @@
 * Wherever such a block tag is found, any Parsoid-inserted
 * pre-tags are removed.
 * -- */
-   function deleteIndentPreFromDOM(node) {
-
-   function fixedIndentPreText(str, isLastChild) {
-   if (isLastChild) {
-   return str.replace(/\n(?!$)/g, "\n ");
-   } else {
-   return str.replace(/\n/g, "\n ");
-   }
-   }
-
-   function reinsertLeadingSpace(elt, isLastChild) {
-   var children = elt.childNodes;
-   for (var i = 0, n = children.length; i < n; i++) {
-   var c = children[i];
-   if (DU.isText(c)) {
-   c.data = fixedIndentPreText(c.data, 
isLastChild && i === n-1);
-   } else {
-   // recurse
-   reinsertLeadingSpace(c, isLastChild && 
i === n-1);
-   }
-   }
-   }
-
-   var c = node.firstChild;
+   function deleteIndentPreFromDOM(node, blocklevel) {
+   var c = node.firstChild, p, f;
while (c) {
// get sibling before DOM is modified
var c_sibling = c.nextSibling;
 
if (DU.hasNodeName(c, "pre") && 
!DU.isLiteralHTMLNode(c)) {
+   f = document.createDocumentFragment();
+
// space corresponding to the 'pre'
node.insertBefore(document.createTextNode(' '), 
c);
 
@@ -61,14 +62,21 @@
// sure every new line gets a 
space char added back.
reinsertLeadingSpace(c_child, 
next === null);
}
-   node.insertBefore(c_child, c);
+   f.appendChild(c_child);
c_child = next;
}
 
+   if (blocklevel) {
+   p = document.createElement('p');
+   p.appendChild(f);
+   f = p;
+   }
+
+   node.insertBefore(f, c);
// delete the pre
DU.deleteNode(c);
} else if 
(!Util.tagClosesBlockScope(c.nodeName.toLowerCase())) {
-   deleteIndentPreFromDOM(c);
+   deleteIndentPreFromDOM(c, blocklevel);
}
 
c = c_sibling;
@@ -76,7 +84,7 @@
}
 
function findAndHandlePres(doc, elt, indentPresHandled) {
-   var children = elt.childNodes, n;
+   var children = elt.childNodes, n, blocklev

[MediaWiki-commits] [Gerrit] (FR #1113) checks for translation existence - change (wikimedia...tools)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: (FR #1113) checks for translation existence
..


(FR #1113) checks for translation existence

Change-Id: I57636c560b02c835a7e2b4a0896267341383749c
---
A language_audit/check_pages
A language_audit/config.yaml.example
M mediawiki/api.py
A mediawiki/i18n.py
A mediawiki/page.py
5 files changed, 70 insertions(+), 2 deletions(-)

Approvals:
  Mwalker: Looks good to me, approved



diff --git a/language_audit/check_pages b/language_audit/check_pages
new file mode 100755
index 000..5ac86a5
--- /dev/null
+++ b/language_audit/check_pages
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
+import os
+import os.path
+import re
+import sys
+
+from process.globals import load_config
+load_config("language_audit")
+
+from process.globals import config
+from process.lock import begin, end
+
+from mediawiki.i18n import get_languages
+from mediawiki.page import get_content
+
+def check_pages():
+for check_spec in config.check_page_languages:
+api_url = check_spec['api']
+languages = sorted([ l['code'] for l in get_languages(api=api_url) ])
+for lang in languages:
+title = check_spec['page'].format(language=lang)
+content = get_content(title, api=api_url)
+description = re.sub(r'^https?://([^/]+)/.*$', r'\1', api_url) + 
": " + title
+if not content:
+print "MISSING: " + description
+else:
+print "found: " + description
+
+if __name__ == "__main__":
+try:
+begin()
+
+check_pages()
+finally:
+end()
diff --git a/language_audit/config.yaml.example 
b/language_audit/config.yaml.example
new file mode 100644
index 000..67b12b5
--- /dev/null
+++ b/language_audit/config.yaml.example
@@ -0,0 +1,8 @@
+centralnotice_mw_api:
+"http://meta.wikimedia.org/w/api.php";
+check_page_languages:
+-
+api: "https://wikimediafoundation.org/w/api.php";
+page: "Thank_You/{language}"
+debug:
+1
diff --git a/mediawiki/api.py b/mediawiki/api.py
index 8c6bd87..49ea188 100644
--- a/mediawiki/api.py
+++ b/mediawiki/api.py
@@ -6,11 +6,11 @@
 
 import json
 
-def mw_call( args ):
+def mw_call(args, api=config.centralnotice_mw_api):
 import simplemediawiki
 
 wiki = simplemediawiki.MediaWiki(
-config.centralnotice_mw_api,
+api,
 user_agent='bot: fr-anal'
 )
 result = wiki.call( args )
diff --git a/mediawiki/i18n.py b/mediawiki/i18n.py
new file mode 100644
index 000..0a32e9f
--- /dev/null
+++ b/mediawiki/i18n.py
@@ -0,0 +1,9 @@
+from mediawiki.api import mw_call
+
+def get_languages(**kw):
+result = mw_call({
+'action': 'query',
+'meta': 'siteinfo',
+'siprop': 'languages',
+}, **kw)
+return result['languages']
diff --git a/mediawiki/page.py b/mediawiki/page.py
new file mode 100644
index 000..3bb9384
--- /dev/null
+++ b/mediawiki/page.py
@@ -0,0 +1,15 @@
+from mediawiki.api import mw_call
+
+def get_content(title, **kw):
+result = mw_call({
+'action': 'query',
+'prop': 'revisions',
+'titles': title,
+'rvprop': 'content',
+}, **kw)
+page = result['pages'].values().pop()
+if 'revisions' in page:
+revision = page['revisions'].pop()
+return revision['*']
+else:
+return None

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57636c560b02c835a7e2b4a0896267341383749c
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mwalker 
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 - Kafkatee puppet module - change (operations...kafkatee)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: WIP - Kafkatee puppet module
..

WIP - Kafkatee puppet module

Change-Id: Ie91622168233d88c4eab6a80c3437d8622ba506e
---
A README.md
A manifests/init.pp
A manifests/input.pp
A manifests/output.pp
A templates/input.kafka.conf.erb
A templates/input.pipe.conf.erb
A templates/kafkatee.conf.erb
A templates/output.conf.erb
8 files changed, 298 insertions(+), 0 deletions(-)


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

diff --git a/README.md b/README.md
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/README.md
diff --git a/manifests/init.pp b/manifests/init.pp
new file mode 100644
index 000..b88841e
--- /dev/null
+++ b/manifests/init.pp
@@ -0,0 +1,34 @@
+# Class: kafkatee
+#
+# Installs and configures a kafkatee instance
+
+class kafkatee(
+$kafka_brokers,
+$kafka_offset_store_path = '/var/cache/kafkatee/offsets',
+$kafka_offset_reset  = 'largest',
+$kafka_message_max_bytes = undef,
+$pidfile = '/var/run/kafkatee/kafkatee.pid',
+$log_statistics_file = '/var/cache/kafkatee/kafkatee.stats.json',
+$log_statistics_interval = 60,
+$output_encoding = 'string',
+$output_format   = '%{hostname}%{sequence} %{dt}   
%{time_firstbyte}   %{ip}   %{handling}/%{http_status}  %{bytes_sent}   
%{request_method}   http://%{host}%{uri}%{query}-   %{mime_type}
%{referer}  %{x_forwarded_for}  %{user_agent}   %{accept_language}  
%{x_analytics}',
+$output_queue_size   = undef,
+$config_file = '/etc/kafkatee.conf',
+$config_directory= '/etc/kafkatee.d'
+)
+{
+package { 'kafkatee':
+ensure => 'installed',
+}
+
+file { $config_file:
+template => template('kafkatee/kafkatee.conf.erb'),
+require  => Package['kafkatee'],
+}
+
+service { 'kafkatee':
+ensure=> running,
+provider  => 'upstart',
+subscribe => File[$config_file],
+}
+}
diff --git a/manifests/input.pp b/manifests/input.pp
new file mode 100644
index 000..bbcc85e
--- /dev/null
+++ b/manifests/input.pp
@@ -0,0 +1,23 @@
+# == Define kafkatee::input
+#
+# == Parameters
+# 
+#
+define kafkatee::input(
+$type   = 'kafka',
+$topic  = undef,
+$partitions = undef,
+$offset = 'end',
+$options= {},
+$command= undef,
+$ensure = 'present',
+)
+{
+Class['kafkatee'] -> Kafkatee::Input[$title]
+
+file { "${kafkatee::config_directory}/input.${type}.${title}.conf":
+ensure  => $ensure,
+content => template("kafkatee/input.${type}.conf.erb"),
+notify  => Service['kafkatee'],
+}
+}
diff --git a/manifests/output.pp b/manifests/output.pp
new file mode 100644
index 000..3736a72
--- /dev/null
+++ b/manifests/output.pp
@@ -0,0 +1,20 @@
+# == Define kafkatee::output
+#
+# == Parameters
+# 
+#
+define kafkatee::output(
+$destination,
+$type   = 'file',
+$sample = 1,
+$ensure = 'present',
+)
+{
+Class['kafkatee'] -> Kafkatee::Output[$title]
+
+file { "${kafkatee::config_directory}/output.${title}.conf":
+ensure  => $ensure,
+content => template('kafkatee/output.conf.erb'),
+notify  => Service['kafkatee'],
+}
+}
diff --git a/templates/input.kafka.conf.erb b/templates/input.kafka.conf.erb
new file mode 100644
index 000..bc66a19
--- /dev/null
+++ b/templates/input.kafka.conf.erb
@@ -0,0 +1,4 @@
+# Note: This file is managed by Puppet.
+
+# <%= @title %> kafka input
+input [<%= @options.map { |key,val| "#{key}=#{val}" }.join(',') %>] kafka 
topic <%= @topic %> partition <%= @partitions %> from <%= @offset %>
diff --git a/templates/input.pipe.conf.erb b/templates/input.pipe.conf.erb
new file mode 100644
index 000..9fd41a8
--- /dev/null
+++ b/templates/input.pipe.conf.erb
@@ -0,0 +1,4 @@
+# Note: This file is managed by Puppet.
+
+# <%= @title %> piped input
+input [<%= @options.map { |key,val| "#{key}=#{val}" }.join(',') %>] pipe <%= 
@command %>
diff --git a/templates/kafkatee.conf.erb b/templates/kafkatee.conf.erb
new file mode 100644
index 000..9fc2fbb
--- /dev/null
+++ b/templates/kafkatee.conf.erb
@@ -0,0 +1,210 @@
+###
+# #
+#kafkatee configuration file  #
+# #
+# #
+###
+# #
+# Syntax:

[MediaWiki-commits] [Gerrit] Make pointer arrow responsive - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Make pointer arrow responsive
..

Make pointer arrow responsive

Bug: 60357
Change-Id: I663247dc6d1e268b0c015338f56761392f66faaa
---
M javascripts/common/application.js
A javascripts/common/matchMedia.js
M javascripts/modules/tutorials/ContentOverlay.js
M less/modules/tutorials.less
M less/tablet/common.less
M templates/modules/tutorials/PageActionOverlay.html
6 files changed, 52 insertions(+), 18 deletions(-)


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

diff --git a/javascripts/common/application.js 
b/javascripts/common/application.js
index 9360e1e..19519f7 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -115,7 +115,9 @@
if ( inNamespace( '' ) ) {
modules.push( 'tablet.scripts' );
}
-   mw.loader.using( modules );
+   mw.loader.using( modules, function() {
+   M.emit( 'tablet-mode-loaded' );
+   } );
}
}
 
@@ -243,7 +245,10 @@
$doc.addClass( 'touch-events' );
}
$( loadWideScreenModules );
-   $( window ).on( 'resize', loadWideScreenModules );
+   $( window ).on( 'resize', function() {
+   M.emit( 'resize' );
+   } );
+   M.on( 'resize', loadWideScreenModules );
loadCurrentPage();
}
 
diff --git a/javascripts/common/matchMedia.js b/javascripts/common/matchMedia.js
new file mode 100644
index 000..87077e2
--- /dev/null
+++ b/javascripts/common/matchMedia.js
@@ -0,0 +1,11 @@
+( function( $ ) {
+   mw.matchMedia = function() {
+   if ( window.matchMedia ) {
+   $( 'link[data-media]' ).each( function() {
+   if ( window.matchMedia( $( this ).data( 'media' 
) ).matches ) {
+   $( this ).attr( 'href', $( this ).data( 
'href' ) );
+   }
+   } );
+   }
+   };
+} ( jQuery ) );
diff --git a/javascripts/modules/tutorials/ContentOverlay.js 
b/javascripts/modules/tutorials/ContentOverlay.js
index ba52c4c..af20a93 100644
--- a/javascripts/modules/tutorials/ContentOverlay.js
+++ b/javascripts/modules/tutorials/ContentOverlay.js
@@ -9,6 +9,7 @@
 * @extends Overlay
 */
ContentOverlay = Overlay.extend( {
+   className: 'content-overlay',
/**
 * @name ContentOverlay.prototype.fullScreen
 * @type Boolean
@@ -25,10 +26,18 @@
 */
appendTo: '#mw-mf-page-center',
postRender: function( options ) {
+   var self = this;
this._super( options );
if ( options.target ) {
this.addPointerArrow( $( options.target ) );
}
+   // Update the arrows position when the window size 
changes
+   function redraw() {
+   self.$pointer.remove();
+   self.addPointerArrow( $( options.target ) );
+   }
+   M.on( 'resize', redraw );
+   M.on( 'tablet-mode-loaded', redraw );
},
/**
 * @name ContentOverlay.prototype.addPointerArrow
@@ -38,16 +47,18 @@
addPointerArrow: function( $pa ) {
var tb = 'solid 10px transparent',
paOffset = $pa.offset(),
+   overlayOffset = this.$el.offset(),
h = $pa.outerHeight( true );
 
this.$el.css( 'top', paOffset.top + h );
-   $( '' ).css( {
+   this.$pointer = $( '' ).css( {
'border-bottom': 'solid 10px #006398',
'border-right': tb,
'border-left': tb,
position: 'absolute',
top: -10,
-   left: paOffset.left + 10
+   // remove the left offset of the overlay as 
margin auto may be applied to it
+   left: paOffset.left + 10 - overlayOffset.left
} ).appendTo( this.$el );
}
} );
diff --git a/less/modules/tutorials.less b/less/modules/tutorials.less
index 940e645..7da2039 100644
--- a/less/modules/tutorials.less
+++ b/less/modules

[MediaWiki-commits] [Gerrit] Avoid flash of styles when loading tablets - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Avoid flash of styles when loading tablets
..

Avoid flash of styles when loading tablets

Use some clever data attributes / JS magic.

Change-Id: I60822b222afad319fd7419f0b04ffe1ba74cc863
---
M includes/Resources.php
M includes/skins/SkinMinervaBeta.php
M javascripts/common/application.js
3 files changed, 26 insertions(+), 1 deletion(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index a9628e9..72c1cf7 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -193,6 +193,7 @@
),
'scripts' => array(
'javascripts/modules/lastEdited/lastEditedBeta.js',
+   'javascripts/common/matchMedia.js',
),
'messages' => array(
// LastEditedBeta.js
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index ba65489..871d2dc 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -11,9 +11,33 @@
}
# Replace page content before DOMParse to make sure images are 
scrubbed and Zero transformations are applied
$this->handleNewPages( $out );
+   $this->prepareResponsiveStyles();
parent::outputPage( $out );
}
 
+   protected function prepareResponsiveStyles() {
+   global $wgMFDeviceWidthTablet;
+
+   $url = ResourceLoader::makeLoaderURL(
+   array( 'tablet.styles' ),
+   $this->getLanguage()->getCode(),
+   $this->getSkinName(),
+   null,
+   null,
+   ResourceLoader::inDebugMode(),
+   'styles'
+   );
+   $attrs = array(
+   'data-href' => $url,
+   'rel' => 'stylesheet',
+   'data-media' => '(min-width: ' . $wgMFDeviceWidthTablet 
.'px)'
+   );
+   $out = $this->getOutput();
+   $out->addHeadItem( 'responsiveStyles', Html::element( 'link', 
$attrs ) );
+   $out->addHeadItem( 'responsiveScript', Html::inlineScript(
+   "mw.matchMedia();"
+   ) );
+   }
protected function getSearchPlaceHolderText() {
return wfMessage( 'mobile-frontend-placeholder-beta' )->text();
}
diff --git a/javascripts/common/application.js 
b/javascripts/common/application.js
index 19519f7..9e58f8b 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -109,7 +109,7 @@
 * @function
 */
function loadWideScreenModules() {
-   var modules = [ 'tablet.styles' ];
+   var modules = [];
if ( isWideScreen() && $( 'body' ).hasClass( 'skin-minerva' ) 
&& M.isBetaGroupMember() ) {
// Adjust screen for tablets
if ( inNamespace( '' ) ) {

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

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

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

[MediaWiki-commits] [Gerrit] Unbreak DOM dumping (is useful for debugging) - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Unbreak DOM dumping (is useful for debugging)
..


Unbreak DOM dumping (is useful for debugging)

* 2f8c1ee0 moved data-parsoid from node.data to node.dataobject
  This broke dom dumping which still used node.data.

* Discovered when I was trying to debug some DSR issue.

Change-Id: Id20db647a60698d57b14dcc04a7bbd9766540bbe
---
M lib/dom.dumper.js
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/lib/dom.dumper.js b/lib/dom.dumper.js
index aa49b7c..99fb0e8 100644
--- a/lib/dom.dumper.js
+++ b/lib/dom.dumper.js
@@ -4,7 +4,7 @@
Util = require('./mediawiki.Util.js').Util;
 
 function saveDataParsoid( options, node) {
-   if ( DU.isElt(node) && node.data ) {
+   if ( DU.isElt(node) && DU.getNodeData(node) ) {
DU.saveDataAttribs( node );
}
return true;
@@ -12,9 +12,9 @@
 
 function dumpDOM( options, root ) {
function cloneData(node, clone) {
-   var d = node.data;
-   if (d && d.constructor === Object && 
(Object.keys(d.parsoid).length > 0)) {
-   clone.data = Util.clone(d);
+   var d = DU.getNodeData(node);
+   if (d && d.constructor === Object && d.parsoid && 
(Object.keys(d.parsoid).length > 0)) {
+   DU.setNodeData(clone, Util.clone(d));
saveDataParsoid( options, clone );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id20db647a60698d57b14dcc04a7bbd9766540bbe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Marcoil 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix double parsing of the 'description' key in Special:Version. - change (mediawiki/core)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

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

Change subject: Fix double parsing of the 'description' key in Special:Version.
..

Fix double parsing of the 'description' key in Special:Version.

$description is parseInline()'d right after the if-else loop, on line 682.

Follow-up to 357eb3d488b9d8caf575bc6990d9906ecc256554.

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


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

diff --git a/includes/specials/SpecialVersion.php 
b/includes/specials/SpecialVersion.php
index e8aa9b4..c38b009 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -675,7 +675,7 @@
}
} elseif ( isset( $extension['description'] ) ) {
// Non localized version
-   $description = $out->parseInline( 
$extension['description'] );
+   $description = $extension['description'];
} else {
$description = '';
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad4f5cedc590e5abef269363998457d828fd574
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] FR #1332 - Adams pie chart sql gen tool - change (wikimedia...tools)

[Adamw (Code Review)]

Adamw has submitted this change and it was merged.

Change subject: FR #1332 - Adams pie chart sql gen tool
..


FR #1332 - Adams pie chart sql gen tool

Change-Id: I44fa60b6788cf1e8245a991d22a6b25317002cc1
---
A FundraiserStatisticsGen/sizes_by_day.py
1 file changed, 57 insertions(+), 0 deletions(-)

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



diff --git a/FundraiserStatisticsGen/sizes_by_day.py 
b/FundraiserStatisticsGen/sizes_by_day.py
new file mode 100644
index 000..5cc579a
--- /dev/null
+++ b/FundraiserStatisticsGen/sizes_by_day.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+
+# FIXME: dayoffiscalyear
+start_time = "20120701"
+end_time = "20130701"
+#start_time = "20060101"
+#end_time = "20140101"
+ranges = [
+[0, 10],
+[10,30],
+[30,50],
+[50,100],
+[100,200],
+[200,1000],
+[1000,2500],
+[2500,1],
+[1,10]
+]
+
+amount_slices_cols = ", ".join([
+"""
+SUM(
+IF(
+total_amount > {min} AND total_amount <= {max},
+total_amount, 0)
+) AS total_{min}_{max},
+SUM(
+IF(
+total_amount > {min} AND total_amount <= {max},
+1, 0)
+) AS num_{min}_{max}
+""".format(
+min=min_amount,
+max=max_amount
+) for min_amount, max_amount in ranges
+])
+
+sum_query = """
+SELECT
+FROM_DAYS(TO_DAYS(receive_date)) AS day,
+{amount_slices_cols}
+FROM
+civicrm_contribution
+WHERE
+receive_date > {begin}
+AND receive_date <= {end}
+GROUP BY
+YEAR(receive_date), DAYOFYEAR(receive_date)
+ORDER BY
+YEAR(receive_date), DAYOFYEAR(receive_date)
+ASC
+""".format(
+begin=start_time,
+end=end_time,
+amount_slices_cols=amount_slices_cols
+)
+print sum_query

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44fa60b6788cf1e8245a991d22a6b25317002cc1
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Adamw 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] GlobalCollect audit sends source metadata - change (wikimedia...crm)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: GlobalCollect audit sends source metadata
..


GlobalCollect audit sends source metadata

Finally removed the legacy STOMP code.

Change-Id: I28775106592234e033782a7c8fec504bd2619a70
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
M sites/all/modules/queue2civicrm/queue2civicrm.module
D sites/all/modules/queue2civicrm/queue2civicrm_stomp.inc
M sites/all/modules/wmf_common/wmf_common.module
4 files changed, 52 insertions(+), 205 deletions(-)

Approvals:
  Mwalker: Looks good to me, approved



diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module 
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index a03194c..1b480ed 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -353,7 +353,7 @@
$local_found_ids[] = $order_id;
globalcollect_audit_echo('!');
} else {
-   if ( sendSTOMP( $missing_txn_message ) ){
+   if ( globalcollect_audit_send_stomp( 
'donations', $missing_txn_message ) ){
watchdog('globalcollect_audit', 
__FUNCTION__ . ': Message sent to stomp successfully: ' . print_r( 
$missing_txn_message, true ), array(), WATCHDOG_INFO);
$local_found_ids[] = $order_id;
globalcollect_audit_echo('!');
@@ -396,7 +396,7 @@
$local_built_ids[] = $order_id;
globalcollect_audit_echo('!');
} else {
-   if ( sendSTOMP( $missing_txn_message ) ){
+   if ( globalcollect_audit_send_stomp( 
'donations', $missing_txn_message ) ){
watchdog('globalcollect_audit', 
__FUNCTION__ . ': Message sent to stomp successfully: ' . print_r( 
$missing_txn_message, true ), array(), WATCHDOG_INFO);
$local_built_ids[] = $order_id;
globalcollect_audit_echo('!');
@@ -631,7 +631,7 @@
$stomp_data = array(
'contribution_tracking_id' => $contribution_tracking_id,
'gateway' => 'globalcollect',
-   'amount' => $unstaged_amount,
+   'gross' => $unstaged_amount,
'payment_method' => $payment_method,
);

@@ -661,24 +661,17 @@
'language' => array( 'contribution_tracking', 'language' ), 
//probably the best one to use. 
'referrer' => array( 'contribution_tracking', 'referrer' ),
'email' => array( 'donor_data', 'EMAIL' ),
-   'fname' => array( 'donor_data', 'FIRSTNAME' ),
-   'mname',
-   'lname' => array( 'donor_data', 'SURNAME' ),
-   'street' => array( 'donor_data', 'STREET' ),
+   'first_name' => array( 'donor_data', 'FIRSTNAME' ),
+   'middle_name',
+   'last_name' => array( 'donor_data', 'SURNAME' ),
+   'street_address' => array( 'donor_data', 'STREET' ),
'city' => array( 'donor_data', 'CITY' ),
'state' => array( 'donor_data', 'STATE' ),
'country' => array( 'donor_data', 'COUNTRYCODE' ),
-   'zip' => array( 'donor_data', 'ZIP' ),
-   'fname2' => array( 'donor_data', 'FIRSTNAME' ),
-   'lname2' => array( 'donor_data', 'SURNAME' ),
-   'street2' => array( 'donor_data', 'STREET' ),
-   'city2' => array( 'donor_data', 'CITY' ),
-   'state2' => array( 'donor_data', 'STATE' ),
-   'country2' => array( 'donor_data', 'COUNTRYCODE' ),
-   'zip2' => array( 'donor_data', 'ZIP' ),
+   'postal_code' => array( 'donor_data', 'ZIP' ),
'gateway_txn_id' => array( 'donor_data', 'ORDERID' ),
'response', //? Maybe some dummy value for "found it in the 
audit phase"
-   'currency_code' => array( 'donor_data', 'CURRENCYCODE' ),
+   'currency' => array( 'donor_data', 'CURRENCYCODE' ),
'date' => array( 'contribution_tracking', 'ts' ), 
//double-check how the dates work
);

@@ -1039,7 +1032,7 @@
'type' => wr1_get_negative_type( $wr1 ), 
//refund or chargeback
);
echo print_r( $send_message, true );
-   sendSTOMP( $send_message );
+   globalcollect_audit_send_stomp( 'refund', $send_message 
);
$count += 1;
globalcollect_aud

[MediaWiki-commits] [Gerrit] Add Whirlpool using the password api - change (mediawiki/core)

[CSteipp (Code Review)]

CSteipp has uploaded a new change for review.

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

Change subject: Add Whirlpool using the password api
..

Add Whirlpool using the password api

Demonstration of adding Whirlpool as a hashing option, using the api
from change I0a9c972931a0eff0cfb2619cef3ddffd03710285.

Adds a Whirlpool-based hash, and a type "E", which is the current
default type B, wrapped in the whirlpool-based hash.

Bug: 28419
Change-Id: Ieaae596bc3921ecf5880457f7d4011a01c5fdf15
---
M includes/AutoLoader.php
M includes/DefaultSettings.php
A includes/password/WhirlpoolPassword.php
3 files changed, 74 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/110646/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index bdd114e..a640e86 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -834,6 +834,7 @@
'ParameterizedPassword' => 
'includes/password/ParameterizedPassword.php',
'Password' => 'includes/password/Password.php',
'Pbkdf2Password' => 'includes/password/Pbkdf2Password.php',
+   'WhirlpoolPassword' => 'includes/password/WhirlpoolPassword.php',
'PepperedPassword' => 'includes/password/PepperedPassword.php',
 
# includes/profiler
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8378ec4..6fe37f9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3980,6 +3980,13 @@
'bcrypt',
),
),
+   'E' => array(
+   'class' => 'LayeredParameterizedPassword',
+   'types' => array(
+   'B',
+   'whirlpool',
+   ),
+   ),
'bcrypt' => array(
'class' => 'BcryptPassword',
'cost' => 5,
@@ -3990,6 +3997,10 @@
'cost' => '1',
'length' => '224',
),
+   'whirlpool' => array(
+   'class' => 'WhirlpoolPassword',
+   'cost' => 8,
+   ),
 );
 
 /**
diff --git a/includes/password/WhirlpoolPassword.php 
b/includes/password/WhirlpoolPassword.php
new file mode 100644
index 000..a14a0dd
--- /dev/null
+++ b/includes/password/WhirlpoolPassword.php
@@ -0,0 +1,62 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * A Whirlpool-based password hashing. Implements the Whirlpool bits from Tim's
+ * algorithm described in 
http://www.mail-archive.com/wikitech-l@lists.wikimedia.org/msg08830.html
+ *
+ * @since 1.23
+ */
+class WhirlpoolPassword extends ParameterizedPassword {
+   function getDefaultParams() {
+   return array(
+   'complexity' => $this->config['cost'],
+   );
+   }
+
+   function getDelimiter() {
+   return ':';
+   }
+
+   function parseHash( $hash ) {
+   parent::parseHash( $hash );
+   $this->params['complexity'] = (int)$this->params['complexity'];
+   }
+
+   function crypt( $password ) {
+   // args[0] is the salt
+   if ( count( $this->args ) == 0 ) {
+   $this->args[] = MWCryptRand::generateHex( 8 );
+   }
+   $iter = pow( 2, $this->params['complexity'] );
+   $h = $password;
+   for ( $i = 0; $i < $iter; $i++ ) {
+   $h = hash( 'whirlpool', str_repeat( $h . 
$this->args[0], 100 ), true );
+   $h = substr( $h, 7, 32 );
+   }
+   $this->hash = bin2hex( $h );
+   }
+
+   function isHashContextFree() {
+   return true;
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] Removing dns entries for payments[1-4] - change (operations/dns)

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: Removing dns entries for payments[1-4]
..


Removing dns entries for payments[1-4]

Change-Id: I01c1d69c8c9b859ef9ca508738faddf97d76bca6
---
M templates/10.in-addr.arpa
M templates/152.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
4 files changed, 0 insertions(+), 26 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 013286c..3d5087f 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -218,10 +218,6 @@
 
 ;Payments cluster
 $ORIGIN 9.0.{{ zonename }}.
-1  1H  IN PTR  payments1.pmtpa.wmnet.
-2  1H  IN PTR  payments2.pmtpa.wmnet.
-3  1H  IN PTR  payments3.pmtpa.wmnet.
-4  1H  IN PTR  payments4.pmtpa.wmnet.
 
 ; Snapshot cluster
 $ORIGIN 10.0.{{ zonename }}.
@@ -553,10 +549,6 @@
 41 1H  IN PTR  harmon.mgmt.pmtpa.wmnet.
 42 1H  IN PTR  hooper.mgmt.pmtpa.wmnet.
 44 1H  IN PTR  WMF3914.mgmt.pmtpa.wmnet.
-46 1H  IN PTR  payments1.mgmt.pmtpa.wmnet.
-47 1H  IN PTR  payments2.mgmt.pmtpa.wmnet.
-48 1H  IN PTR  payments3.mgmt.pmtpa.wmnet.
-49 1H  IN PTR  payments4.mgmt.pmtpa.wmnet.
 51 1H  IN PTR  WMF3848.mgmt.pmtpa.wmnet.
 52 1H  IN PTR  WMF3847.mgmt.pmtpa.wmnet.
 53 1H  IN PTR  WMF3846.mgmt.pmtpa.wmnet.
diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index 9ef6da2..f3b661a 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -19,10 +19,6 @@
 
 1  1H IN PTR   vrrp-gw-100.wikimedia.org.
 
-11 1H IN PTR   payments1.wikimedia.org.
-12 1H IN PTR   payments2.wikimedia.org.
-13 1H IN PTR   payments3.wikimedia.org.
-14 1H IN PTR   payments4.wikimedia.org.
 15 1H IN PTR   manutius.wikimedia.org.
 16 1H IN PTR   ssl1.wikimedia.org.
 17 1H IN PTR   ssl2.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index b074f00..ab0bdc1 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -171,10 +171,6 @@
 oxygen 1H  IN A208.80.154.15
 pay-lvs10011H  IN A208.80.155.2
 pay-lvs10021H  IN A208.80.155.3
-payments1  1H  IN A208.80.152.11
-payments2  1H  IN A208.80.152.12
-payments3  1H  IN A208.80.152.13
-payments4  1H  IN A208.80.152.14
 pdf1   1H  IN A208.80.152.155
 pdf2   1H  IN A208.80.152.154
 pdf3   1H  IN A208.80.152.181
diff --git a/templates/wmnet b/templates/wmnet
index 7d4dd5d..22086da 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -237,12 +237,6 @@
 srv300 1H  IN A10.0.8.50
 srv301 1H  IN A10.0.8.51
 
-;payments servers
-payments1  1H  IN A10.0.9.1
-payments2  1H  IN A10.0.9.2
-payments3  1H  IN A10.0.9.3
-payments4  1H  IN A10.0.9.4
-
 ; Network equipment etc.
 
 vl-2-0  1H IN A10.0.0.200
@@ -408,10 +402,6 @@
 WMF38481H  IN A10.1.8.51
 WMF38471H  IN A10.1.8.52
 WMF38461H  IN A10.1.8.53
-payments1  1H  IN A10.1.8.46
-payments2  1H  IN A10.1.8.47
-payments3  1H  IN A10.1.8.48
-payments4  1H  IN A10.1.8.49
 pc11H  IN A10.1.8.101
 pc21H  IN A10.1.8.102
 pc31H  IN A10.1.8.103

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

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

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

[MediaWiki-commits] [Gerrit] blasted white space!!! adding payments1-4 to decom.pp - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: blasted white space!!! adding payments1-4 to decom.pp
..


blasted white space!!! adding payments1-4 to decom.pp

Change-Id: I23dff47b59d3e9d1f326d37f326ff6a171ca71a1
---
M manifests/decommissioning.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index e48682b..b768c77 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -61,6 +61,10 @@
 'ms2',#5994 decommed
 'ms3',
 'ms4',#885  decommed
+'payments1',
+'payments2',
+'payments3',
+'payments4',
 'professor',  #6269 decommed
 'search21',   #6106 decommed search21-36
 'search22',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23dff47b59d3e9d1f326d37f326ff6a171ca71a1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson 
Gerrit-Reviewer: Cmjohnson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] improvement; added some cross-link capabilities and complete... - change (pywikibot...drtrigonbot)

[DrTrigon (Code Review)]

DrTrigon has submitted this change and it was merged.

Change subject: improvement; added some cross-link capabilities and completed 
output view
..


improvement; added some cross-link capabilities and completed output view

Change-Id: If0105ec01f9f1c9acc817f03a64f7084e021f9f8
---
M public_html/cgi-bin/jira2html.xslt
1 file changed, 33 insertions(+), 10 deletions(-)

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



diff --git a/public_html/cgi-bin/jira2html.xslt 
b/public_html/cgi-bin/jira2html.xslt
index 5d39646..43476dd 100644
--- a/public_html/cgi-bin/jira2html.xslt
+++ b/public_html/cgi-bin/jira2html.xslt
@@ -98,13 +98,14 @@
 
 
 
+
 
parent_issue_summary
   
   

https://jira.toolserver.org/browse/
   
-  ??? 
+  (n/a)
 (
   parent_issue_key
  
@@ -288,7 +289,7 @@
Environment:


-
+



@@ -308,7 +309,7 @@
 
 
 https://jira.toolserver.org/images/icons/attach/file.gif"; height="16" 
width="16" alt="File" />
-, 
+ 
 
 
 
@@ -333,14 +334,25 @@
 
 
 
+
 
-
+
+https://jira.toolserver.org/browse/
+   
+   
+ 
+   
+ 
+ 
+   
+ 
+   
 
 
-???
+(n/a)
 
 
-???
+(n/a)
 
 
 
@@ -380,17 +392,18 @@


 
+
 
-???
+...(n/a)
 
 
 Sub-task
 
 
-???
+(n/a)
 
 
-???
+(n/a)
 
 
 
@@ -405,7 +418,17 @@
 :
 
 
-
+
+  
+
+
+   
+   
+  
+  
+
+  
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0105ec01f9f1c9acc817f03a64f7084e021f9f8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/drtrigonbot
Gerrit-Branch: master
Gerrit-Owner: DrTrigon 
Gerrit-Reviewer: DrTrigon 

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

[MediaWiki-commits] [Gerrit] Fix globalusage link - change (mediawiki...MultimediaViewer)

[jenkins-bot (Code Review)]

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

Change subject: Fix globalusage link
..


Fix globalusage link

Change-Id: Iec3aeef2e807fbc65212dbcb156ae5d9bd39bb9c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/44
---
M resources/mmv/mmv.ui.fileUsage.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aarcos: Looks good to me, but someone else must approve
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/mmv/mmv.ui.fileUsage.js 
b/resources/mmv/mmv.ui.fileUsage.js
index 11721c5..e419dc6 100644
--- a/resources/mmv/mmv.ui.fileUsage.js
+++ b/resources/mmv/mmv.ui.fileUsage.js
@@ -197,7 +197,7 @@
// TODO special page name should be localized
return new mw.Uri( mw.config.get( 'wgScript' ) ).extend( {
title: 'Special:GlobalUsage',
-   target: file.getPrefixedDb(),
+   target: file.getMain(),
filterlocal: 1
} ).toString();
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec3aeef2e807fbc65212dbcb156ae5d9bd39bb9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Aarcos 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] improvement; added some cross-link capabilities and complete... - change (pywikibot...drtrigonbot)

[DrTrigon (Code Review)]

DrTrigon has uploaded a new change for review.

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

Change subject: improvement; added some cross-link capabilities and completed 
output view
..

improvement; added some cross-link capabilities and completed output view

Change-Id: If0105ec01f9f1c9acc817f03a64f7084e021f9f8
---
M public_html/cgi-bin/jira2html.xslt
1 file changed, 33 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/drtrigonbot 
refs/changes/45/110645/1

diff --git a/public_html/cgi-bin/jira2html.xslt 
b/public_html/cgi-bin/jira2html.xslt
index 5d39646..43476dd 100644
--- a/public_html/cgi-bin/jira2html.xslt
+++ b/public_html/cgi-bin/jira2html.xslt
@@ -98,13 +98,14 @@
 
 
 
+
 
parent_issue_summary
   
   

https://jira.toolserver.org/browse/
   
-  ??? 
+  (n/a)
 (
   parent_issue_key
  
@@ -288,7 +289,7 @@
Environment:


-
+



@@ -308,7 +309,7 @@
 
 
 https://jira.toolserver.org/images/icons/attach/file.gif"; height="16" 
width="16" alt="File" />
-, 
+ 
 
 
 
@@ -333,14 +334,25 @@
 
 
 
+
 
-
+
+https://jira.toolserver.org/browse/
+   
+   
+ 
+   
+ 
+ 
+   
+ 
+   
 
 
-???
+(n/a)
 
 
-???
+(n/a)
 
 
 
@@ -380,17 +392,18 @@


 
+
 
-???
+...(n/a)
 
 
 Sub-task
 
 
-???
+(n/a)
 
 
-???
+(n/a)
 
 
 
@@ -405,7 +418,17 @@
 :
 
 
-
+
+  
+
+
+   
+   
+  
+  
+
+  
+
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0105ec01f9f1c9acc817f03a64f7084e021f9f8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/drtrigonbot
Gerrit-Branch: master
Gerrit-Owner: DrTrigon 

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

[MediaWiki-commits] [Gerrit] Added --wiki parameter to runJobs.php call - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Added --wiki parameter to runJobs.php call
..

Added --wiki parameter to runJobs.php call

Change-Id: I8f729263397bedf1c293b14704798e7a4ec60581
---
M includes/Wiki.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/110644/1

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 56d23b1..99857d9 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -640,7 +640,8 @@
// Start a background process to run some of the jobs
wfProfileIn( __METHOD__ . '-exec' );
$retVal = 1;
-   $cmd = wfShellWikiCmd( "$IP/maintenance/runJobs.php", 
array( '--maxjobs', $n ) );
+   $cmd = wfShellWikiCmd( "$IP/maintenance/runJobs.php",
+   array( '--wiki', wfWikiID(), '--maxjobs', $n ) 
);
$cmd .= " >" . wfGetNull() . " 2>&1"; // don't hang PHP 
on pipes
if ( wfIsWindows() ) {
// Using START makes this async and also works 
around a bug where using

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

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

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

[MediaWiki-commits] [Gerrit] adding payments1-4 to decom.pp - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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

Change subject: adding payments1-4 to decom.pp
..

adding payments1-4 to decom.pp

Change-Id: I23dff47b59d3e9d1f326d37f326ff6a171ca71a1
---
M manifests/decommissioning.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/110643/1

diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index e48682b..f918a1b 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -61,6 +61,10 @@
 'ms2',#5994 decommed
 'ms3',
 'ms4',#885  decommed
+'payments1',  
+'payments2',
+'payments3',
+'payments4',
 'professor',  #6269 decommed
 'search21',   #6106 decommed search21-36
 'search22',

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

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

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

[MediaWiki-commits] [Gerrit] SQLite compatibility fixes - change (mediawiki...FlaggedRevs)

[Chad (Code Review)]

Chad has submitted this change and it was merged.

Change subject: SQLite compatibility fixes
..


SQLite compatibility fixes

Change-Id: I517dc3c7d63371d23a0b745e4079f4bc5925ae16
---
M backend/FlaggableWikiPage.php
M backend/FlaggedRevision.php
M frontend/specialpages/reports/ReviewedVersions_body.php
3 files changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/backend/FlaggableWikiPage.php b/backend/FlaggableWikiPage.php
index 3f35d68..7e2dad8 100644
--- a/backend/FlaggableWikiPage.php
+++ b/backend/FlaggableWikiPage.php
@@ -315,7 +315,7 @@
'fr_page_id' => $this->getId(),
'rev_page = fr_page_id', // sanity
'rev_id = fr_rev_id',
-   'rev_deleted & ' . Revision::DELETED_TEXT => 0
+   $dbr->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
),
__METHOD__,
array(
@@ -427,7 +427,7 @@
array( 'fr_page_id' => $this->getId(),
'rev_id = fr_rev_id',
'rev_page = fr_page_id',
-   'rev_deleted & ' . 
Revision::DELETED_TEXT => 0
+   $dbw->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
),
__METHOD__,
array( 'ORDER BY' => 'fr_quality DESC', 'LIMIT' 
=> 1 )
@@ -517,7 +517,7 @@
'fr_rev_timestamp > ' . 
$dbw->addQuotes( $higherLevelTS ),
'rev_id = fr_rev_id', // rev exists
'rev_page = fr_page_id', // sanity
-   'rev_deleted & ' . 
Revision::DELETED_TEXT => 0
+   $dbw->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
),
__METHOD__,
array( 'ORDER BY' => 'fr_rev_timestamp DESC', 
'LIMIT' => 1 )
diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 1c4f6a1..0c263aa 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -260,7 +260,7 @@
'fr_page_id' => $pageId,
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
-   'rev_deleted & ' . Revision::DELETED_TEXT => 0
+   $db->bitAnd( 'rev_deleted', Revision::DELETED_TEXT ) . 
' = 0'
);
$options['ORDER BY'] = 'fr_rev_timestamp DESC';
 
diff --git a/frontend/specialpages/reports/ReviewedVersions_body.php 
b/frontend/specialpages/reports/ReviewedVersions_body.php
index 2ec244d..95136b4 100644
--- a/frontend/specialpages/reports/ReviewedVersions_body.php
+++ b/frontend/specialpages/reports/ReviewedVersions_body.php
@@ -89,10 +89,11 @@
}
 
function getQueryInfo() {
+   $db = $this->getDatabase();
$conds = $this->mConds;
$conds['fr_page_id'] = $this->pageID;
$conds[] = 'fr_rev_id = rev_id';
-   $conds[] = 'rev_deleted & ' . Revision::DELETED_TEXT . ' = 0';
+   $conds[] = $db->bitAnd( 'rev_deleted', Revision::DELETED_TEXT ) 
. ' = 0';
$conds[] = 'fr_user = user_id';
return array(
'tables'  => array( 'flaggedrevs', 'revision', 'user' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I517dc3c7d63371d23a0b745e4079f4bc5925ae16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] Fix sidebar problems when there are too many users on chat - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has uploaded a new change for review.

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

Change subject: Fix sidebar problems when there are too many users on chat
..

Fix sidebar problems when there are too many users on chat

I will be adding a close PM button in a little while too

Change-Id: I7eb2579ac8de8b7faa03668f88da774e606fa174
---
M MediaWikiChat.css
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/41/110641/1

diff --git a/MediaWikiChat.css b/MediaWikiChat.css
index 6fdf565..b928d24 100644
--- a/MediaWikiChat.css
+++ b/MediaWikiChat.css
@@ -22,6 +22,8 @@
position: absolute;
left: 67%;
top: 0;
+   height: 450px;
+   overflow-y: auto;
 }
 #mwchat-me {
width: 33%;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7eb2579ac8de8b7faa03668f88da774e606fa174
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 

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

[MediaWiki-commits] [Gerrit] Fix sidebar problems when there are too many users on chat - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has submitted this change and it was merged.

Change subject: Fix sidebar problems when there are too many users on chat
..


Fix sidebar problems when there are too many users on chat

I will be adding a close PM button in a little while too

Change-Id: I7eb2579ac8de8b7faa03668f88da774e606fa174
---
M MediaWikiChat.css
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/MediaWikiChat.css b/MediaWikiChat.css
index 6fdf565..b928d24 100644
--- a/MediaWikiChat.css
+++ b/MediaWikiChat.css
@@ -22,6 +22,8 @@
position: absolute;
left: 67%;
top: 0;
+   height: 450px;
+   overflow-y: auto;
 }
 #mwchat-me {
width: 33%;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7eb2579ac8de8b7faa03668f88da774e606fa174
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 
Gerrit-Reviewer: UltrasonicNXT 

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

[MediaWiki-commits] [Gerrit] SQLite compatibility fixes - change (mediawiki...FlaggedRevs)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: SQLite compatibility fixes
..

SQLite compatibility fixes

Change-Id: I517dc3c7d63371d23a0b745e4079f4bc5925ae16
---
M backend/FlaggableWikiPage.php
M backend/FlaggedRevision.php
M frontend/specialpages/reports/ReviewedVersions_body.php
3 files changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/42/110642/1

diff --git a/backend/FlaggableWikiPage.php b/backend/FlaggableWikiPage.php
index 3f35d68..7e2dad8 100644
--- a/backend/FlaggableWikiPage.php
+++ b/backend/FlaggableWikiPage.php
@@ -315,7 +315,7 @@
'fr_page_id' => $this->getId(),
'rev_page = fr_page_id', // sanity
'rev_id = fr_rev_id',
-   'rev_deleted & ' . Revision::DELETED_TEXT => 0
+   $dbr->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
),
__METHOD__,
array(
@@ -427,7 +427,7 @@
array( 'fr_page_id' => $this->getId(),
'rev_id = fr_rev_id',
'rev_page = fr_page_id',
-   'rev_deleted & ' . 
Revision::DELETED_TEXT => 0
+   $dbw->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
),
__METHOD__,
array( 'ORDER BY' => 'fr_quality DESC', 'LIMIT' 
=> 1 )
@@ -517,7 +517,7 @@
'fr_rev_timestamp > ' . 
$dbw->addQuotes( $higherLevelTS ),
'rev_id = fr_rev_id', // rev exists
'rev_page = fr_page_id', // sanity
-   'rev_deleted & ' . 
Revision::DELETED_TEXT => 0
+   $dbw->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
),
__METHOD__,
array( 'ORDER BY' => 'fr_rev_timestamp DESC', 
'LIMIT' => 1 )
diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 1c4f6a1..0c263aa 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -260,7 +260,7 @@
'fr_page_id' => $pageId,
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
-   'rev_deleted & ' . Revision::DELETED_TEXT => 0
+   $db->bitAnd( 'rev_deleted', Revision::DELETED_TEXT ) . 
' = 0'
);
$options['ORDER BY'] = 'fr_rev_timestamp DESC';
 
diff --git a/frontend/specialpages/reports/ReviewedVersions_body.php 
b/frontend/specialpages/reports/ReviewedVersions_body.php
index 2ec244d..95136b4 100644
--- a/frontend/specialpages/reports/ReviewedVersions_body.php
+++ b/frontend/specialpages/reports/ReviewedVersions_body.php
@@ -89,10 +89,11 @@
}
 
function getQueryInfo() {
+   $db = $this->getDatabase();
$conds = $this->mConds;
$conds['fr_page_id'] = $this->pageID;
$conds[] = 'fr_rev_id = rev_id';
-   $conds[] = 'rev_deleted & ' . Revision::DELETED_TEXT . ' = 0';
+   $conds[] = $db->bitAnd( 'rev_deleted', Revision::DELETED_TEXT ) 
. ' = 0';
$conds[] = 'fr_user = user_id';
return array(
'tables'  => array( 'flaggedrevs', 'revision', 'user' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I517dc3c7d63371d23a0b745e4079f4bc5925ae16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] WIP - Initial debian version - change (analytics/kafkatee)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: WIP - Initial debian version
..

WIP - Initial debian version

Change-Id: I705bcef578872b83cbd96729503b6357adce807a
---
A debian/75-kafkatee.conf
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/etc/kafkatee.conf
A debian/etc/kafkatee.d/input.conf
A debian/etc/kafkatee.d/output.conf
A debian/gbp.conf
A debian/kafkatee.dirs
A debian/kafkatee.install
A debian/kafkatee.logrotate
A debian/kafkatee.postinst
A debian/kafkatee.postrm
A debian/kafkatee.upstart
A debian/rules
A debian/source/format
17 files changed, 561 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/kafkatee 
refs/changes/40/110640/1

diff --git a/debian/75-kafkatee.conf b/debian/75-kafkatee.conf
new file mode 100644
index 000..d9c29ce
--- /dev/null
+++ b/debian/75-kafkatee.conf
@@ -0,0 +1,2 @@
+# rsyslogd kafkatee config.
+if $programname == 'kafkatee' then /var/log/kafkatee.log
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..47c416d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+kafkatee (0.1.0-1~20140130) unstable; urgency=low
+
+  * Initial release
+
+ -- Andrew Otto (WMF)   Thu, 30 Jan 2014 19:12:20 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..c4b1c0c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,30 @@
+Source: kafkatee
+Section: web
+Priority: optional
+Maintainer: Andrew Otto (WMF) 
+Build-Depends: debhelper (>= 9) librdkafka-dev >= 0.8.3, libyajl-dev
+Standards-Version: 3.9.4
+Vcs-Git: https://gerrit.wikimedia.org/r/analytics/kafkatee
+Vcs-Browser: http://git.wikimedia.org/tree/analytics%2Fkafkatee
+
+Package: kafkatee
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Kafka consumer with multiple inputs and outputs
+ kafkatee consumes messages from one or more Kafka topics and writes
+ the messages to one or more outputs - either command pipes or files.
+ .
+ It provides simple transformation from JSON to arbitrary string output
+ controlled through configuration.  Each output has a configurable sample
+ rate.
+ .
+ Features:
+ .
+ - Supported input types: Kafka consumer or piped command.
+ - Supported output types: Piped command or file.
+ - Configuration file syntax is backwards compatible with Wikimedia's udp2log
+ - Configurable output queue size
+ - Memory frugal: message payload is shared by all output queues
+ - Configured with configuration file
+ - Operates as a daemon (daemonization, pidfile)
+ - Closes/stops and reopens/restarts all inputs and outputs on SIGHUP.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8a4de2c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kafkatee
+Source: https://github.com/wikimedia/analytics-kafkatee
+
+License: BSD-2-clause
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  .
+  1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+Files: *
+Copyright: 2014 Wikimedia Foundation, Inc.
+   2014 Magnus Edenhill
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2014 Andrew Otto (WMF) 
+   2014 Wikimedia Foundation, Inc.
+License: BSD-2-clause
diff --git a/debian/etc/kafkatee.conf b/debian/etc/kafkatee.conf
new file mode 100644
index 000..8ab31dd
--- /dev/null
+++ b/debian/etc/kafkatee.conf
@@ -0,0 +1,130 @@
+###
+#

[MediaWiki-commits] [Gerrit] TimeStripper, tzoneFixedOffset are now in pywikibot.textlib - change (pywikibot/core)

[Merlijn van Deen (Code Review)]

Merlijn van Deen has uploaded a new change for review.

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

Change subject: TimeStripper, tzoneFixedOffset are now in pywikibot.textlib
..

TimeStripper, tzoneFixedOffset are now in pywikibot.textlib

This should solve the deadlocks during tests. This was caused by the

Site = pywikibot.Site()

in the import scope of archivebot.py. Calling Site() causes network
communication, which causes deadlocks if this happens during test
loading. During test execution is OK (obviously)

Change-Id: I11d74247613bb16974c883b192e5fc8f90ffd6e5
---
M pywikibot/textlib.py
M scripts/archivebot.py
M tests/timestripper_tests.py
3 files changed, 141 insertions(+), 134 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/39/110639/1

diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index cbaa951..a7cd522 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -19,6 +19,7 @@
 except ImportError:
 mwparserfromhell = False
 import pywikibot
+import datetime
 import re
 try:
 from HTMLParser import HTMLParser
@@ -1106,3 +1107,141 @@
 """Determines whether the page text contains the given section title."""
 m = re.search("=+[ ']*%s[ ']*=+" % section, pagetext)
 return bool(m)
+
+#-
+# Time parsing functionality (Archivebot)
+#-
+
+class tzoneFixedOffset(datetime.tzinfo):
+"""
+Class building tzinfo objects for fixed-offset time zones
+
+@offset: a number indicating fixed offset in minutes east from UTC
+@name: a string with name of the timezone"""
+
+def __init__(self, offset, name):
+self.__offset = datetime.timedelta(minutes=offset)
+self.__name = name
+
+def utcoffset(self, dt):
+return self.__offset
+
+def tzname(self, dt):
+return self.__name
+
+def dst(self, dt):
+return ZERO
+
+def __repr__(self):
+return "%s(%s, %s)" % (
+self.__class__.__name__,
+self.__offset.days * 86400 + self.__offset.seconds,
+self.__name
+)
+
+
+class TimeStripper(object):
+"""
+Find timetstamp in page text and returns it as timezone aware datetime 
object
+"""
+
+def __init__(self, site=None):
+if site is None:
+self.site = pywikibot.getSite()
+else:
+self.site = site
+
+self.origNames2monthNum = {}
+for n, (_long, _short) in enumerate(self.site.months_names):
+self.origNames2monthNum[_long] = n + 1
+self.origNames2monthNum[_short] = n + 1
+
+self.groups = [u'year', u'month',  u'hour',  u'time', u'day', 
u'minute', u'tzinfo']
+
+timeR = r'(?P(?P[0-2]\d)[:\.h](?P[0-5]\d))'
+timeznR = r'\((?P[A-Z]+)\)'
+yearR = r'(?P(19|20)\d\d)'
+monthR = ur'(?P(%s))' % (u'|'.join(self.origNames2monthNum))
+dayR = r'(?P(3[01]|[12]\d|0?[1-9]))'
+
+self.ptimeR = re.compile(timeR)
+self.timeznR = re.compile(timeznR)
+self.yearR = re.compile(yearR)
+self.pmonthR = re.compile(monthR, re.U)
+self.pdayR = re.compile(dayR)
+
+#order is important to avoid mismatch when searching
+self.patterns = [
+self.ptimeR,
+self.timeznR,
+self.yearR,
+self.pmonthR,
+self.pdayR,
+]
+
+def findmarker(self, text, base=u'@@', delta='@'):
+# find a string which is not part of text
+while base in text:
+base += delta
+return base
+
+def last_match_and_replace(self, txt, pat):
+"""
+Take the rightmost match, to prevent spurious earlier matches, and 
replace with marker
+"""
+m = None
+for m in pat.finditer(txt):
+pass
+
+if m:
+marker = self.findmarker(txt)
+txt = pat.sub(marker, txt)
+return (txt, m.groupdict())
+else:
+return (txt, None)
+
+def timestripper(self, line):
+"""
+Find timestamp in line and convert it to time zone aware datetime.
+All the following items must be matched, otherwise None is returned:
+-. year, month, hour, time, day, minute, tzinfo
+
+"""
+_line = line
+#match date fields
+dateDict = dict()
+for pat in self.patterns:
+line, matchDict = self.last_match_and_replace(line, pat)
+if matchDict:
+dateDict.update(matchDict)
+
+#all fields matched -> date valid
+if all(g in dateDict for g in self.groups):
+#remove 'time' key, now splitted in hour/minute and not needed by 
datetime
+del dateDict['time']
+
+#replace month name in original language with month number
+try:
+dateDict['month'] = self.origNames2

[MediaWiki-commits] [Gerrit] Removing dns entries for payments[1-4] - change (operations/dns)

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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

Change subject: Removing dns entries for payments[1-4]
..

Removing dns entries for payments[1-4]

Change-Id: I01c1d69c8c9b859ef9ca508738faddf97d76bca6
---
M templates/10.in-addr.arpa
M templates/152.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
4 files changed, 0 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/38/110638/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 013286c..3d5087f 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -218,10 +218,6 @@
 
 ;Payments cluster
 $ORIGIN 9.0.{{ zonename }}.
-1  1H  IN PTR  payments1.pmtpa.wmnet.
-2  1H  IN PTR  payments2.pmtpa.wmnet.
-3  1H  IN PTR  payments3.pmtpa.wmnet.
-4  1H  IN PTR  payments4.pmtpa.wmnet.
 
 ; Snapshot cluster
 $ORIGIN 10.0.{{ zonename }}.
@@ -553,10 +549,6 @@
 41 1H  IN PTR  harmon.mgmt.pmtpa.wmnet.
 42 1H  IN PTR  hooper.mgmt.pmtpa.wmnet.
 44 1H  IN PTR  WMF3914.mgmt.pmtpa.wmnet.
-46 1H  IN PTR  payments1.mgmt.pmtpa.wmnet.
-47 1H  IN PTR  payments2.mgmt.pmtpa.wmnet.
-48 1H  IN PTR  payments3.mgmt.pmtpa.wmnet.
-49 1H  IN PTR  payments4.mgmt.pmtpa.wmnet.
 51 1H  IN PTR  WMF3848.mgmt.pmtpa.wmnet.
 52 1H  IN PTR  WMF3847.mgmt.pmtpa.wmnet.
 53 1H  IN PTR  WMF3846.mgmt.pmtpa.wmnet.
diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index 9ef6da2..f3b661a 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -19,10 +19,6 @@
 
 1  1H IN PTR   vrrp-gw-100.wikimedia.org.
 
-11 1H IN PTR   payments1.wikimedia.org.
-12 1H IN PTR   payments2.wikimedia.org.
-13 1H IN PTR   payments3.wikimedia.org.
-14 1H IN PTR   payments4.wikimedia.org.
 15 1H IN PTR   manutius.wikimedia.org.
 16 1H IN PTR   ssl1.wikimedia.org.
 17 1H IN PTR   ssl2.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index b074f00..ab0bdc1 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -171,10 +171,6 @@
 oxygen 1H  IN A208.80.154.15
 pay-lvs10011H  IN A208.80.155.2
 pay-lvs10021H  IN A208.80.155.3
-payments1  1H  IN A208.80.152.11
-payments2  1H  IN A208.80.152.12
-payments3  1H  IN A208.80.152.13
-payments4  1H  IN A208.80.152.14
 pdf1   1H  IN A208.80.152.155
 pdf2   1H  IN A208.80.152.154
 pdf3   1H  IN A208.80.152.181
diff --git a/templates/wmnet b/templates/wmnet
index 7d4dd5d..22086da 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -237,12 +237,6 @@
 srv300 1H  IN A10.0.8.50
 srv301 1H  IN A10.0.8.51
 
-;payments servers
-payments1  1H  IN A10.0.9.1
-payments2  1H  IN A10.0.9.2
-payments3  1H  IN A10.0.9.3
-payments4  1H  IN A10.0.9.4
-
 ; Network equipment etc.
 
 vl-2-0  1H IN A10.0.0.200
@@ -408,10 +402,6 @@
 WMF38481H  IN A10.1.8.51
 WMF38471H  IN A10.1.8.52
 WMF38461H  IN A10.1.8.53
-payments1  1H  IN A10.1.8.46
-payments2  1H  IN A10.1.8.47
-payments3  1H  IN A10.1.8.48
-payments4  1H  IN A10.1.8.49
 pc11H  IN A10.1.8.101
 pc21H  IN A10.1.8.102
 pc31H  IN A10.1.8.103

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

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

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

[MediaWiki-commits] [Gerrit] Document $wgResourceLoaderMaxage in DefaultSettings.php - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Document $wgResourceLoaderMaxage in DefaultSettings.php
..

Document $wgResourceLoaderMaxage in DefaultSettings.php

To have a start and to remove the todo.

Change-Id: I62421f1399c0f3e77238c39322028b969c0e925f
---
M includes/DefaultSettings.php
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/110637/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 326a1c2..872e41d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3142,14 +3142,23 @@
 
 /**
  * Maximum time in seconds to cache resources served by the resource loader.
+ * Used to set last modified headers (max-age/s-maxage).
  *
- * @todo Document array structure
+ * Following options to distinguish:
+ * 'versioned': Used for modules with a version, because changing version
+ *  numbers causes cache misses. This has normally long expiry 
time.
+ * 'unversioned': Used for modules without a version to progate changes
+ *quickly to clients. Also used for modules with errors to
+ *recover quickly. This has normally short expiry time.
+ *
+ * Expiry time for the options to distinguish:
+ * 'server': Squid/Varnish but also any other public proxy cache between the
+ *   client and MediaWiki.
+ * 'client': On the client side (e.g. in the browser cache).
  */
 $wgResourceLoaderMaxage = array(
'versioned' => array(
-   // Squid/Varnish but also any other public proxy cache between 
the client and MediaWiki
'server' => 30 * 24 * 60 * 60, // 30 days
-   // On the client side (e.g. in the browser cache).
'client' => 30 * 24 * 60 * 60, // 30 days
),
'unversioned' => array(

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

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

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

[MediaWiki-commits] [Gerrit] QA: Do not create bogus pages like Selenium_Edit_Test in prod - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: QA: Do not create bogus pages like Selenium_Edit_Test in prod
..


QA: Do not create bogus pages like Selenium_Edit_Test in prod

Change-Id: Ifeba04545cdee34315dbcb6b74663103dcb0750c
---
M tests/browser/features/editor-ve.feature
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/features/editor-ve.feature 
b/tests/browser/features/editor-ve.feature
index bb1b535..ed9a4a0 100644
--- a/tests/browser/features/editor-ve.feature
+++ b/tests/browser/features/editor-ve.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org
 Feature: VisualEditor
 
 @wip

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeba04545cdee34315dbcb6b74663103dcb0750c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Edit conflicts - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Edit conflicts
..


Edit conflicts

Done:
* Header: Non-JS
* Header: JS
* Title: Non-JS
* Title: JS
* Post: Non-JS
* Post: JS

Note: there's some duplication of tipsy code. Not sure how I feel about that.

Change-Id: I70fc7384eb0fb9929db0ad478dc624a22f7fe6a5
---
M Resources.php
M includes/Block/Header.php
M includes/Block/Topic.php
M modules/base/action.js
M modules/base/ext.flow.base.js
M modules/base/styles/actionbox.less
M modules/base/ui-functions.js
M modules/discussion/post.js
M modules/discussion/topic.js
M modules/header/forms.js
M templates/edit-header.html.php
M templates/edit-post.html.php
M templates/edit-title.html.php
13 files changed, 368 insertions(+), 29 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index c3f97e4..1f7d3e5 100644
--- a/Resources.php
+++ b/Resources.php
@@ -33,6 +33,7 @@
'mediawiki.ui',
'mediawiki.api',
'jquery.json',
+   'jquery.tipsy',
),
'messages' => array(
'flow-preview',
@@ -48,6 +49,8 @@
),
'messages' => array(
'flow-error-other',
+   'flow-edit-header-submit',
+   'flow-edit-header-submit-overwrite',
),
),
'ext.flow.discussion' => $flowResourceTemplate + array(
@@ -87,10 +90,11 @@
'flow-error-external',
'flow-error-external-multi',
'flow-edit-title-submit',
+   'flow-edit-title-submit-overwrite',
'flow-edit-post-submit',
+   'flow-edit-post-submit-overwrite',
'flow-paging-fwd',
'flow-paging-rev',
-   'flow-edit-header-submit',
'flow-post-moderated-toggle-show',
'flow-post-moderated-toggle-hide',
'flow-terms-of-use-edit',
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 3786b07..eda5f82 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -76,7 +76,8 @@
// handing user back to specific dialog 
indicating race condition
$this->addError(
'prev_revision',
-   wfMessage( 
'flow-error-prev-revision-mismatch' )->params( 
$this->submitted['prev_revision'], $this->header->getRevisionId()->getHex() )
+   wfMessage( 
'flow-error-prev-revision-mismatch' )->params( 
$this->submitted['prev_revision'], $this->header->getRevisionId()->getHex() ),
+   array( 'revision_id' => 
$this->header->getRevisionId()->getHex() ) // save current revision ID
);
}
 
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index f81b43c..2796220 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -130,14 +130,30 @@
if ( $len > PostRevision::MAX_TOPIC_LENGTH ) {
$this->addError( 'content', wfMessage( 
'flow-error-title-too-long', PostRevision::MAX_TOPIC_LENGTH ) );
return;
-   }
-   $topicTitle = $this->loadTopicTitle();
-   if ( !$topicTitle ) {
-   throw new InvalidInputException( 'No revision 
associated with workflow?', 'missing-revision' );
-   }
-   if ( !$this->permissions->isAllowed( $topicTitle, 'edit-title' 
) ) {
-   $this->addError( 'permissions', wfMessage( 
'flow-error-not-allowed' ) );
+   } elseif ( empty( $this->submitted['prev_revision'] ) ) {
+   $this->addError( 'prev_revision', wfMessage( 
'flow-error-missing-prev-revision-identifier' ) );
return;
+   } else {
+   $topicTitle = $this->loadTopicTitle();
+   if ( !$topicTitle ) {
+   throw new InvalidInputException( 'No revision 
associated with workflow?', 'missing-revision' );
+   }
+   if ( !$this->permissions->isAllowed( $topicTitle, 
'edit-title' ) ) {
+   $this->addError( 'permissions', wfMessage( 
'flow-error-not-allowed' ) );
+   return;
+   } elseif ( $topicTitle->getRevisionId()->getHex() !== 
$this->submitted['prev_revision'] ) {
+   // This is a reasonably effective way to ensur

[MediaWiki-commits] [Gerrit] Do not create bogus pages like Selenium_Edit_Test in prod - change (mediawiki...MobileFrontend)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

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

Change subject: Do not create bogus pages like Selenium_Edit_Test in prod
..

Do not create bogus pages like Selenium_Edit_Test in prod

Change-Id: Ifeba04545cdee34315dbcb6b74663103dcb0750c
---
M tests/browser/features/editor-ve.feature
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/editor-ve.feature 
b/tests/browser/features/editor-ve.feature
index bb1b535..ed9a4a0 100644
--- a/tests/browser/features/editor-ve.feature
+++ b/tests/browser/features/editor-ve.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org
 Feature: VisualEditor
 
 @wip

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeba04545cdee34315dbcb6b74663103dcb0750c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 

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

[MediaWiki-commits] [Gerrit] Now supporting 'include /etc/kafkatee.d/*.conf' style glob m... - change (analytics/kafkatee)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Now supporting 'include /etc/kafkatee.d/*.conf' style glob 
matches for config includes
..

Now supporting 'include /etc/kafkatee.d/*.conf' style glob matches for config 
includes

Change-Id: I8dfb3bb817af122d59de57dae35d0792349c995b
---
M ezd.c
1 file changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/kafkatee 
refs/changes/35/110635/1

diff --git a/ezd.c b/ezd.c
index 2f295dc..e5a90da 100644
--- a/ezd.c
+++ b/ezd.c
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -197,6 +198,10 @@
char buf[8192];
int line = 0;
static int inc_depth = 0;
+   
+   glob_t glob_matches;
+   // iterator index in glob_matches.gl_pathv
+   int g = 0;
 
if (!(fp = fopen(path, "r"))) {
snprintf(errstr, errstr_size,
@@ -290,12 +295,25 @@
return -1;
}
 
-   if (ezd_conf_file_read(t, conf_set_cb,
-  errstr+errof, errstr_size-errof,
-  opaque) == -1) {
+   // Read in matching include files.
+   if (glob(t, GLOB_ERR, NULL, &glob_matches) != 0) {
+   snprintf(errstr+errof, errstr_size-errof,
+"Failed to read include file pattern 
'%s'", t);
inc_depth--;
return -1;
+}
+
+   // For each matched include file,
+   // call ezd_conf_file_read
+   for (g = 0; g < glob_matches.gl_pathc; g++) {
+   if 
(ezd_conf_file_read(glob_matches.gl_pathv[g], conf_set_cb,
+   errstr+errof, errstr_size-errof,
+   opaque) == -1) {
+   inc_depth--;
+   return -1;
+   }
}
+globfree(&glob_matches);
 
continue;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dfb3bb817af122d59de57dae35d0792349c995b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/kafkatee
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] Fix search bar not being shown - change (mediawiki...LiquidThreads)

[jenkins-bot (Code Review)]

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

Change subject: Fix search bar not being shown
..


Fix search bar not being shown

Lucene might be $wgSearchType, not just in $wgSearchTypeAlternatives

Bug: 60691
Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
---
M pages/TalkpageView.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index acc80da..b3f0048 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -308,7 +308,7 @@
}
 
global $wgSearchTypeAlternatives;
-   if ( in_array( "LuceneSearch", $wgSearchTypeAlternatives ?: 
array() ) ) {
+   if ( $wgSearchType == "LuceneSearch" || in_array( 
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: wmf/1.23wmf12
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Code style fixes to ApiBase::requireAtLeastOneParameter - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Code style fixes to ApiBase::requireAtLeastOneParameter
..


Code style fixes to ApiBase::requireAtLeastOneParameter

Fixes to patch that introduced ApiBase::requireAtLeastOneParameter.
Includes line breaks, code formatting, and documentation fixes.

Change-Id: I1a2faebf7cc9a2126def66d8a4ce64dbfa84059b
Follows-Up: Iae6649ed503fdbf14 (5e7a9c6f8e66de344e)
---
M includes/api/ApiBase.php
1 file changed, 16 insertions(+), 6 deletions(-)

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



diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index c1a4cd3..e610d19 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -803,25 +803,32 @@
 
/**
 * Die if none of a certain set of parameters is set and not false.
-* @param array $params of parameter names
+*
+* @since 1.23
+* @param array $params User provided set of parameters
+* @param string ... List of parameter names to check
 */
public function requireAtLeastOneParameter( $params ) {
$required = func_get_args();
array_shift( $required );
$p = $this->getModulePrefix();
 
-   $intersection = array_intersect( array_keys( array_filter( 
$params,
-   array( $this, "parameterNotEmpty" ) ) ), $required );
+   $intersection = array_intersect(
+   array_keys( array_filter( $params, array( $this, 
"parameterNotEmpty" ) ) ),
+   $required
+   );
 
if ( count( $intersection ) == 0 ) {
-   $this->dieUsage( "At least one of the parameters {$p}" 
. implode( ", {$p}", $required ) . ' is required', "{$p}missingparam" );
+   $this->dieUsage( "At least one of the parameters {$p}" .
+   implode( ", {$p}", $required ) . ' is 
required', "{$p}missingparam" );
}
}
 
/**
 * Generates the possible errors requireAtLeastOneParameter() can die 
with
 *
-* @param $params array
+* @since 1.23
+* @param $params array Array of parameter key names
 * @return array
 */
public function getRequireAtLeastOneParameterErrorMessages( $params ) {
@@ -829,7 +836,10 @@
$params = implode( ", {$p}", $params );
 
return array(
-   array( 'code' => "{$p}missingparam", 'info' => "At 
least one of the parameters {$p}{$params} is required" ),
+   array(
+   'code' => "{$p}missingparam",
+   'info' => "At least one of the parameters 
{$p}{$params} is required",
+   ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a2faebf7cc9a2126def66d8a4ce64dbfa84059b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Parent5446 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix search bar not being shown - change (mediawiki...LiquidThreads)

[jenkins-bot (Code Review)]

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

Change subject: Fix search bar not being shown
..


Fix search bar not being shown

Lucene might be $wgSearchType, not just in $wgSearchTypeAlternatives

Bug: 60691
Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
(cherry picked from commit d7422fd18e3e55206ebdfa5d130c68809d1972b7)
---
M pages/TalkpageView.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index acc80da..b3f0048 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -308,7 +308,7 @@
}
 
global $wgSearchTypeAlternatives;
-   if ( in_array( "LuceneSearch", $wgSearchTypeAlternatives ?: 
array() ) ) {
+   if ( $wgSearchType == "LuceneSearch" || in_array( 
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix search bar not being shown - change (mediawiki...LiquidThreads)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Fix search bar not being shown
..

Fix search bar not being shown

Lucene might be $wgSearchType, not just in $wgSearchTypeAlternatives

Bug: 60691
Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
(cherry picked from commit d7422fd18e3e55206ebdfa5d130c68809d1972b7)
---
M pages/TalkpageView.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index acc80da..b3f0048 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -308,7 +308,7 @@
}
 
global $wgSearchTypeAlternatives;
-   if ( in_array( "LuceneSearch", $wgSearchTypeAlternatives ?: 
array() ) ) {
+   if ( $wgSearchType == "LuceneSearch" || in_array( 
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix search bar not being shown - change (mediawiki...LiquidThreads)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Fix search bar not being shown
..

Fix search bar not being shown

Lucene might be $wgSearchType, not just in $wgSearchTypeAlternatives

Bug: 60691
Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
---
M pages/TalkpageView.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads 
refs/changes/33/110633/1

diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index acc80da..b3f0048 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -308,7 +308,7 @@
}
 
global $wgSearchTypeAlternatives;
-   if ( in_array( "LuceneSearch", $wgSearchTypeAlternatives ?: 
array() ) ) {
+   if ( $wgSearchType == "LuceneSearch" || in_array( 
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: wmf/1.23wmf12
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix search bar not being shown - change (mediawiki...LiquidThreads)

[jenkins-bot (Code Review)]

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

Change subject: Fix search bar not being shown
..


Fix search bar not being shown

Lucene might be $wgSearchType, not just in $wgSearchTypeAlternatives

Bug: 60691
Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
---
M pages/TalkpageView.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index b3410b5..a33eed9 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -309,7 +309,7 @@
}
 
global $wgSearchTypeAlternatives;
-   if ( in_array( "LuceneSearch", $wgSearchTypeAlternatives ?: 
array() ) ) {
+   if ( $wgSearchType == "LuceneSearch" || in_array( 
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

Change subject: Update Wikidata
..


Update Wikidata

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

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



diff --git a/extensions/Wikidata b/extensions/Wikidata
index 4841db5..85dfa2d 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit 4841db5cb16a4e5542ab74e455fcd7452748f2ae
+Subproject commit 85dfa2d113b4427397d8a392b9e72eb5e978fbf8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab3e51adf8d71834f22f0eaa1023b958d5fdb109
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf12
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Story 1610: Promote already logged in message to stable - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Story 1610: Promote already logged in message to stable
..


Story 1610: Promote already logged in message to stable

Remove standard message box when logged in message shows.

Change-Id: I3a22e2a2e5285fd5ccec8139c2e1dcd6e35029e9
---
M includes/skins/UserLoginAndCreateTemplate.php
M tests/browser/features/login.feature
2 files changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/includes/skins/UserLoginAndCreateTemplate.php 
b/includes/skins/UserLoginAndCreateTemplate.php
index 3f63a04..7e80ba8 100644
--- a/includes/skins/UserLoginAndCreateTemplate.php
+++ b/includes/skins/UserLoginAndCreateTemplate.php
@@ -39,7 +39,7 @@
$msgBox = ''; // placeholder for displaying any login-related 
system messages (eg errors)
 
// Render logged-in notice (beta/alpha)
-   if ( MobileContext::singleton()->isBetaGroupMember() && 
$this->data['loggedin'] ) {
+   if ( $this->data['loggedin'] ) {
$msgBox .= Html::element( 'div', array( 'class' => 
'alert warning' ),
wfMessage( 'userlogin-loggedin' )->params(
$this->data['loggedinuser'] )->parse() 
);
@@ -157,14 +157,16 @@
 *
 */
protected function renderGuiderMessage() {
-   $msgs = $this->getGuiderMessage();
-   if ( $msgs[0] ) {
-   echo Html::openElement( 'div', array( 'class' => 
'headmsg' ) );
-   echo Html::element( 'strong', array(), $msgs[0] );
-   if ( $msgs[1] ) {
-   echo Html::element( 'div', array(), $msgs[1] );
+   if ( !$this->data['loggedin'] ) {
+   $msgs = $this->getGuiderMessage();
+   if ( $msgs[0] ) {
+   echo Html::openElement( 'div', array( 'class' 
=> 'headmsg' ) );
+   echo Html::element( 'strong', array(), $msgs[0] 
);
+   if ( $msgs[1] ) {
+   echo Html::element( 'div', array(), 
$msgs[1] );
+   }
+   echo Html::closeElement( 'div' );
}
-   echo Html::closeElement( 'div' );
}
}
 
diff --git a/tests/browser/features/login.feature 
b/tests/browser/features/login.feature
index 5b46a35..3ac3a9b 100644
--- a/tests/browser/features/login.feature
+++ b/tests/browser/features/login.feature
@@ -7,7 +7,6 @@
 Then I see a message box at the top of the login page
   And I do not see a message warning me I am already logged in
 
-  @wip
   Scenario: Already logged in
 Given I am logged into the mobile website
 When I go to the login page

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

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

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

[MediaWiki-commits] [Gerrit] QA: Add browser tests for story 1610 - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: QA: Add browser tests for story 1610
..


QA: Add browser tests for story 1610

Define expected login behaviour for anon users and authenticated
users on login screen.

Change-Id: If0c7a7886c7a0c1ea56ffdcf59cf39236917bb6c
---
A tests/browser/features/login.feature
M tests/browser/features/step_definitions/common_steps.rb
A tests/browser/features/step_definitions/login_steps.rb
M tests/browser/features/support/pages/login_page.rb
4 files changed, 37 insertions(+), 0 deletions(-)

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



diff --git a/tests/browser/features/login.feature 
b/tests/browser/features/login.feature
new file mode 100644
index 000..5b46a35
--- /dev/null
+++ b/tests/browser/features/login.feature
@@ -0,0 +1,15 @@
+@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+Feature: Login
+
+  Scenario: Not logged in
+Given I am not logged in
+When I go to the login page
+Then I see a message box at the top of the login page
+  And I do not see a message warning me I am already logged in
+
+  @wip
+  Scenario: Already logged in
+Given I am logged into the mobile website
+When I go to the login page
+Then I do not see a message box at the top of the login page
+  And I see a message warning me I am already logged in
diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 16e0221..d9ed5dc 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -38,6 +38,10 @@
   on(LoginPage).login_with(ENV["MEDIAWIKI_USER"], ENV["MEDIAWIKI_PASSWORD"])
 end
 
+When /^I go to the login page$/ do
+  visit(LoginPage)
+end
+
 Given /^I am in beta mode$/ do
   visit(BetaPage) do |page|
 page.beta_element.click
diff --git a/tests/browser/features/step_definitions/login_steps.rb 
b/tests/browser/features/step_definitions/login_steps.rb
new file mode 100644
index 000..20a4e27
--- /dev/null
+++ b/tests/browser/features/step_definitions/login_steps.rb
@@ -0,0 +1,16 @@
+Then(/^I see a message box at the top of the login page$/) do
+  on(LoginPage).message_box_element.should be_visible
+end
+
+Then(/^I do not see a message box at the top of the login page$/) do
+  on(LoginPage).message_box_element.should_not be_visible
+end
+
+Then(/^I see a message warning me I am already logged in$/) do
+  on(LoginPage).warning_box_element.should be_visible
+end
+
+Then(/^I do not see a message warning me I am already logged in$/) do
+  on(LoginPage).warning_box_element.should_not be_visible
+end
+
diff --git a/tests/browser/features/support/pages/login_page.rb 
b/tests/browser/features/support/pages/login_page.rb
index fb5da2b..389f108 100644
--- a/tests/browser/features/support/pages/login_page.rb
+++ b/tests/browser/features/support/pages/login_page.rb
@@ -15,6 +15,8 @@
   a(:login_wl, class: "button")
   button(:signup_submit, id:"wpCreateaccount")
   a(:create_account_link, text: "Create account")
+  div(:message_box, class:"headmsg")
+  div(:warning_box, class:"alert warning")
 
   def logged_in_as_element
 @browser.div(id: "mw-content-text").p.b

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

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

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

[MediaWiki-commits] [Gerrit] Partially revert I4e395394a, keeping only JavaScript part - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: Partially revert I4e395394a, keeping only JavaScript part
..


Partially revert I4e395394a, keeping only JavaScript part

Change-Id: Ia1a6df88f613b302c060279e8d90e0166443034e
---
M composer.lock
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
5 files changed, 13 insertions(+), 175 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index f7f50f1..2f7a4a7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -847,12 +847,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "2f2bc29294d0deb23984762667612d6d6f3ff346"
+"reference": "6560dd64e31fba3ae2a14ac3cadf6a38e26e474e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2f2bc29294d0deb23984762667612d6d6f3ff346";,
-"reference": "2f2bc29294d0deb23984762667612d6d6f3ff346",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6560dd64e31fba3ae2a14ac3cadf6a38e26e474e";,
+"reference": "6560dd64e31fba3ae2a14ac3cadf6a38e26e474e",
 "shasum": ""
 },
 "require": {
@@ -908,7 +908,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2014-01-31 10:14:02"
+"time": "2014-01-31 00:55:14"
 }
 ],
 "packages-dev": [
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 744a5ba..ec4d4f2 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit31a19db2fd84a7265122d39d4284f8fb::getLoader();
+return ComposerAutoloaderInitca1cf753f323c06d02cc6cbc9ca2c786::getLoader();
diff --git a/vendor/composer/autoload_classmap.php 
b/vendor/composer/autoload_classmap.php
index c0cec0e..b247377 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,66 +7,9 @@
 
 return array(
 'Comparable' => $vendorDir . 
'/data-values/data-values/src/interfaces/Comparable.php',
-'Composer\\Installers\\AglInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/AglInstaller.php',
-'Composer\\Installers\\AnnotateCmsInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/AnnotateCmsInstaller.php',
-'Composer\\Installers\\BaseInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/BaseInstaller.php',
-'Composer\\Installers\\CakePHPInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CakePHPInstaller.php',
-'Composer\\Installers\\CodeIgniterInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CodeIgniterInstaller.php',
-'Composer\\Installers\\Concrete5Installer' => $vendorDir . 
'/composer/installers/src/Composer/Installers/Concrete5Installer.php',
-'Composer\\Installers\\CraftInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CraftInstaller.php',
-'Composer\\Installers\\CroogoInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CroogoInstaller.php',
-'Composer\\Installers\\DrupalInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/DrupalInstaller.php',
-'Composer\\Installers\\ElggInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/ElggInstaller.php',
-'Composer\\Installers\\FuelInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/FuelInstaller.php',
-'Composer\\Installers\\HuradInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/HuradInstaller.php',
-'Composer\\Installers\\Installer' => $vendorDir . 
'/composer/installers/src/Composer/Installers/Installer.php',
-'Composer\\Installers\\JoomlaInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/JoomlaInstaller.php',
-'Composer\\Installers\\KohanaInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/KohanaInstaller.php',
-'Composer\\Installers\\LaravelInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/LaravelInstaller.php',
-'Composer\\Installers\\LithiumInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/LithiumInstaller.php',
-'Composer\\Installers\\MODULEWorkInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/MODULEWorkInstaller.php',
-'Composer\\Installers\\MODXEvoInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers

[MediaWiki-commits] [Gerrit] Update source metadata headers - change (wikimedia...tools)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Update source metadata headers
..


Update source metadata headers

Change-Id: I9f30f9ce163105882c0ba60913df1107ca4c430b
---
A process/version_stamp.py
M queue/stomp_wrap.py
A queue/tests/__init__.py
A queue/tests/test_stomp_wrap.py
4 files changed, 63 insertions(+), 15 deletions(-)

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



diff --git a/process/version_stamp.py b/process/version_stamp.py
new file mode 100644
index 000..480cf43
--- /dev/null
+++ b/process/version_stamp.py
@@ -0,0 +1,15 @@
+import os.path
+
+cached_revision = None
+
+def source_revision():
+global cached_revision
+
+if not cached_revision:
+toolsRootDir = 
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+stompPath = os.path.join(toolsRootDir, '.version-stamp')
+if os.path.exists(stompPath):
+cached_revision = file(stompPath, "r").read().strip()
+else:
+cached_revision = 'unknown'
+return cached_revision
diff --git a/queue/stomp_wrap.py b/queue/stomp_wrap.py
index f8c515e..31d61ac 100644
--- a/queue/stomp_wrap.py
+++ b/queue/stomp_wrap.py
@@ -1,17 +1,21 @@
 from process.globals import config
 from process.logging import Logger as log
+import process.version_stamp
 
 import os, os.path
 import sys
 import json
+import socket
+import time
 from stompy import Stomp as DistStomp
 
 class Stomp(object):
 conn = None
 
 def __init__(self):
-self.conn = DistStomp(config.stomp.server, config.stomp.port)
-self.conn.connect()
+if not config.no_effect:
+self.conn = DistStomp(config.stomp.server, config.stomp.port)
+self.conn.connect()
 
 def __del__(self):
 if self.conn:
@@ -21,22 +25,34 @@
 import time
 time.sleep(1)
 
-def send(self, msg, queue_key):
+def send(self, queue_key, body):
 if config.no_effect:
-log.info("not queueing message. " + json.dumps(msg))
+log.info("not queueing message. " + json.dumps(body))
 return
 
-meta = {
-'source-app': os.path.basename(sys.argv[0]),
-'source-pid': os.getpid(),
+self.conn.send(self.create_message(queue_key, body))
+
+def create_message(self, queue_key, body):
+msg = {
 'destination': config.stomp.queues[queue_key],
 'persistent': 'true',
+} + Stomp.source_meta()
+
+if 'gateway' in body and 'gateway_txn_id' in body:
+msg['correlation-id'] = '{gw}-{id}'.format(gw=body['gateway'], 
id=body['gateway_txn_id'])
+
+msg.update({'body': json.dumps(body)})
+
+return msg
+
+@staticmethod
+def source_meta():
+return {
+'source_name': os.path.basename(sys.argv[0]),
+# FIXME: the controlling script should pass its own source_type
+'source_type': 'audit',
+'source_run_id': os.getpid(),
+'source_version': process.version_stamp.source_revision(),
+'source_enqueued_time': time.time(),
+'source_host': socket.gethostname(),
 }
-
-if 'gateway' in msg and 'gateway_txn_id' in msg:
-meta['correlation-id'] = '{gw}-{id}'.format(gw=msg['gateway'], 
id=msg['gateway_txn_id'])
-
-#log.debug("sending %s %s" % (meta, msg))
-
-meta.update({'body': json.dumps(msg)})
-self.conn.send(meta)
diff --git a/queue/tests/__init__.py b/queue/tests/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/queue/tests/__init__.py
diff --git a/queue/tests/test_stomp_wrap.py b/queue/tests/test_stomp_wrap.py
new file mode 100644
index 000..7c77877
--- /dev/null
+++ b/queue/tests/test_stomp_wrap.py
@@ -0,0 +1,17 @@
+import unittest
+import time
+
+from queue.stomp_wrap import Stomp
+
+class TestStomp(unittest.TestCase):
+def test_source_meta(self):
+meta = Stomp.source_meta()
+self.assertIsNotNone(meta['source_name'])
+self.assertEqual('audit', meta['source_type'])
+self.assertTrue(int(meta['source_run_id']) > 0)
+self.assertIsNotNone(meta['source_version'])
+self.assertTrue(meta['source_enqueued_time'] >= (time.time() - 60))
+self.assertIsNotNone(meta['source_host'])
+
+if __name__ == '__main__':
+unittest.main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f30f9ce163105882c0ba60913df1107ca4c430b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wik

[MediaWiki-commits] [Gerrit] tag now only added to XML if there's a value - change (mediawiki...SemanticMediaWiki)

[jenkins-bot (Code Review)]

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

Change subject:  tag now only added to XML if there's a value
..


 tag now only added to XML if there's a value

Change-Id: I2b061f3266c3ea367eb6fb689f69706a0a9b1c0a
---
M includes/SMW_PageSchemas.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/SMW_PageSchemas.php b/includes/SMW_PageSchemas.php
index 6c7bef8..b7b3cd5 100644
--- a/includes/SMW_PageSchemas.php
+++ b/includes/SMW_PageSchemas.php
@@ -146,7 +146,9 @@
} elseif ( substr( $var, 0, 18 ) == 
'smw_property_type_'){
$xml .= '' . $val . '';
} elseif ( substr( $var, 0, 16 ) == 'smw_linked_form_') 
{
-   $xml .= '' . $val . '';
+   if ( $val !== '' ) {
+   $xml .= '' . $val . 
'';
+   }
} elseif ( substr( $var, 0, 11 ) == 'smw_values_') {
if ( $val !== '' ) {
// replace the comma substitution 
character that has no chance of

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b061f3266c3ea367eb6fb689f69706a0a9b1c0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tag now only added to XML if there's a value - change (mediawiki...SemanticMediaWiki)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject:  tag now only added to XML if there's a value
..

 tag now only added to XML if there's a value

Change-Id: I2b061f3266c3ea367eb6fb689f69706a0a9b1c0a
---
M includes/SMW_PageSchemas.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/SMW_PageSchemas.php b/includes/SMW_PageSchemas.php
index 6c7bef8..b7b3cd5 100644
--- a/includes/SMW_PageSchemas.php
+++ b/includes/SMW_PageSchemas.php
@@ -146,7 +146,9 @@
} elseif ( substr( $var, 0, 18 ) == 
'smw_property_type_'){
$xml .= '' . $val . '';
} elseif ( substr( $var, 0, 16 ) == 'smw_linked_form_') 
{
-   $xml .= '' . $val . '';
+   if ( $val !== '' ) {
+   $xml .= '' . $val . 
'';
+   }
} elseif ( substr( $var, 0, 11 ) == 'smw_values_') {
if ( $val !== '' ) {
// replace the comma substitution 
character that has no chance of

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b061f3266c3ea367eb6fb689f69706a0a9b1c0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] QA: Add tests for Story 1609 captcha refresh - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: QA: Add tests for Story 1609 captcha refresh
..


QA: Add tests for Story 1609 captcha refresh

Change-Id: Ib9d3d4281f0c247319dcd751ab9a2d12828e09be
---
M tests/browser/README.mediawiki
M tests/browser/features/create_account_failure_messages.feature
M 
tests/browser/features/step_definitions/create_account_failure_messages_steps.rb
M tests/browser/features/support/pages/create_account_page.rb
4 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
index df010f3..de2f980 100644
--- a/tests/browser/README.mediawiki
+++ b/tests/browser/README.mediawiki
@@ -9,6 +9,8 @@
 an edit count of greater than 0
 * Ensure the Main Page has languages enabled
 * Ensure there is a Barack Obama article with the content
+* Ensure you have [//www.mediawiki.org/wiki/Extension:ConfirmEdit 
Extension:ConfirmEdit] installed
+** and setup with FancyCaptcha
 
   == Presidential_campaigns ==
   Test
diff --git a/tests/browser/features/create_account_failure_messages.feature 
b/tests/browser/features/create_account_failure_messages.feature
index 2ecfe9b..f64f399 100644
--- a/tests/browser/features/create_account_failure_messages.feature
+++ b/tests/browser/features/create_account_failure_messages.feature
@@ -1,5 +1,10 @@
 @en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org
 Feature: Create failure messages
+  @wip
+  Scenario: Can refresh captcha
+Given that I am on the User login page
+  And I click Create Account
+Then I see the refresh captcha icon
 
   Scenario: Create account password mismatch message
 Given that I am on the User login page
diff --git 
a/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb
 
b/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb
index e6a8908..d908e45 100644
--- 
a/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb
+++ 
b/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb
@@ -6,6 +6,10 @@
   on(LoginPage).create_account_link_element.when_present.click
 end
 
+Then(/^I see the refresh captcha icon$/) do
+  on(CreateAccountPage).refresh_captcha_element.when_present.should exist
+end
+
 Given(/^I type (.+) into Username field$/) do |username|
   on(CreateAccountPage).username_field_element.when_present.send_keys(username)
 end
diff --git a/tests/browser/features/support/pages/create_account_page.rb 
b/tests/browser/features/support/pages/create_account_page.rb
index 1e3746a..901309d 100644
--- a/tests/browser/features/support/pages/create_account_page.rb
+++ b/tests/browser/features/support/pages/create_account_page.rb
@@ -7,4 +7,5 @@
   button(:sign_up, id: "wpCreateaccount")
   div(:error_message, class: "alert error")
   text_field(:confirmation_field, id: "wpCaptchaWord")
+  div(:refresh_captcha, id:"mf-captcha-reload-container")
 end

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

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

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

[MediaWiki-commits] [Gerrit] Story 1609: Push captcha refresh to stable - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Story 1609: Push captcha refresh to stable
..


Story 1609: Push captcha refresh to stable

Change-Id: Ic149392739ec0f98fc612ae07346488d2e537ad9
---
M includes/skins/UserAccountCreateMobileTemplate.php
M tests/browser/features/create_account_failure_messages.feature
2 files changed, 15 insertions(+), 19 deletions(-)

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



diff --git a/includes/skins/UserAccountCreateMobileTemplate.php 
b/includes/skins/UserAccountCreateMobileTemplate.php
index 743e214..d80f8fc 100644
--- a/includes/skins/UserAccountCreateMobileTemplate.php
+++ b/includes/skins/UserAccountCreateMobileTemplate.php
@@ -117,24 +117,21 @@
$captchaSrc = SpecialPage::getTitleFor( 'Captcha', 'image' 
)->getLocalUrl( array( 'wpCaptchaId' => $captchaId ) );
 
// add reload if fancyCaptcha and has reload
-   if ( MobileContext::singleton()->isBetaGroupMember() ) {
-   if ( stristr( $header, 'fancycaptcha-reload' ) ) {
-   $output = $this->getSkin()->getOutput();
-   $output->addModuleStyles( 
'ext.confirmEdit.fancyCaptcha.styles' );
-   $output->addModules( 
'ext.confirmEdit.fancyCaptchaMobile' );
-   $captchaReload = Html::element( 'br' ) .
-   Html::openElement( 'div', array( 'id' 
=> 'mf-captcha-reload-container' ) ) .
-   Html::element(
-   'span',
-   array(
-   'class' => 
'confirmedit-captcha-reload fancycaptcha-reload'
-   ),
-   wfMessage( 
'fancycaptcha-reload-text' )->text()
-   ) .
-   Html::closeElement( 'div' ); 
#mf-captcha-reload-container
-   }
-   }
-   else {
+   if ( stristr( $header, 'fancycaptcha-reload' ) ) {
+   $output = $this->getSkin()->getOutput();
+   $output->addModuleStyles( 
'ext.confirmEdit.fancyCaptcha.styles' );
+   $output->addModules( 
'ext.confirmEdit.fancyCaptchaMobile' );
+   $captchaReload = Html::element( 'br' ) .
+   Html::openElement( 'div', array( 'id' => 
'mf-captcha-reload-container' ) ) .
+   Html::element(
+   'span',
+   array(
+   'class' => 
'confirmedit-captcha-reload fancycaptcha-reload'
+   ),
+   wfMessage( 'fancycaptcha-reload-text' 
)->text()
+   ) .
+   Html::closeElement( 'div' ); 
#mf-captcha-reload-container
+   } else {
$captchaReload = '';
}
 
diff --git a/tests/browser/features/create_account_failure_messages.feature 
b/tests/browser/features/create_account_failure_messages.feature
index f64f399..75f41d8 100644
--- a/tests/browser/features/create_account_failure_messages.feature
+++ b/tests/browser/features/create_account_failure_messages.feature
@@ -1,6 +1,5 @@
 @en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org
 Feature: Create failure messages
-  @wip
   Scenario: Can refresh captcha
 Given that I am on the User login page
   And I click Create Account

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

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

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

[MediaWiki-commits] [Gerrit] GlobalCollect audit sends source metadata - change (wikimedia...crm)

[Adamw (Code Review)]

Adamw has uploaded a new change for review.

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

Change subject: GlobalCollect audit sends source metadata
..

GlobalCollect audit sends source metadata

Finally removed the legacy STOMP code.

Change-Id: I28775106592234e033782a7c8fec504bd2619a70
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
D sites/all/modules/queue2civicrm/queue2civicrm_stomp.inc
M sites/all/modules/wmf_common/wmf_common.module
3 files changed, 52 insertions(+), 202 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/31/110631/1

diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module 
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index a03194c..437c823 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -353,7 +353,7 @@
$local_found_ids[] = $order_id;
globalcollect_audit_echo('!');
} else {
-   if ( sendSTOMP( $missing_txn_message ) ){
+   if ( globalcollect_audit_send_stomp( 
'donations', $missing_txn_message ) ){
watchdog('globalcollect_audit', 
__FUNCTION__ . ': Message sent to stomp successfully: ' . print_r( 
$missing_txn_message, true ), array(), WATCHDOG_INFO);
$local_found_ids[] = $order_id;
globalcollect_audit_echo('!');
@@ -396,7 +396,7 @@
$local_built_ids[] = $order_id;
globalcollect_audit_echo('!');
} else {
-   if ( sendSTOMP( $missing_txn_message ) ){
+   if ( globalcollect_audit_send_stomp( 
'donations', $missing_txn_message ) ){
watchdog('globalcollect_audit', 
__FUNCTION__ . ': Message sent to stomp successfully: ' . print_r( 
$missing_txn_message, true ), array(), WATCHDOG_INFO);
$local_built_ids[] = $order_id;
globalcollect_audit_echo('!');
@@ -631,7 +631,7 @@
$stomp_data = array(
'contribution_tracking_id' => $contribution_tracking_id,
'gateway' => 'globalcollect',
-   'amount' => $unstaged_amount,
+   'gross' => $unstaged_amount,
'payment_method' => $payment_method,
);

@@ -661,24 +661,17 @@
'language' => array( 'contribution_tracking', 'language' ), 
//probably the best one to use. 
'referrer' => array( 'contribution_tracking', 'referrer' ),
'email' => array( 'donor_data', 'EMAIL' ),
-   'fname' => array( 'donor_data', 'FIRSTNAME' ),
-   'mname',
-   'lname' => array( 'donor_data', 'SURNAME' ),
-   'street' => array( 'donor_data', 'STREET' ),
+   'first_name' => array( 'donor_data', 'FIRSTNAME' ),
+   'middle_name',
+   'last_name' => array( 'donor_data', 'SURNAME' ),
+   'street_address' => array( 'donor_data', 'STREET' ),
'city' => array( 'donor_data', 'CITY' ),
'state' => array( 'donor_data', 'STATE' ),
'country' => array( 'donor_data', 'COUNTRYCODE' ),
-   'zip' => array( 'donor_data', 'ZIP' ),
-   'fname2' => array( 'donor_data', 'FIRSTNAME' ),
-   'lname2' => array( 'donor_data', 'SURNAME' ),
-   'street2' => array( 'donor_data', 'STREET' ),
-   'city2' => array( 'donor_data', 'CITY' ),
-   'state2' => array( 'donor_data', 'STATE' ),
-   'country2' => array( 'donor_data', 'COUNTRYCODE' ),
-   'zip2' => array( 'donor_data', 'ZIP' ),
+   'postal_code' => array( 'donor_data', 'ZIP' ),
'gateway_txn_id' => array( 'donor_data', 'ORDERID' ),
'response', //? Maybe some dummy value for "found it in the 
audit phase"
-   'currency_code' => array( 'donor_data', 'CURRENCYCODE' ),
+   'currency' => array( 'donor_data', 'CURRENCYCODE' ),
'date' => array( 'contribution_tracking', 'ts' ), 
//double-check how the dates work
);

@@ -1039,7 +1032,7 @@
'type' => wr1_get_negative_type( $wr1 ), 
//refund or chargeback
);
echo print_r( $send_message, true );
-   sendSTOMP( $send_message );
+   globalcollect_audit_send_stomp( 'refund', $send_message 
);
$count += 1;
   

[MediaWiki-commits] [Gerrit] Move xQueryGenerator to MathSearch specialpage - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: Move xQueryGenerator to MathSearch specialpage
..


Move xQueryGenerator to MathSearch specialpage

* improve class design
* allow for choice of the MathSearch backend engine

Change-Id: I4682b0dc61c6ea3e2b1ba94303c11286783b68b3
---
M MathQueryObject.php
M MathSearch.php
M SpecialMathSearch.php
M XQueryGenerator.php
A XQueryGeneratorBaseX.php
A XQueryGeneratorDB2.php
6 files changed, 222 insertions(+), 192 deletions(-)

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



diff --git a/MathQueryObject.php b/MathQueryObject.php
index 9619690..40deeac 100644
--- a/MathQueryObject.php
+++ b/MathQueryObject.php
@@ -8,6 +8,9 @@
private $texquery = false;
private $cquery = false;
private $pquery = false;
+   /** @var XQueryGenerator current instance of xQueryGenerator  */
+   private $xQuery = false;
+   private $xQueryDialect = false;
private $pmmlSettings = array('format' => 'xml',
'whatsin' => 'math',
'whatsout' => 'math',
@@ -28,6 +31,11 @@
 // '[ids]latexml.sty',
'texvc'),
);
+
+   public function __construct( $texquery='' , $xQueryDialect = 'DB2' ) {
+   $this->texquery = $texquery;
+   $this->xQueryDialect = $xQueryDialect;
+   }
/**
 * Set the query id
 * @param int $id
@@ -181,4 +189,37 @@
return $renderer->getLastError();
}
}
+
+   /**
+* 
+* @param String ("DB2"|"BaseX") $dialect the name of the 
xQueryGenerator 
+* @return XQueryGenerator
+* @throws Exception
+*/
+   public function setXQueryGenerator( $dialect = false ){
+   if ($dialect === false){
+   $dialect = $this->xQueryDialect;
+   }
+   switch ($dialect) {
+   case 'DB2':
+   $this->xQuery = new XQueryGeneratorDB2( 
$this->getCQuery() );
+   break;
+   case 'BaseX':
+   $this->xQuery = new XQueryGeneratorBaseX( 
$this->getCQuery() );
+   break;
+   default:
+   throw new Exception($dialect . 'is not a valid 
XQueryDialect');
+   }
+   return $this->xQuery;
+   }
+
+   /**
+* @see XQueryGenerator::getXQuery()
+* @return String
+*/
+   public function getXQuery(){
+   $xQueryGenertor = $this->setXQueryGenerator();
+   return $xQueryGenertor->getXQuery();
+   }
+   
 }
diff --git a/MathSearch.php b/MathSearch.php
index 0021cc9..854adb6 100644
--- a/MathSearch.php
+++ b/MathSearch.php
@@ -37,6 +37,8 @@
 $wgAutoloadClasses['MathObject'] = $dir . 'MathObject.php';
 $wgAutoloadClasses['MathQueryObject'] = $dir . 'MathQueryObject.php';
 $wgAutoloadClasses['XQueryGenerator'] = $dir . 'XQueryGenerator.php';
+$wgAutoloadClasses['XQueryGeneratorDB2'] = $dir . 'XQueryGeneratorDB2.php';
+$wgAutoloadClasses['XQueryGeneratorBaseX'] = $dir . 'XQueryGeneratorBaseX.php';
 $wgAutoloadClasses['GetEquationsByQuery'] = $dir . 'GetEquationsByQuery.php';
 $wgAutoloadClasses['SpecialMathDebug'] = $dir . 'SpecialMathDebug.php';
 $wgAutoloadClasses['SpecialMathIndex'] = $dir . 'SpecialMathIndex.php';
@@ -53,7 +55,6 @@
 $wgSpecialPageGroups['MathIndex'] = 'mathsearch';
 $wgSpecialPages['MathSearch'] = 'SpecialMathSearch';
 $wgSpecialPages['FormulaInfo'] = 'FormulaInfo';
-$wgSpecialPages['XQueryGenerator'] = 'XQueryGenerator'; // Temporary test page
 $wgSpecialPages['GetEquationsByQuery'] = 'GetEquationsByQuery';
 $wgSpecialPages['MathDebug'] = 'SpecialMathDebug';
 $wgSpecialPages['MathIndex'] = 'SpecialMathIndex';
@@ -61,4 +62,6 @@
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'MathSearchHooks::onLoadExtensionSchemaUpdates';
 $wgHooks['MathFormulaRendered'][] = 'MathSearchHooks::onMathFormulaRendered';
 
-$wgGroupPermissions['user']['MathDebug'] = true;
\ No newline at end of file
+$wgGroupPermissions['user']['MathDebug'] = true;
+
+$wgMathSearchDB2Table = 'wiki.math';
\ No newline at end of file
diff --git a/SpecialMathSearch.php b/SpecialMathSearch.php
index 727d0c7..a6ca61a 100644
--- a/SpecialMathSearch.php
+++ b/SpecialMathSearch.php
@@ -22,7 +22,11 @@
var $mathpattern;
var $textpattern;
var $mathmlquery;
+   var $mathEngine;
+   var $displayQuery;
+   private $mathBackend;
private $resultID = 0;
+   private $xQueryEngines = array ('DB2', 'BaseX');
 
/**
 *
@@ -67,6 +71,21 @@
'class' => 'HTMLTextField', # What's the input 
type
'help' => 'a term like: algebra',
'default'

[MediaWiki-commits] [Gerrit] Revert "Update Wikibase and fix autoloader" - change (mediawiki...Wikidata)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Revert "Update Wikibase and fix autoloader"
..

Revert "Update Wikibase and fix autoloader"

This reverts commit b9b7186dd320b441a7e20d63dc53f393802569b2.

Change-Id: Ia1a6df88f613b302c060279e8d90e0166443034e
---
M composer.lock
M extensions/Wikibase/repo/resources/wikibase.ui.scrapeFormattedValues.js
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
6 files changed, 15 insertions(+), 177 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index f7f50f1..2f7a4a7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -847,12 +847,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "2f2bc29294d0deb23984762667612d6d6f3ff346"
+"reference": "6560dd64e31fba3ae2a14ac3cadf6a38e26e474e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2f2bc29294d0deb23984762667612d6d6f3ff346";,
-"reference": "2f2bc29294d0deb23984762667612d6d6f3ff346",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6560dd64e31fba3ae2a14ac3cadf6a38e26e474e";,
+"reference": "6560dd64e31fba3ae2a14ac3cadf6a38e26e474e",
 "shasum": ""
 },
 "require": {
@@ -908,7 +908,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2014-01-31 10:14:02"
+"time": "2014-01-31 00:55:14"
 }
 ],
 "packages-dev": [
diff --git 
a/extensions/Wikibase/repo/resources/wikibase.ui.scrapeFormattedValues.js 
b/extensions/Wikibase/repo/resources/wikibase.ui.scrapeFormattedValues.js
index e2e5a5a..ea22dfc 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.scrapeFormattedValues.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.scrapeFormattedValues.js
@@ -24,13 +24,13 @@
wb.__formattedValues = {};
$.each( wb.entity.getClaims(), function( i, claim ) {
var $claim = null,
-   mainSnak = claim.getMainSnak(),
+   mainSnakDataValue = 
claim.getMainSnak().getValue(),
$qualifierValues = null,
iQualifiers = 0,
$referenceValues = null,
iReferences = 0;
 
-   if( mainSnak.getType() === 'value' && 
mainSnak.getValue().getType() === 'quantity' ) {
+   if( mainSnakDataValue.getType() === 'quantity' ) {
$claim = getClaimNode( claim.getGuid() );
 
wb.__formattedValues[JSON.stringify( 
claim.getMainSnak().getValue().toJSON() )]
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 744a5ba..ec4d4f2 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit31a19db2fd84a7265122d39d4284f8fb::getLoader();
+return ComposerAutoloaderInitca1cf753f323c06d02cc6cbc9ca2c786::getLoader();
diff --git a/vendor/composer/autoload_classmap.php 
b/vendor/composer/autoload_classmap.php
index c0cec0e..b247377 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,66 +7,9 @@
 
 return array(
 'Comparable' => $vendorDir . 
'/data-values/data-values/src/interfaces/Comparable.php',
-'Composer\\Installers\\AglInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/AglInstaller.php',
-'Composer\\Installers\\AnnotateCmsInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/AnnotateCmsInstaller.php',
-'Composer\\Installers\\BaseInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/BaseInstaller.php',
-'Composer\\Installers\\CakePHPInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CakePHPInstaller.php',
-'Composer\\Installers\\CodeIgniterInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CodeIgniterInstaller.php',
-'Composer\\Installers\\Concrete5Installer' => $vendorDir . 
'/composer/installers/src/Composer/Installers/Concrete5Installer.php',
-'Composer\\Installers\\CraftInstaller' => $vendorDir . 
'/composer/installers/src/Composer/Installers/CraftInstaller.php',
-'Composer\\Installers\\CroogoInstaller' => $vendorDir . 
'/composer/installers/src/Composer/In

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'gerrit/master' into wmf_deploy - change (mediawiki...CentralNotice)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Merge remote-tracking branch 'gerrit/master' into wmf_deploy
..


Merge remote-tracking branch 'gerrit/master' into wmf_deploy

It's been too long... mostly i18n fixes.

* gerrit/master: (67 commits)
  Revert "Localisation updates from https://translatewiki.net.";
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Included the 'centralnotice-clone-banner' message
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  ...

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

Approvals:
  Mwalker: Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibee9b15d53bffdac4644e9c069593a9a8c24e1ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'gerrit/master' into wmf_deploy - change (mediawiki...CentralNotice)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Merge remote-tracking branch 'gerrit/master' into wmf_deploy
..

Merge remote-tracking branch 'gerrit/master' into wmf_deploy

It's been too long... mostly i18n fixes.

* gerrit/master: (67 commits)
  Revert "Localisation updates from https://translatewiki.net.";
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Included the 'centralnotice-clone-banner' message
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  Localisation updates from https://translatewiki.net.
  ...

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibee9b15d53bffdac4644e9c069593a9a8c24e1ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Remove unneeded h3s around Create Account links - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove unneeded h3s around Create Account links
..


Remove unneeded h3s around Create Account links

Also adjust related CSS styles

Bug: 60605
Change-Id: I87a16a8ee6d4968a0e2110c1ecdf0be9c99d8128
---
M includes/templates/Userlogin.php
M resources/mediawiki.special/mediawiki.special.userlogin.login.css
2 files changed, 5 insertions(+), 8 deletions(-)

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



diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index e5d8a1c..8ed15c0 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -160,11 +160,11 @@
haveData( 'createOrLoginHref' ) ) { ?>
data['loggedin'] ) { ?>

-   msg( 'userlogin-createanother' 
); ?>
+   msg( 'userlogin-createanother' ); ?>



-   msg( 'userlogin-noaccount' ); ?>msg( 
'userlogin-joinproject' ); ?>
+   msg( 
'userlogin-noaccount' ); ?>msg( 'userlogin-joinproject' ); ?>



diff --git a/resources/mediawiki.special/mediawiki.special.userlogin.login.css 
b/resources/mediawiki.special/mediawiki.special.userlogin.login.css
index 85730f5..dc44c84 100644
--- a/resources/mediawiki.special/mediawiki.special.userlogin.login.css
+++ b/resources/mediawiki.special/mediawiki.special.userlogin.login.css
@@ -5,17 +5,14 @@
/* @embed */
background: url(images/glyph-people-large.png) no-repeat 50%;
margin: 0 auto;
+   padding-top: 4em;
 }
 
-#mw-createaccount-cta h3,
-#mw-createaccount-another h3 {
+#mw-createaccount-cta,
+#mw-createaccount-another {
font-size: 0.9em;
font-weight: normal;
text-align: center;
-}
-
-#mw-createaccount-cta h3 {
-   padding-top: 4em;
 }
 
 #mw-createaccount-join {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87a16a8ee6d4968a0e2110c1ecdf0be9c99d8128
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Spage 
Gerrit-Reviewer: Swalling 
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 CC Header for Logged In Users - change (mediawiki...CentralNotice)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Add CC Header for Logged In Users
..

Add CC Header for Logged In Users

Change-Id: I57d7b4cb09a45606e7cb9450a9b6f61861b3ddf9
---
M special/SpecialBannerLoader.php
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/28/110628/1

diff --git a/special/SpecialBannerLoader.php b/special/SpecialBannerLoader.php
index 5cf265a..86de44b 100644
--- a/special/SpecialBannerLoader.php
+++ b/special/SpecialBannerLoader.php
@@ -79,11 +79,12 @@
 
header( "Content-type: $wgJsMimeType; charset=utf-8" );
 
-   // If we have a logged in user; do not cache (default for 
special pages)
-   // lest we capture a set-cookie header. Otherwise cache so we 
don't have
-   // too big of a DDoS hole.
if ( !$this->getUser()->isLoggedIn() ) {
+   // Public users get cached
header( "Cache-Control: public, 
s-maxage={$wgNoticeBannerMaxAge}, max-age=0" );
+   } else {
+   // Private users do not (we have to emit this because 
we've disabled output)
+   header( "Cache-Control: private, s-maxage=0, max-age=0" 
);
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57d7b4cb09a45606e7cb9450a9b6f61861b3ddf9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] add entry point specific for localisation cache update - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: add entry point specific for localisation cache update
..


add entry point specific for localisation cache update

instead of listing everything individually

Change-Id: I23eb099c73cba43234d94f64bc2dd2ad1ed0ab80
(cherry picked from commit a68ac581c3190e5a07ad38308f6f7ebb0e401b15)
---
A Wikidata.localisation.php
M extension-list-wikidata
2 files changed, 24 insertions(+), 9 deletions(-)

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



diff --git a/Wikidata.localisation.php b/Wikidata.localisation.php
new file mode 100644
index 000..b46d92f
--- /dev/null
+++ b/Wikidata.localisation.php
@@ -0,0 +1,23 @@
+ __DIR__,
+   'name' => 'Wikidata Build',
+   'author' => array(
+   'The Wikidata team', // TODO: link?
+   ),
+   'url' => 'https://www.mediawiki.org/wiki/Wikidata_build',
+   'description' => 'Wikidata extensions build'
+);
diff --git a/extension-list-wikidata b/extension-list-wikidata
index d8e7b29..23d1ba2 100644
--- a/extension-list-wikidata
+++ b/extension-list-wikidata
@@ -1,9 +1 @@
-$IP/extensions/Wikidata/Wikidata.php
-$IP/extensions/Wikidata/vendor/data-values/data-types/DataTypes.php
-$IP/extensions/Wikidata/vendor/data-values/data-values/DataValues.php
-$IP/extensions/Wikidata/vendor/diff/diff/Diff.php
-$IP/extensions/Wikidata/vendor/wikibase/data-model/WikibaseDataModel.php
-$IP/extensions/Wikidata/extensions/ValueView/ValueView.php
-$IP/extensions/Wikidata/extensions/Wikibase/client/WikibaseClient.php
-$IP/extensions/Wikidata/extensions/Wikibase/lib/WikibaseLib.php
-$IP/extensions/Wikidata/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/Wikidata/Wikidata.localisation.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23eb099c73cba43234d94f64bc2dd2ad1ed0ab80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf11
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Place the metadata correctly before opening the lightbox - change (mediawiki...MultimediaViewer)

[jenkins-bot (Code Review)]

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

Change subject: Place the metadata correctly before opening the lightbox
..


Place the metadata correctly before opening the lightbox

The issue was happening because the metadata div
was placed without waiting for dom load. Also, the code
ignored the fact that the window size might change
between page load and when the lightbox is open.

Change-Id: Ib44720a7f989803b3f59aebcd33e94f610f51325
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/141
---
M resources/mmv/mmv.lightboxinterface.js
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index be76df9..95c9264 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -117,6 +117,11 @@
$.scrollTo( 0, 0 );
}
 
+   // Make sure that the metadata is going to be at the bottom 
when it appears
+   // 83 is the height of the top metadata area. Which can't be 
measured by
+   // reading the DOM at this point of the execution, unfortunately
+   this.$postDiv.css( 'top', ( $( window ).height() - 83 ) + 'px' 
);
+
MLBInterface.prototype.attach.call( this, parentId );
};
 
@@ -147,8 +152,6 @@
};
 
LIP.initializeInterface = function () {
-   this.$postDiv.css( 'top', ( $( window ).height() - 83 ) + 'px' 
);
-
this.initializeHeader();
this.initializeNavigation();
this.initializeButtons();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib44720a7f989803b3f59aebcd33e94f610f51325
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Create additional browser test for Preferences "User Profile... - change (qa/browsertests)

[jenkins-bot (Code Review)]

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

Change subject: Create additional browser test for Preferences "User Profile" 
tab
..


Create additional browser test for Preferences "User Profile" tab

Bug: 58898
Change-Id: Icb9b0475a87e87e25c342bc4c16879d69f6c5913
---
A features/preferences_user_profile.feature
A features/step_definitions/preferences_user_profile_steps.rb
A features/support/pages/preferences_user_profile_page.rb
3 files changed, 107 insertions(+), 0 deletions(-)

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



diff --git a/features/preferences_user_profile.feature 
b/features/preferences_user_profile.feature
new file mode 100644
index 000..c225aec
--- /dev/null
+++ b/features/preferences_user_profile.feature
@@ -0,0 +1,28 @@
+#
+# This file is subject to the license terms in the LICENSE file found in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
+# qa-browsertests, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+#
+# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
+#
+@en.wikipedia.beta.wmflabs.org @login @test2.wikipedia.org
+Feature: Preferences User profile
+
+  Scenario: Preferences User profile
+Given I am logged in
+When I navigate to Preferences
+  And I click User profile
+Then I can see my Basic informations
+  And I can change my language
+  And I can change my gender
+  And I have more language settings
+  And I can see my signature
+  And I can change my signature
+  And I can see my email
+  And I can change my email options
+  And I can click Save
+  And I can restore default settings
diff --git a/features/step_definitions/preferences_user_profile_steps.rb 
b/features/step_definitions/preferences_user_profile_steps.rb
new file mode 100644
index 000..d5c7a93
--- /dev/null
+++ b/features/step_definitions/preferences_user_profile_steps.rb
@@ -0,0 +1,47 @@
+#
+# This file is subject to the license terms in the LICENSE file found in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
+# qa-browsertests, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+#
+# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
+#
+When(/^I click User profile$/) do
+  visit(PreferencesPage).user_profile_link_element.when_present.click
+end
+Then(/^I can change my email options$/) do
+  on(PreferencesUserProfilePage) do |page|
+page.enable_emails_check_element.should exist
+page.send_email_copies_check_element.should exist
+page.email_on_watchlist_change_check_element.should exist
+  end
+end
+Then(/^I can change my gender$/) do
+  on(PreferencesUserProfilePage) do |page|
+page.gender_undefined_radio_element.should exist
+page.gender_male_radio_element.should exist
+page.gender_female_radio_element.should exist
+  end
+end
+Then(/^I can change my language$/) do
+  on(PreferencesUserProfilePage).lang_select_element.should exist
+end
+Then(/^I can change my signature$/) do
+  on(PreferencesUserProfilePage).signature_field_element.should exist
+end
+Then(/^I can see my Basic informations$/) do
+  on(PreferencesUserProfilePage).basic_info_table_element.should exist
+end
+Then(/^I can see my email$/) do
+  on(PreferencesUserProfilePage).email_table_element.should exist
+end
+Then(/^I can see my signature$/) do
+  on(PreferencesUserProfilePage).signature_table_element.should exist
+end
+Then(/^I have more language settings$/) do
+  on(PreferencesUserProfilePage).more_lang_settings_link_element.should exist
+end
+
diff --git a/features/support/pages/preferences_user_profile_page.rb 
b/features/support/pages/preferences_user_profile_page.rb
new file mode 100644
index 000..38fc2c1
--- /dev/null
+++ b/features/support/pages/preferences_user_profile_page.rb
@@ -0,0 +1,32 @@
+#
+# This file is subject to the license terms in the LICENSE file found in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
+# qa-browsertests, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+#
+# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
+#
+c

[MediaWiki-commits] [Gerrit] add entry point specific for localisation cache update - change (mediawiki...Wikidata)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: add entry point specific for localisation cache update
..

add entry point specific for localisation cache update

instead of listing everything individually

Change-Id: I23eb099c73cba43234d94f64bc2dd2ad1ed0ab80
(cherry picked from commit a68ac581c3190e5a07ad38308f6f7ebb0e401b15)
---
A Wikidata.localisation.php
M extension-list-wikidata
2 files changed, 24 insertions(+), 9 deletions(-)


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

diff --git a/Wikidata.localisation.php b/Wikidata.localisation.php
new file mode 100644
index 000..b46d92f
--- /dev/null
+++ b/Wikidata.localisation.php
@@ -0,0 +1,23 @@
+ __DIR__,
+   'name' => 'Wikidata Build',
+   'author' => array(
+   'The Wikidata team', // TODO: link?
+   ),
+   'url' => 'https://www.mediawiki.org/wiki/Wikidata_build',
+   'description' => 'Wikidata extensions build'
+);
diff --git a/extension-list-wikidata b/extension-list-wikidata
index d8e7b29..23d1ba2 100644
--- a/extension-list-wikidata
+++ b/extension-list-wikidata
@@ -1,9 +1 @@
-$IP/extensions/Wikidata/Wikidata.php
-$IP/extensions/Wikidata/vendor/data-values/data-types/DataTypes.php
-$IP/extensions/Wikidata/vendor/data-values/data-values/DataValues.php
-$IP/extensions/Wikidata/vendor/diff/diff/Diff.php
-$IP/extensions/Wikidata/vendor/wikibase/data-model/WikibaseDataModel.php
-$IP/extensions/Wikidata/extensions/ValueView/ValueView.php
-$IP/extensions/Wikidata/extensions/Wikibase/client/WikibaseClient.php
-$IP/extensions/Wikidata/extensions/Wikibase/lib/WikibaseLib.php
-$IP/extensions/Wikidata/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/Wikidata/Wikidata.localisation.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23eb099c73cba43234d94f64bc2dd2ad1ed0ab80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf11
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 

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

[MediaWiki-commits] [Gerrit] Move xQueryGenerator to MathSearch specialpage - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Move xQueryGenerator to MathSearch specialpage
..

Move xQueryGenerator to MathSearch specialpage

* improve class design
* allow for choice of the MathSearch backend engine

Change-Id: I4682b0dc61c6ea3e2b1ba94303c11286783b68b3
---
M MathQueryObject.php
M MathSearch.php
M SpecialMathSearch.php
M XQueryGenerator.php
A XQueryGeneratorBaseX.php
A XQueryGeneratorDB2.php
6 files changed, 222 insertions(+), 192 deletions(-)


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

diff --git a/MathQueryObject.php b/MathQueryObject.php
index 9619690..40deeac 100644
--- a/MathQueryObject.php
+++ b/MathQueryObject.php
@@ -8,6 +8,9 @@
private $texquery = false;
private $cquery = false;
private $pquery = false;
+   /** @var XQueryGenerator current instance of xQueryGenerator  */
+   private $xQuery = false;
+   private $xQueryDialect = false;
private $pmmlSettings = array('format' => 'xml',
'whatsin' => 'math',
'whatsout' => 'math',
@@ -28,6 +31,11 @@
 // '[ids]latexml.sty',
'texvc'),
);
+
+   public function __construct( $texquery='' , $xQueryDialect = 'DB2' ) {
+   $this->texquery = $texquery;
+   $this->xQueryDialect = $xQueryDialect;
+   }
/**
 * Set the query id
 * @param int $id
@@ -181,4 +189,37 @@
return $renderer->getLastError();
}
}
+
+   /**
+* 
+* @param String ("DB2"|"BaseX") $dialect the name of the 
xQueryGenerator 
+* @return XQueryGenerator
+* @throws Exception
+*/
+   public function setXQueryGenerator( $dialect = false ){
+   if ($dialect === false){
+   $dialect = $this->xQueryDialect;
+   }
+   switch ($dialect) {
+   case 'DB2':
+   $this->xQuery = new XQueryGeneratorDB2( 
$this->getCQuery() );
+   break;
+   case 'BaseX':
+   $this->xQuery = new XQueryGeneratorBaseX( 
$this->getCQuery() );
+   break;
+   default:
+   throw new Exception($dialect . 'is not a valid 
XQueryDialect');
+   }
+   return $this->xQuery;
+   }
+
+   /**
+* @see XQueryGenerator::getXQuery()
+* @return String
+*/
+   public function getXQuery(){
+   $xQueryGenertor = $this->setXQueryGenerator();
+   return $xQueryGenertor->getXQuery();
+   }
+   
 }
diff --git a/MathSearch.php b/MathSearch.php
index 0021cc9..854adb6 100644
--- a/MathSearch.php
+++ b/MathSearch.php
@@ -37,6 +37,8 @@
 $wgAutoloadClasses['MathObject'] = $dir . 'MathObject.php';
 $wgAutoloadClasses['MathQueryObject'] = $dir . 'MathQueryObject.php';
 $wgAutoloadClasses['XQueryGenerator'] = $dir . 'XQueryGenerator.php';
+$wgAutoloadClasses['XQueryGeneratorDB2'] = $dir . 'XQueryGeneratorDB2.php';
+$wgAutoloadClasses['XQueryGeneratorBaseX'] = $dir . 'XQueryGeneratorBaseX.php';
 $wgAutoloadClasses['GetEquationsByQuery'] = $dir . 'GetEquationsByQuery.php';
 $wgAutoloadClasses['SpecialMathDebug'] = $dir . 'SpecialMathDebug.php';
 $wgAutoloadClasses['SpecialMathIndex'] = $dir . 'SpecialMathIndex.php';
@@ -53,7 +55,6 @@
 $wgSpecialPageGroups['MathIndex'] = 'mathsearch';
 $wgSpecialPages['MathSearch'] = 'SpecialMathSearch';
 $wgSpecialPages['FormulaInfo'] = 'FormulaInfo';
-$wgSpecialPages['XQueryGenerator'] = 'XQueryGenerator'; // Temporary test page
 $wgSpecialPages['GetEquationsByQuery'] = 'GetEquationsByQuery';
 $wgSpecialPages['MathDebug'] = 'SpecialMathDebug';
 $wgSpecialPages['MathIndex'] = 'SpecialMathIndex';
@@ -61,4 +62,6 @@
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'MathSearchHooks::onLoadExtensionSchemaUpdates';
 $wgHooks['MathFormulaRendered'][] = 'MathSearchHooks::onMathFormulaRendered';
 
-$wgGroupPermissions['user']['MathDebug'] = true;
\ No newline at end of file
+$wgGroupPermissions['user']['MathDebug'] = true;
+
+$wgMathSearchDB2Table = 'wiki.math';
\ No newline at end of file
diff --git a/SpecialMathSearch.php b/SpecialMathSearch.php
index 727d0c7..a6ca61a 100644
--- a/SpecialMathSearch.php
+++ b/SpecialMathSearch.php
@@ -22,7 +22,11 @@
var $mathpattern;
var $textpattern;
var $mathmlquery;
+   var $mathEngine;
+   var $displayQuery;
+   private $mathBackend;
private $resultID = 0;
+   private $xQueryEngines = array ('DB2', 'BaseX');
 
/**
 *
@@ -67,6 +71,21 @@
'class' => 'HTMLTextField', # What's the input 
type
'help

[MediaWiki-commits] [Gerrit] parsoid: ensure => absent on /etc/init/parsoid-test - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: parsoid: ensure => absent on /etc/init/parsoid-test
..


parsoid: ensure => absent on /etc/init/parsoid-test

Test is done; change I2b3cc40ef will roll it back out as /etc/init/parsoid.

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

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



diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index e33a56f..576ebcb 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -67,7 +67,7 @@
 # it taking precedence over the init script
 # TODO: remove init script and rename back to parsoid.conf
 file { '/etc/init/parsoid-test.conf':
-ensure  => present,
+ensure  => absent,
 owner   => root,
 group   => root,
 mode=> '0444',

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

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

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

[MediaWiki-commits] [Gerrit] Load Tablet styles if portrait or landscape meets threshold - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Load Tablet styles if portrait or landscape meets threshold
..

Load Tablet styles if portrait or landscape meets threshold

Otherwise the experience is confusing - VE for example will only
load in landscape mode but not portrait.

Bug: 59827
Change-Id: I165a390f6b72a6541e1b0b66765a0b4a80312ff0
---
M javascripts/common/application.js
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/javascripts/common/application.js 
b/javascripts/common/application.js
index 9360e1e..e502655 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -338,7 +338,9 @@
 * @return {Boolean}
 */
function isWideScreen() {
-   return window.innerWidth > mw.config.get( 
'wgMFDeviceWidthTablet' );
+   var val = mw.config.get( 'wgMFDeviceWidthTablet' );
+   // Check portrait and landscape mode to be consistent
+   return window.innerWidth > val || window.innerHeight > val;
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Add Wikidata.php to the extension list - change (mediawiki...Wikidata)

[Hoo man (Code Review)]

Hoo man has submitted this change and it was merged.

Change subject: Add Wikidata.php to the extension list
..


Add Wikidata.php to the extension list

Needed to have the autoloader there in all cases

Change-Id: I240099c1aeda1decc3553bacd639e8064a1be415
---
M extension-list-wikidata
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension-list-wikidata b/extension-list-wikidata
index 962a58b..d8e7b29 100644
--- a/extension-list-wikidata
+++ b/extension-list-wikidata
@@ -1,3 +1,4 @@
+$IP/extensions/Wikidata/Wikidata.php
 $IP/extensions/Wikidata/vendor/data-values/data-types/DataTypes.php
 $IP/extensions/Wikidata/vendor/data-values/data-values/DataValues.php
 $IP/extensions/Wikidata/vendor/diff/diff/Diff.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I240099c1aeda1decc3553bacd639e8064a1be415
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf11
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] parsoid: ensure => absent on /etc/init/parsoid-test - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: parsoid: ensure => absent on /etc/init/parsoid-test
..

parsoid: ensure => absent on /etc/init/parsoid-test

Test is done; change I2b3cc40ef will roll it back out as /etc/init/parsoid.

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


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

diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index e33a56f..576ebcb 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -67,7 +67,7 @@
 # it taking precedence over the init script
 # TODO: remove init script and rename back to parsoid.conf
 file { '/etc/init/parsoid-test.conf':
-ensure  => present,
+ensure  => absent,
 owner   => root,
 group   => root,
 mode=> '0444',

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

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

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

[MediaWiki-commits] [Gerrit] Moar thank you updates - change (wikimedia...crm)

[Adamw (Code Review)]

Adamw has submitted this change and it was merged.

Change subject: Moar thank you updates
..


Moar thank you updates

Change-Id: Idcb20e35387ed32ad42fc23f4b3508ba5692ce40
---
M sites/all/modules/thank_you/templates/html/thank_you.hu.html
M sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
2 files changed, 18 insertions(+), 16 deletions(-)

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



diff --git a/sites/all/modules/thank_you/templates/html/thank_you.hu.html 
b/sites/all/modules/thank_you/templates/html/thank_you.hu.html
index 5519d06..e96aa32 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.hu.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.hu.html
@@ -3,41 +3,41 @@
 Nagyszerű ember vagy. KÖSZÖNJÜK, hogy támogatod a Wikimedia Alapítványt, 
amely non-profit
 módon működteti a Wikipédiát és testvéreit.
 
-Az adományod nem csak a saját Wikipédia használatodat fedezi, hanem más 
Wikipédia olvasók
-költségeit is.
+Az adományod nemcsak a saját Wikipédia-használatod költségeihez járul 
hozzá, hanem más
+Wikipédia olvasókéhoz is.
 
-Mint az a nyugdíjas gazda New Yorkban, aki a Wikipédiát használja, hogy 
tanulmányozza a
-szennyvízkezelés tudományát, és az a tanuló, aki Kuala Lumpurban kutatja a 
szerves kémiát.
-Az a brit szerelő, aki, - miután a háta megsérült egy balesetben, - a 
Wikipédiát használta
-arra, hogy átképezze magát weboldal fejlesztővé. Az a köztisztviselő 
Finnországban, aki
-létrehozta a Wikipédia offline változatát egy kis ghánai iskola számára. És az 
az apa
-Mexikóvárosban, aki múzeumba viszi a kislányát hétvégenként, a Wikipédiát 
használja arra,
-hogy segítsen megérteni mindent, amit ott láttak.
+Mint az a nyugdíjas gazda New York államban, aki a Wikipédiát használja, 
hogy a
+szennyvízkezelés tudományát tanulmányozza, és az a tanuló, aki Kuala Lumpurban 
kutatja a
+szerves kémiát. Az a brit szerelő, aki, - miután a háta megsérült egy 
balesetben - a
+Wikipédiát használta arra, hogy átképezze magát weboldal-fejlesztővé. Az a 
köztisztviselő
+Finnországban, aki létrehozta a Wikipédia offline változatát egy kis ghánai 
iskola számára.
+És az az apa Mexikóvárosban, aki hétvégenként múzeumba viszi a kislányai, a 
Wikipédiát
+használja arra, hogy segítsen megérteni mindent, amit ott láttak.
 
 A Wikipédia feladata az, hogy az összes létező emberi tudást, a világon 
mindenki számára
 elérhetővé tegye a saját nyelvén. Ez egy elég merész küldetés, de mégis, a 30 
millió
 cikket és 287 nyelvet együttvéve azt mondanám, hogy hála neked, és az olyan 
embereknek mint
 te, közeledünk a célhoz.
 
-A Wikimedia Alapítvány, és a világszerte további fél-milliárd Wikipédia 
olvasó nevében:
-köszönöm. Az a tény, hogy segít fizetni a Wikipédia működési költségeit, azt 
jelenti,
-hogy hirdetésmentes és elfogultságtól független maradhat, továbbá csak az 
olvasók
+A Wikimedia Alapítvány, és a világszerte további félmilliárd Wikipédia 
olvasó nevében:
+köszönöm. Az a tény, hogy segítesz hozzájárulni a Wikipédia működési 
költségeihez, azt
+jelenti, hogy hirdetésmentes és elfogultságtól független maradhat, továbbá 
csak az olvasók
 megsegítésére tud majd koncentrálni. Pontosan úgy, ahogy annak lennie kell.
 
 Az idén az adománygyűjtésre való felhívást mindenki csak néhány alkalommal 
fogja látni
 a hirdetési szalagon, nem pedig heteken keresztül. Ez szándékos: nem akarjuk, 
hogy az embereket
-irritálja a túl sok megjelenés. De ez nem jelenti azt, hogy kevesebb ember fog 
rájönni arra,
+irritálja a túl sok megjelenés. De ez nem jelenti azt, hogy kevesebb ember fog 
rájébredni arra,
 hogy mi egy non-profit szervezet vagyunk, és a segítségüket akarjuk. Tehát, ha 
hajlandó vagy
 rá, örülnék, ha segítenél terjeszteni a hírt azzal, hogy továbbítod ezt az 
e-mailt egy pár
 barátodnak.
 
-Nagyon szeretném, ha megpróbálna csatlakozni hozzánk a Wikipédia cikkeinek 
írásában. A
+Nagyon szeretném, ha megpróbálnál csatlakozni hozzánk a Wikipédia cikkeinek 
írásában. A
 Wikipédia teljes egészében önkéntesek által íródik - több tízezer hétköznapi 
ember
 szerte a világon, pontosan olyan, mint mi. Ha látsz egy elírást, vagy egy kis 
hibát a
 Wikipédián, kérlek javítsd ki. Ha tudsz valami érdemlegeset hozzátenni, 
kérjük, tedd meg.
 Vannak, akik ezt rendkívül kielégítőnek találják, és talán te is annak 
fogod.
 
-Még egyszer köszönöm. Nagyra értékelem a bizalmát irántunk, és ígérem: a 
pénzét
+Még egyszer köszönöm. Nagyra értékelem az irántunk való bizalmat, és 
ígérem: a pénzed
 gondosan és helyesen fogjuk felhasználni.
 
 Köszönet,
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html 
b/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
index 496993e..6dd86fd 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
@@ -91,4 +91,6 @@
 
 
 
-Por favor ajude-nos a https://meta.wikime

[MediaWiki-commits] [Gerrit] Moar thank you updates - change (wikimedia...crm)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Moar thank you updates
..

Moar thank you updates

Change-Id: Idcb20e35387ed32ad42fc23f4b3508ba5692ce40
---
M sites/all/modules/thank_you/templates/html/thank_you.hu.html
M sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
2 files changed, 18 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/23/110623/1

diff --git a/sites/all/modules/thank_you/templates/html/thank_you.hu.html 
b/sites/all/modules/thank_you/templates/html/thank_you.hu.html
index 5519d06..e96aa32 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.hu.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.hu.html
@@ -3,41 +3,41 @@
 Nagyszerű ember vagy. KÖSZÖNJÜK, hogy támogatod a Wikimedia Alapítványt, 
amely non-profit
 módon működteti a Wikipédiát és testvéreit.
 
-Az adományod nem csak a saját Wikipédia használatodat fedezi, hanem más 
Wikipédia olvasók
-költségeit is.
+Az adományod nemcsak a saját Wikipédia-használatod költségeihez járul 
hozzá, hanem más
+Wikipédia olvasókéhoz is.
 
-Mint az a nyugdíjas gazda New Yorkban, aki a Wikipédiát használja, hogy 
tanulmányozza a
-szennyvízkezelés tudományát, és az a tanuló, aki Kuala Lumpurban kutatja a 
szerves kémiát.
-Az a brit szerelő, aki, - miután a háta megsérült egy balesetben, - a 
Wikipédiát használta
-arra, hogy átképezze magát weboldal fejlesztővé. Az a köztisztviselő 
Finnországban, aki
-létrehozta a Wikipédia offline változatát egy kis ghánai iskola számára. És az 
az apa
-Mexikóvárosban, aki múzeumba viszi a kislányát hétvégenként, a Wikipédiát 
használja arra,
-hogy segítsen megérteni mindent, amit ott láttak.
+Mint az a nyugdíjas gazda New York államban, aki a Wikipédiát használja, 
hogy a
+szennyvízkezelés tudományát tanulmányozza, és az a tanuló, aki Kuala Lumpurban 
kutatja a
+szerves kémiát. Az a brit szerelő, aki, - miután a háta megsérült egy 
balesetben - a
+Wikipédiát használta arra, hogy átképezze magát weboldal-fejlesztővé. Az a 
köztisztviselő
+Finnországban, aki létrehozta a Wikipédia offline változatát egy kis ghánai 
iskola számára.
+És az az apa Mexikóvárosban, aki hétvégenként múzeumba viszi a kislányai, a 
Wikipédiát
+használja arra, hogy segítsen megérteni mindent, amit ott láttak.
 
 A Wikipédia feladata az, hogy az összes létező emberi tudást, a világon 
mindenki számára
 elérhetővé tegye a saját nyelvén. Ez egy elég merész küldetés, de mégis, a 30 
millió
 cikket és 287 nyelvet együttvéve azt mondanám, hogy hála neked, és az olyan 
embereknek mint
 te, közeledünk a célhoz.
 
-A Wikimedia Alapítvány, és a világszerte további fél-milliárd Wikipédia 
olvasó nevében:
-köszönöm. Az a tény, hogy segít fizetni a Wikipédia működési költségeit, azt 
jelenti,
-hogy hirdetésmentes és elfogultságtól független maradhat, továbbá csak az 
olvasók
+A Wikimedia Alapítvány, és a világszerte további félmilliárd Wikipédia 
olvasó nevében:
+köszönöm. Az a tény, hogy segítesz hozzájárulni a Wikipédia működési 
költségeihez, azt
+jelenti, hogy hirdetésmentes és elfogultságtól független maradhat, továbbá 
csak az olvasók
 megsegítésére tud majd koncentrálni. Pontosan úgy, ahogy annak lennie kell.
 
 Az idén az adománygyűjtésre való felhívást mindenki csak néhány alkalommal 
fogja látni
 a hirdetési szalagon, nem pedig heteken keresztül. Ez szándékos: nem akarjuk, 
hogy az embereket
-irritálja a túl sok megjelenés. De ez nem jelenti azt, hogy kevesebb ember fog 
rájönni arra,
+irritálja a túl sok megjelenés. De ez nem jelenti azt, hogy kevesebb ember fog 
rájébredni arra,
 hogy mi egy non-profit szervezet vagyunk, és a segítségüket akarjuk. Tehát, ha 
hajlandó vagy
 rá, örülnék, ha segítenél terjeszteni a hírt azzal, hogy továbbítod ezt az 
e-mailt egy pár
 barátodnak.
 
-Nagyon szeretném, ha megpróbálna csatlakozni hozzánk a Wikipédia cikkeinek 
írásában. A
+Nagyon szeretném, ha megpróbálnál csatlakozni hozzánk a Wikipédia cikkeinek 
írásában. A
 Wikipédia teljes egészében önkéntesek által íródik - több tízezer hétköznapi 
ember
 szerte a világon, pontosan olyan, mint mi. Ha látsz egy elírást, vagy egy kis 
hibát a
 Wikipédián, kérlek javítsd ki. Ha tudsz valami érdemlegeset hozzátenni, 
kérjük, tedd meg.
 Vannak, akik ezt rendkívül kielégítőnek találják, és talán te is annak 
fogod.
 
-Még egyszer köszönöm. Nagyra értékelem a bizalmát irántunk, és ígérem: a 
pénzét
+Még egyszer köszönöm. Nagyra értékelem az irántunk való bizalmat, és 
ígérem: a pénzed
 gondosan és helyesen fogjuk felhasználni.
 
 Köszönet,
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html 
b/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
index 496993e..6dd86fd 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.pt-br.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.pt-b

[MediaWiki-commits] [Gerrit] Add Login Activity, link from Left Nav - change (apps...wikipedia)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Add Login Activity, link from Left Nav
..

Add Login Activity, link from Left Nav

- Simple stub, does not do anything
- Also adds StyledCheckBox

Change-Id: I316a42098619202256ded314839d370b60d8d652
---
M wikipedia/AndroidManifest.xml
A wikipedia/res/layout/activity_login.xml
A wikipedia/res/menu/menu_login.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
A wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
A wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
7 files changed, 148 insertions(+), 2 deletions(-)


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

diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml
index f83b285..31d7185 100644
--- a/wikipedia/AndroidManifest.xml
+++ b/wikipedia/AndroidManifest.xml
@@ -57,6 +57,10 @@
 
+
 
 
+
+http://schemas.android.com/apk/res/android";
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:padding="16dp"
+>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wikipedia/res/menu/menu_login.xml 
b/wikipedia/res/menu/menu_login.xml
new file mode 100644
index 000..df0aa26
--- /dev/null
+++ b/wikipedia/res/menu/menu_login.xml
@@ -0,0 +1,8 @@
+
+
+http://schemas.android.com/apk/res/android";>
+
+
\ No newline at end of file
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index ac56f9a..a6eea17 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -60,4 +60,10 @@
 Enter captcha
 Make changes to my 
edit
 Tap captcha to reload
+Log in
+Username
+Password
+Display password
+Log in
+Login to Wikipedia
 
\ No newline at end of file
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java 
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index 74928aa..0219332 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -8,6 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.*;
 import org.wikipedia.history.HistoryActivity;
+import org.wikipedia.login.LoginActivity;
 import org.wikipedia.savedpages.SavedPagesActivity;
 import org.wikipedia.settings.SettingsActivity;
 
@@ -15,12 +16,14 @@
 private static final int[] ACTION_ITEMS_TEXT = {
 R.string.nav_item_history,
 R.string.nav_item_saved_pages,
-R.string.nav_item_preferences
+R.string.nav_item_preferences,
+R.string.nav_item_login
 };
 private static final int[] ACTION_ITEM_IMAGES = {
 android.R.drawable.ic_menu_recent_history,
 android.R.drawable.ic_menu_save,
-android.R.drawable.ic_menu_preferences
+android.R.drawable.ic_menu_preferences,
+android.R.drawable.ic_menu_add
 };
 
 private ListView navList;
@@ -50,6 +53,9 @@
 case R.string.nav_item_preferences:
 intent.setClass(this.getActivity(), SettingsActivity.class);
 break;
+case R.string.nav_item_login:
+intent.setClass(this.getActivity(), LoginActivity.class);
+break;
 default:
 throw new RuntimeException("Unknown ID clicked!");
 }
diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java 
b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
new file mode 100644
index 000..1e8109c
--- /dev/null
+++ b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -0,0 +1,63 @@
+package org.wikipedia.login;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.InputType;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import org.wikipedia.R;
+
+public class LoginActivity extends Activity {
+private EditText usernameText;
+private EditText passwordText;
+private CheckBox showPassword;
+
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+setContentView(R.layout.activity_login);
+
+getActionBar().setDisplayHomeAsUpEnabled(true);
+
+usernameText = (EditText) findViewById(R.id.login_username_text);
+passwordText = (EditText) findViewById(R.id.login_password_text);
+showPassword = (CheckBox) findViewById(R.id.login_show_password);
+
+showPassword.setOnCheckedChangeListener(new 
CompoundButton.OnCheckedChangeListener() 

[MediaWiki-commits] [Gerrit] QA: Define expected behaviour for VisualEditor overlay for b... - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: QA: Define expected behaviour for VisualEditor overlay for bug 
59932
..


QA: Define expected behaviour for VisualEditor overlay for bug 59932

* Add tests for Keep Going and toast to show when editing VisualEditor (these
currently fail)

Change-Id: I74354f96e26933ade27483c31450d24164b6fdd9
---
A tests/browser/features/editor-ve.feature
M tests/browser/features/keepgoing.feature
M tests/browser/features/step_definitions/common_article_steps.rb
M tests/browser/features/support/pages/article_page.rb
4 files changed, 51 insertions(+), 1 deletion(-)

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



diff --git a/tests/browser/features/editor-ve.feature 
b/tests/browser/features/editor-ve.feature
new file mode 100644
index 000..bb1b535
--- /dev/null
+++ b/tests/browser/features/editor-ve.feature
@@ -0,0 +1,13 @@
+@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+Feature: VisualEditor
+
+@wip
+Scenario: I can edit a page using VisualEditor
+  Given I am in alpha mode
+And I am logged into the mobile website
+  When I am on the Selenium Edit Test article
+And I click edit
+And I type ABCDEFG into VisualEditor
+And I click continue
+And I click submit
+  Then I see a toast confirmation
diff --git a/tests/browser/features/keepgoing.feature 
b/tests/browser/features/keepgoing.feature
index ab40b46..7e95d83 100644
--- a/tests/browser/features/keepgoing.feature
+++ b/tests/browser/features/keepgoing.feature
@@ -10,3 +10,14 @@
   And I click continue
   And I click submit
 Then I see the KeepGoing drawer prompting me to continue editing
+
+  @wip
+  Scenario: I see a KeepGoing message after completing my VisualEditor edit
+Given I am in alpha mode
+  And I have just registered a new account
+When I am on the Selenium Edit Test article
+  And I click edit
+  And I type ABCDEFG into VisualEditor
+  And I click continue
+  And I click submit
+Then I see the KeepGoing drawer prompting me to continue editing
diff --git a/tests/browser/features/step_definitions/common_article_steps.rb 
b/tests/browser/features/step_definitions/common_article_steps.rb
index dfc69aa..a2f817f 100644
--- a/tests/browser/features/step_definitions/common_article_steps.rb
+++ b/tests/browser/features/step_definitions/common_article_steps.rb
@@ -6,10 +6,30 @@
   on(ArticlePage).editor_text_area_element.when_present.send_keys(text)
 end
 
+Given(/^I type (.+) into VisualEditor$/) do |text|
+  on(ArticlePage) do |page|
+page.editor_ve_element.when_present.fire_event("onfocus")
+page.editor_ve_element.when_present.send_keys(text)
+  end
+end
+
 Given(/^I click continue$/) do
   on(ArticlePage).continue_button_element.when_present.click
 end
 
 Given(/^I click submit$/) do
-  on(ArticlePage).submit_button_element.when_present.click
+  # In VE the submit button takes a while to become enabled while it prepares 
for a save
+  # according to Jeff this is the best way to get round this
+  # FIXME: Must be a more elegant way?
+  try = 10
+  try.times do
+begin
+  on(ArticlePage).submit_button_element.when_present.click
+rescue
+end
+  end
+end
+
+Then(/^I see a toast confirmation$/) do
+  on(ArticlePage).toast_element.when_present.should be_visible
 end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 3eb1276..82683f3 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -55,4 +55,10 @@
 
   # drawer
   div(:keep_going, class:'overlay-bottom')
+
+  # visual editor
+  div(:editor_ve, class: "ve-ce-documentNode ve-ce-branchNode")
+
+  # toast
+  div(:toast, class:'toast position-fixed visible')
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74354f96e26933ade27483c31450d24164b6fdd9
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: Jhall 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] parsoid upstart: make PARSOID_LOG_FILE consistent with other... - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: parsoid upstart: make PARSOID_LOG_FILE consistent with other 
vars
..


parsoid upstart: make PARSOID_LOG_FILE consistent with other vars

That is, define it and allow it to be overridden, rather than first loading
defaults and then checking if it is nonempty.

Change-Id: I574d01426fa880506b84fa3e82b5f6b21d7ae827
---
M files/misc/parsoid.upstart
1 file changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart
index 0232b17..a1aded7 100644
--- a/files/misc/parsoid.upstart
+++ b/files/misc/parsoid.upstart
@@ -18,11 +18,12 @@
 
 env DEFAULTFILE=/etc/default/parsoid
 
-# Basic build in default, would be overridden by whatever
-# is defined in the DEFAULTFILE defined above
+# Basic built-in defaults. Overridden by whatever
+# is defined in the DEFAULTFILE defined above.
 env VCAP_APP_PORT="8000"
 env NODE_PATH="/var/lib/parsoid/deploy/node_modules"
 env PARSOID_BASE_PATH="/var/lib/parsoid/deploy/src"
+env PARSOID_LOG_FILE="/dev/null"
 
 respawn
 
@@ -30,10 +31,6 @@
 if [ -f "$DEFAULTFILE" ] ; then
 . "$DEFAULTFILE"
 fi
-if [ "x$PARSOID_LOG_FILE" = "x" ] ; then
-PARSOID_LOG_FILE='/dev/null'
-fi
-
 chdir "$PARSOID_BASE_PATH"
 exec /usr/bin/nodejs api/server.js -c ../conf/wmf/localsettings.js < 
/dev/null >> "$PARSOID_LOG_FILE" 2>&1
 end script

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I574d01426fa880506b84fa3e82b5f6b21d7ae827
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] parsoid upstart: make PARSOID_LOG_FILE consistent with other... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: parsoid upstart: make PARSOID_LOG_FILE consistent with other 
vars
..

parsoid upstart: make PARSOID_LOG_FILE consistent with other vars

That is, define it and allow it to be overridden, rather than first loading
defaults and then checking if it is nonempty.

Change-Id: I574d01426fa880506b84fa3e82b5f6b21d7ae827
---
M files/misc/parsoid.upstart
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/110621/1

diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart
index 0232b17..a1aded7 100644
--- a/files/misc/parsoid.upstart
+++ b/files/misc/parsoid.upstart
@@ -18,11 +18,12 @@
 
 env DEFAULTFILE=/etc/default/parsoid
 
-# Basic build in default, would be overridden by whatever
-# is defined in the DEFAULTFILE defined above
+# Basic built-in defaults. Overridden by whatever
+# is defined in the DEFAULTFILE defined above.
 env VCAP_APP_PORT="8000"
 env NODE_PATH="/var/lib/parsoid/deploy/node_modules"
 env PARSOID_BASE_PATH="/var/lib/parsoid/deploy/src"
+env PARSOID_LOG_FILE="/dev/null"
 
 respawn
 
@@ -30,10 +31,6 @@
 if [ -f "$DEFAULTFILE" ] ; then
 . "$DEFAULTFILE"
 fi
-if [ "x$PARSOID_LOG_FILE" = "x" ] ; then
-PARSOID_LOG_FILE='/dev/null'
-fi
-
 chdir "$PARSOID_BASE_PATH"
 exec /usr/bin/nodejs api/server.js -c ../conf/wmf/localsettings.js < 
/dev/null >> "$PARSOID_LOG_FILE" 2>&1
 end script

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

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

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

[MediaWiki-commits] [Gerrit] Update src submodule to current master - change (mediawiki...deploy)

[jenkins-bot (Code Review)]

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

Change subject: Update src submodule to current master
..


Update src submodule to current master

Change-Id: I5ba714441f067cbff4445d0ddec7d9d5691467a4
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index cc4483b..2d663eb 16
--- a/src
+++ b/src
-Subproject commit cc4483b83fca5163b100d33bc357070cae2b3e0c
+Subproject commit 2d663ebe5938956df278ccace78fafba3b014f2e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ba714441f067cbff4445d0ddec7d9d5691467a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke 
Gerrit-Reviewer: GWicke 
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 - Initial debian version - change (analytics/kafkatee)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: WIP - Initial debian version
..

WIP - Initial debian version

Change-Id: I705bcef578872b83cbd96729503b6357adce807a
---
A debian/75-kafkatee.conf
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/kafkatee.conf
A debian/kafkatee.dirs
A debian/kafkatee.install
A debian/kafkatee.logrotate
A debian/kafkatee.postinst
A debian/kafkatee.postrm
A debian/kafkatee.upstart
A debian/rules
A debian/source/format
15 files changed, 551 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/kafkatee 
refs/changes/20/110620/1

diff --git a/debian/75-kafkatee.conf b/debian/75-kafkatee.conf
new file mode 100644
index 000..d9c29ce
--- /dev/null
+++ b/debian/75-kafkatee.conf
@@ -0,0 +1,2 @@
+# rsyslogd kafkatee config.
+if $programname == 'kafkatee' then /var/log/kafkatee.log
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..47c416d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+kafkatee (0.1.0-1~20140130) unstable; urgency=low
+
+  * Initial release
+
+ -- Andrew Otto (WMF)   Thu, 30 Jan 2014 19:12:20 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..c4b1c0c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,30 @@
+Source: kafkatee
+Section: web
+Priority: optional
+Maintainer: Andrew Otto (WMF) 
+Build-Depends: debhelper (>= 9) librdkafka-dev >= 0.8.3, libyajl-dev
+Standards-Version: 3.9.4
+Vcs-Git: https://gerrit.wikimedia.org/r/analytics/kafkatee
+Vcs-Browser: http://git.wikimedia.org/tree/analytics%2Fkafkatee
+
+Package: kafkatee
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Kafka consumer with multiple inputs and outputs
+ kafkatee consumes messages from one or more Kafka topics and writes
+ the messages to one or more outputs - either command pipes or files.
+ .
+ It provides simple transformation from JSON to arbitrary string output
+ controlled through configuration.  Each output has a configurable sample
+ rate.
+ .
+ Features:
+ .
+ - Supported input types: Kafka consumer or piped command.
+ - Supported output types: Piped command or file.
+ - Configuration file syntax is backwards compatible with Wikimedia's udp2log
+ - Configurable output queue size
+ - Memory frugal: message payload is shared by all output queues
+ - Configured with configuration file
+ - Operates as a daemon (daemonization, pidfile)
+ - Closes/stops and reopens/restarts all inputs and outputs on SIGHUP.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8a4de2c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kafkatee
+Source: https://github.com/wikimedia/analytics-kafkatee
+
+License: BSD-2-clause
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  .
+  1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+Files: *
+Copyright: 2014 Wikimedia Foundation, Inc.
+   2014 Magnus Edenhill
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2014 Andrew Otto (WMF) 
+   2014 Wikimedia Foundation, Inc.
+License: BSD-2-clause
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..0039923
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[git-buildpackage]
+upstream-tree=branch
+upstream-branch=master
+debian-branch=debian
+upstream-tag=%(version)s
+debian-tag=debian/%(version)s
+tarball-dir = ../tarballs
+export-dir

[MediaWiki-commits] [Gerrit] Update src submodule to current master - change (mediawiki...deploy)

[GWicke (Code Review)]

GWicke has uploaded a new change for review.

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

Change subject: Update src submodule to current master
..

Update src submodule to current master

Change-Id: I5ba714441f067cbff4445d0ddec7d9d5691467a4
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/19/110619/1

diff --git a/src b/src
index cc4483b..2d663eb 16
--- a/src
+++ b/src
-Subproject commit cc4483b83fca5163b100d33bc357070cae2b3e0c
+Subproject commit 2d663ebe5938956df278ccace78fafba3b014f2e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ba714441f067cbff4445d0ddec7d9d5691467a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke 

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