[MediaWiki-commits] [Gerrit] repool db1071 in s5 - change (operations/mediawiki-config)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: repool db1071 in s5
..

repool db1071 in s5

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4c76b6f..a977c2d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -132,6 +132,7 @@
'db1037' => 400, # 1.4TB  64GB
'db1045' => 400, # 1.4TB  64GB
'db1049' => 400, # 1.4TB  64GB
+   'db1071' => 500, # 1.4TB  64GB
),
's6' => array(
'db1023' => 0,   # 1.4TB  64GB

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

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

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

[MediaWiki-commits] [Gerrit] Allow import from any WMF project to any other - change (operations/mediawiki-config)

[TTO (Code Review)]

TTO has uploaded a new change for review.

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

Change subject: Allow import from any WMF project to any other
..

Allow import from any WMF project to any other

It's been a long time coming, but here it is.

The old wgImportSources configuration has been completely removed, as there
is no need for it. In its place, we have $wmgCommonlyUsedImportSources,
which is used to place $lang and en at the top of the list for convenience,
and $wmgAdditionalImportSources, which is used to add chapter wikis and
Wikimanias as import sources for meta.

Also adding a missing ) to the import user agent.

DO NOT MERGE until I442a9afadc75f42f63d8c9c32ee2920374ceb26d is merged.
Otherwise, users will get annoyed.

Bug: 15583
Change-Id: Ib325df7c76837e1936b320d2a2441f10405090cd
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 154 insertions(+), 288 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 06ee65b..1ca250f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1191,7 +1191,121 @@
 include $IP . '/extensions/AntiSpoof/AntiSpoof.php';
 
 // For transwiki import
-ini_set( 'user_agent', 'Wikimedia internal server fetcher (n...@wikimedia.org' 
);
+ini_set( 'user_agent', 'Wikimedia internal server fetcher 
(n...@wikimedia.org)' );
+
+// Set up a global map of import sources
+$wgImportSources = array(
+   'w' => array(),
+   'wikt' => array(),
+   'b' => array(),
+   'n' => array(),
+   'q' => array(),
+   's' => array( 'oldwikisource' ),
+   'v' => array( 'betawikiversity' ),
+   'voy' => array(),
+   // common special wikis
+   'commons', 'incubator', 'mediawikiwiki', 'meta', 'wikispecies', 
'wikidata',
+   // rarely-needed special wikis
+   'foundation', 'nostalgia', 'outreach', 'strategy', 'tenwiki', 
'testwiki',
+   'test2wiki', 'testwikidata', 'usability', 'wikitech',
+);
+// Allow for "commonly used" import sources to appear at top of the list.
+// For now, this only works for language projects. There are few enough special
+// wikis that they can all be seen at once in the UI.
+foreach ( $wmgCommonlyUsedImportSources as $key => $value ) {
+   if ( is_array( $value ) ) {
+   $wgImportSources[$key] = array_merge( $wgImportSources[$key], 
+   array_unique( $value ) );
+   }
+}
+// Add new wikis here as they are added to the cluster.
+// Wikipedia
+$wgImportSources['w'] = array_merge( $wgImportSources['w'], array( 'aa', 'ab',
+'ace', 'af', 'ak', 'als',
+'am', 'ang', 'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar',
+'bat_smg', 'ba', 'bcl', 'be_x_old', 'be', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn',
+'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk_zam', 'cdo', 'ceb', 'ce',
+'cho', 'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv',
+'cy', 'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 
'es',
+'et', 'eu', 'ext', 'fa', 'ff', 'fiu_vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr',
+'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv',
+'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
+'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
+'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
+'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
+'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt',
+'lv', 'map_bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml', 'mn', 'mo',
+'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah', 'nap', 'na',
+'nds_nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no', 'nrm', 'nso', 
'nv',
+'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl',
+'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn',
+'roa_rup', 'roa_tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa', 'scn', 'sco', 
'sc',
+'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm', 'sn', 'so', 'sq',
+'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl', 'ta', 'tet', 'te',
+'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts', 'tt', 'tum', 'tw',
+'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls',
+'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea',
+'zh_classical', 'zh_min_nan', 'zh_yue', 'zh', 'zu' ) );
+// Wiktionary
+$wgImportSources['wikt'] = array_merge( $wgImportSources['wikt'], array( 'aa',
+'ab', 'af', 'ak', 'als',
+'am', 'ang', 'an', 'ar', 'ast', 'as', 'av', 'ay', 'az', 'be', 'bg', 'bh', 'bi',
+'bm', 'bn', 'bo', 'br', 'bs', 'ca', 'chr', 'ch', 'co', 'cr', 'csb', 'cs', 'cy',
+'da','de', 'dv', 'dz', 'el', 'en', 'eo', 'es', 'e

[MediaWiki-commits] [Gerrit] category.py: consider also files, not only pages - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: category.py: consider also files, not only pages
..


category.py: consider also files, not only pages

In CategoryTidyRobot(), a category is considered empty only if no pages
are present, while number of files is not considered.

This patch fixes it.

Change-Id: I1a340e2337d44caeedd435a40160736ea943d7cb
---
M scripts/category.py
1 file changed, 10 insertions(+), 8 deletions(-)

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



diff --git a/scripts/category.py b/scripts/category.py
index fa7a3ea..cf07768 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -887,15 +887,17 @@
 def run(self):
 cat = pywikibot.Category(self.site, self.catTitle)
 
-if cat.categoryinfo['pages'] == 0:
-pywikibot.output(u'There are no articles in category %s'
+empty = True
+preloadingGen = pagegenerators.PreloadingGenerator(cat.articles())
+for article in preloadingGen:
+empty = False
+pywikibot.output('')
+pywikibot.output(u'=' * 67)
+self.move_to_category(article, cat, cat)
+
+if empty:
+pywikibot.output(u'There are no articles or files in category %s'
  % self.catTitle)
-else:
-preloadingGen = pagegenerators.PreloadingGenerator(cat.articles())
-for article in preloadingGen:
-pywikibot.output('')
-pywikibot.output(u'=' * 67)
-self.move_to_category(article, cat, cat)
 
 
 class CategoryTreeRobot:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a340e2337d44caeedd435a40160736ea943d7cb
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] repool es1001 - change (operations/mediawiki-config)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: repool es1001
..

repool es1001

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index dcc73dd..4c76b6f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -14,7 +14,7 @@
 );
 
 $wmgOldExtTemplate = array(
-   # maintenance '10.64.0.25'  => 1, # es1001
+   '10.64.0.25'  => 1, # es1001
'10.64.16.40' => 1, # es1002
'10.64.16.41' => 1, # es1003
'10.64.16.42' => 1, # es1004

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'contenthandler' - change (mediawiki...MassMessage)

[Wctaiwan (Code Review)]

Wctaiwan has uploaded a new change for review.

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

Change subject: Merge branch 'contenthandler'
..

Merge branch 'contenthandler'

Change-Id: I9e4edb664506660a02eaa0373eaa00602fe741b6
---
M MassMessage.alias.php
M i18n/en.json
2 files changed, 1 insertion(+), 44 deletions(-)


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

diff --git a/MassMessage.alias.php b/MassMessage.alias.php
index a819b8e..3a704c4 100644
--- a/MassMessage.alias.php
+++ b/MassMessage.alias.php
@@ -114,4 +114,4 @@
 /** Traditional Chinese (中文（繁體）‎) */
 $specialPageAliases['zh-hant'] = array(
'MassMessage' => array( '大量資訊' ),
-);
+);
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index 94b16ee..2677921 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,48 +1,6 @@
 {
"@metadata": {
"authors": [
-<<< HEAD   (e6e7fb Merge "Remove deprecated getResultProperties (since 
1.24)")
-   "Kunal Mehta"
-   ]
-   },
-   "massmessage": "Send mass message",
-   "massmessage-desc": "Allows users to easily send a message to a list of 
users",
-   "massmessage-form-spamlist": "Page or category containing list of pages 
to leave a message on:",
-   "massmessage-form-subject": "Subject of the message (also used as the 
edit summary):",
-   "massmessage-form-message": "Body of the message:",
-   "massmessage-form-preview": "Preview",
-   "massmessage-form-submit": "Send",
-   "massmessage-fieldset-preview": "Preview",
-   "massmessage-submitted": "Your message delivery to {{PLURAL:$1|$1 
page|$1 pages}} has been queued.",
-   "massmessage-just-preview": "This is just a preview. Press 
\"{{int:massmessage-form-submit}}\" to send the message.",
-   "massmessage-spamlist-doesnotexist": "The specified page-list page does 
not exist.",
-   "massmessage-empty-subject": "The subject line is empty.",
-   "massmessage-empty-message": "The message body is empty.",
-   "massmessage-unescaped-langlinks": "Warning: There are unescaped 
language links in your message.",
-   "massmessage-no-timestamp": "Warning: Your message does not include a 
timestamp or signature.",
-   "massmessage-form-header": "Use the form below to send messages to a 
specified list. All fields are required 
([https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:MassMessage 
more information]).",
-   "massmessage-target": "[//$1$2?title={{urlencode:$3|WIKI}} $3]",
-   "massmessage-queued-count": "Queued [[Special:MassMessage|mass 
messages]]",
-   "massmessage-hidden-comment": "",
-   "massmessage-optout-category": "Opted-out of message delivery",
-   "massmessage-badhtml": "Your message may have {{PLURAL:$2|an unclosed 
HTML tag|unclosed HTML tags}}: $1.",
-   "massmessage-parse-badurl": "\"$1\" is not a valid site.",
-   "massmessage-parse-badpage": "\"$1\" is not a valid page title.",
-   "massmessage-global-disallowed": "Messages can only be sent to local 
pages.",
-   "right-massmessage": "Send a message to multiple users at once",
-   "action-massmessage": "send a message to multiple users at once",
-   "log-name-massmessage": "Mass message log",
-   "log-description-massmessage": "These events track users sending 
messages.",
-   "logentry-massmessage-send": "$1 {{GENDER:$2|sent a message}} to $3",
-   "logentry-massmessage-failure": "Delivery of \"$4\" to $3 failed with 
an error code of $5",
-   "logentry-massmessage-skipbadns": "Delivery of \"$4\" to $3 was skipped 
because target was in a namespace that cannot be posted in",
-   "logentry-massmessage-skipoptout": "Delivery of \"$4\" to $3 was 
skipped because target has opted-out of message delivery",
-   "logentry-massmessage-skipnouser": "Delivery of \"$4\" to $3 was 
skipped because user account does not exist",
-   "massmessage-cannot-rename": "This is a system account and cannot be 
renamed.",
-   "massmessage-message-footer": "",
-   "massmessage-nextsteps": "[[Special:MassMessage|Send another message]] 
or [[Special:Statistics|view how many messages are queued]]."
-}
-===
"Kunal Mehta",
"wctaiwan"
]
@@ -146,4 +104,3 @@
"massmessage-list-category": "MassMessage delivery lists",
"massmessage-list-category-desc": "The page is a delivery list for the 
[[Special:MassMessage|MassMessage]] extension."
 }
->>> BRANCH (a3ae50 Add tests to Database group)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e4edb664506660a02eaa0373eaa00602fe741b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: con

[MediaWiki-commits] [Gerrit] Add support for single-lang families -> multi-lang families ... - change (pywikibot/core)

[Zhuyifei1999 (Code Review)]

Zhuyifei1999 has uploaded a new change for review.

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

Change subject: Add support for single-lang families -> multi-lang families 
interfamily link
..

Add support for single-lang families -> multi-lang families interfamily link

* Done both for [[lang:page]] and [[family:page]] to pywikibot/page.py under 
Link().parse()
** [[lang:page]] depends on family.interwiki_forward
** [[family:page]] language fallback list:
**# original language if available
**# en available
**# most used language if listed
**# available language
* Added 2 links and 7 comparisons to tests/page_tests.py under 
TestLinkObject().testHashCmp()

Change-Id: Ia742c33e3a83ae5f489654c19199b06f0d7c33d1
---
M pywikibot/page.py
M tests/page_tests.py
2 files changed, 32 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/37/157337/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index e77b23e..347219f 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -3690,6 +3690,7 @@
 continue
 
 fam = self._site.family
+iw_forw = pywikibot.site.Family(fam.interwiki_forward) if 
fam.interwiki_forward else None
 prefix = t[:t.index(u":")].lower()
 ns = self._site.ns_index(prefix)
 if ns:
@@ -3698,7 +3699,8 @@
 self._namespace = ns
 break
 if prefix in list(fam.langs.keys())\
-or prefix in fam.get_known_families(site=self._site):
+or prefix in fam.get_known_families(site=self._site)\
+or (iw_forw and prefix in list(iw_forw.langs.keys())):
 # looks like an interwiki link
 if not firstPass:
 # Can't make a local interwiki link to an interwiki link.
@@ -3708,19 +3710,32 @@
 t = t[t.index(u":"):].lstrip(u":").lstrip(u" ")
 if prefix in list(fam.langs.keys()):
 newsite = pywikibot.Site(prefix, fam)
+elif iw_forw and prefix in list(iw_forw.langs.keys()):
+newsite = pywikibot.Site(prefix, iw_forw)
 else:
 otherlang = self._site.code
-familyName = 
fam.get_known_families(site=self._site)[prefix]
-if familyName in ['commons', 'meta']:
-otherlang = familyName
 try:
-newsite = pywikibot.Site(otherlang, familyName)
-except ValueError:
+familyName = 
fam.get_known_families(site=self._site)[prefix]
+family = pywikibot.site.Family(familyName, fatal=False)
+except (KeyError, ValueError):
 raise pywikibot.Error(
 """\
 %s is not a local page on %s, and the %s family is
 not supported by PyWikiBot!"""
 % (self._text, self._site, familyName))
+if otherlang in list(family.langs.keys()):
+pass
+elif 'en' in list(family.langs.keys()):
+# fallback to English
+otherlang = 'en'
+elif family.languages_by_size:
+# fallback to most-used language
+otherlang = family.languages_by_size[0]
+elif family.langs:
+# fallback to a language
+otherlang = family.langs.keys()[0]
+
+newsite = pywikibot.Site(otherlang, family)
 
 # Redundant interwiki prefix to the local wiki
 if newsite == self._site:
diff --git a/tests/page_tests.py b/tests/page_tests.py
index ebc37d6..f195d19 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -27,6 +27,7 @@
 enwiki = pywikibot.Site("en", "wikipedia")
 frwiki = pywikibot.Site("fr", "wikipedia")
 itwikt = pywikibot.Site("it", "wiktionary")
+commonswiki = pywikibot.Site("commons", "commons")
 
 namespaces = {0: [u""],# en.wikipedia.org namespaces for testing
   1: [u"Talk:"],   # canonical form first, then others
@@ -95,14 +96,23 @@
 l1 = pywikibot.page.Link('Test', source=self.enwiki)
 l2 = pywikibot.page.Link('en:Test', source=self.frwiki)
 l3 = pywikibot.page.Link('wikipedia:en:Test', source=self.itwikt)
+l4 = pywikibot.page.Link('en:Test', source=self.commonswiki)
+l5 = pywikibot.page.Link('wikipedia:Test', source=self.commonswiki)
 
 def assertHashCmp(link1, link2):
 self.assertEqual(link1, link2)
 self.assertEqual(hash(link1), hash(link2))
 
 assertHashCmp(l1, l2)
-assertHashCmp(l1, l3)
 assertHashCmp(l2, l3)
+assertHashCmp(

[MediaWiki-commits] [Gerrit] repool es1001 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: repool es1001
..


repool es1001

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index dcc73dd..4c76b6f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -14,7 +14,7 @@
 );
 
 $wmgOldExtTemplate = array(
-   # maintenance '10.64.0.25'  => 1, # es1001
+   '10.64.0.25'  => 1, # es1001
'10.64.16.40' => 1, # es1002
'10.64.16.41' => 1, # es1003
'10.64.16.42' => 1, # es1004

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

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

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

[MediaWiki-commits] [Gerrit] Don't auto-select first alphabetical item in import subproje... - change (mediawiki/core)

[TTO (Code Review)]

TTO has uploaded a new change for review.

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

Change subject: Don't auto-select first alphabetical item in import subproject 
list
..

Don't auto-select first alphabetical item in import subproject list

Currently when you load Special:Import, the first subproject in
alphabetical order gets selected. Instead, the first subproject in the
list should be selected by default (i.e. no  element should be
given the "selected" attribute).

Change-Id: I442a9afadc75f42f63d8c9c32ee2920374ceb26d
---
M resources/src/mediawiki.special/mediawiki.special.import.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/157336/1

diff --git a/resources/src/mediawiki.special/mediawiki.special.import.js 
b/resources/src/mediawiki.special/mediawiki.special.import.js
index a9a985e..5622b32 100644
--- a/resources/src/mediawiki.special/mediawiki.special.import.js
+++ b/resources/src/mediawiki.special/mediawiki.special.import.js
@@ -2,7 +2,7 @@
  * JavaScript for Special:Import
  */
 ( function ( $ ) {
-   function updateImportSubprojectList() {
+   function updateImportSubprojectList( firstTime ) {
var $projectField = $( '#mw-import-table-interwiki #interwiki' 
),
$subprojectField = $projectField.parent().find( 
'#subproject' ),
$selected = $projectField.find( ':selected' ),
@@ -14,7 +14,7 @@
option = document.createElement( 'option' );
option.appendChild( document.createTextNode( el 
) );
option.setAttribute( 'value', el );
-   if ( oldValue === el ) {
+   if ( oldValue === el && firstTime !== true ) {
option.setAttribute( 'selected', 
'selected' );
}
return option;
@@ -29,7 +29,7 @@
var $projectField = $( '#mw-import-table-interwiki #interwiki' 
);
if ( $projectField.length ) {
$projectField.change( updateImportSubprojectList );
-   updateImportSubprojectList();
+   updateImportSubprojectList( true );
}
} );
 }( jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] Enable extra_port 3307 on MariaDB 10 slaves - change (operations/puppet)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: Enable extra_port 3307 on MariaDB 10 slaves
..

Enable extra_port 3307 on MariaDB 10 slaves

Change-Id: I7ce34e332f4271f4ecf03fb984f1537ad1a5361d
---
M templates/mariadb/production.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/157335/1

diff --git a/templates/mariadb/production.my.cnf.erb 
b/templates/mariadb/production.my.cnf.erb
index 700f78e..fc9b8c5 100644
--- a/templates/mariadb/production.my.cnf.erb
+++ b/templates/mariadb/production.my.cnf.erb
@@ -9,6 +9,7 @@
 user  = mysql
 socket= /tmp/mysql.sock
 port  = 3306
+extra_port= 3307
 datadir   = <%= @datadir %>
 tmpdir= <%= @tmpdir %>
 server_id = <%= @server_id %>

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

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

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

[MediaWiki-commits] [Gerrit] PEP257 on pywikibot folder part III - change (pywikibot/core)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: PEP257 on pywikibot folder part III
..

PEP257 on pywikibot folder part III

files: logentries, login, page, pagegenerators, textlib, throttle.
tools, version, xmlreader
Checked by hand and added some suggestions based on this change:
I910fdd7ce36752fa44b9a6654d7b8509e5020dee

Change-Id: Ic65452262d16ba2ec83633125ce1e3145a6f3aef
---
M pywikibot/logentries.py
M pywikibot/login.py
M pywikibot/page.py
M pywikibot/pagegenerators.py
M pywikibot/textlib.py
M pywikibot/throttle.py
M pywikibot/tools.py
M pywikibot/version.py
M pywikibot/xmlreader.py
9 files changed, 109 insertions(+), 93 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/34/157334/1

diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py
index d0e753f..96b520f 100644
--- a/pywikibot/logentries.py
+++ b/pywikibot/logentries.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8  -*-
-"""
-Objects representing Mediawiki log entries
-"""
+"""Objects representing Mediawiki log entries."""
 #
 # (C) Pywikibot team, 2007-2013
 #
@@ -22,6 +20,7 @@
 Simple custom dictionary that raises a custom KeyError and logs
 debugging information when a key is missing
 """
+
 def __missing__(self, key):
 pywikibot.debug(u"API log entry received:\n" + repr(self),
 _logger)
@@ -30,7 +29,7 @@
 
 class LogEntry(object):
 
-"""Generic log entry"""
+"""Generic log entry."""
 
 # Log type expected. None for every type, or one of the (letype) str :
 # block/patrol/etc...
@@ -38,7 +37,7 @@
 _expectedType = None
 
 def __init__(self, apidata):
-"""Initialize object from a logevent dict returned by MW API"""
+"""Initialize object from a logevent dict returned by MW API."""
 self.data = LogDict(apidata)
 if self._expectedType is not None and self._expectedType != 
self.type():
 raise Error("Wrong log type! Expecting %s, received %s instead."
@@ -57,7 +56,7 @@
 return self.data['ns']
 
 def title(self):
-"""Page on which action was performed"""
+"""Return Page object on which action was performed."""
 if not hasattr(self, '_title'):
 self._title = pywikibot.Page(pywikibot.Link(self.data['title']))
 return self._title
@@ -73,7 +72,7 @@
 return self.data['user']
 
 def timestamp(self):
-"""Timestamp object corresponding to event timestamp"""
+"""Return Timestamp object corresponding to event timestamp."""
 if not hasattr(self, '_timestamp'):
 self._timestamp = 
pywikibot.Timestamp.fromISOformat(self.data['timestamp'])
 return self._timestamp
@@ -178,7 +177,7 @@
 return self.data['move']['new_ns']
 
 def new_title(self):
-"""Page object of the new title"""
+"""Page object of the new title."""
 if not hasattr(self, '_new_title'):
 self._new_title = 
pywikibot.Page(pywikibot.Link(self.data['move']['new_title']))
 return self._new_title
@@ -213,6 +212,7 @@
 
 Only available method is create()
 """
+
 _logtypes = {
 'block': BlockEntry,
 'protect': ProtectEntry,
@@ -252,8 +252,9 @@
 @staticmethod
 def _getEntryClass(logtype):
 """
-Returns the class corresponding to the @logtype string parameter.
-Returns LogEntry if logtype is unknown or not supported
+Return the class corresponding to the @logtype string parameter.
+
+Return LogEntry if logtype is unknown or not supported
 """
 try:
 return LogEntryFactory._logtypes[logtype]
@@ -261,9 +262,7 @@
 return LogEntry
 
 def _createFromData(self, logdata):
-"""
-Checks for logtype from data, and creates the correct LogEntry
-"""
+"""Check for logtype from data, and creates the correct LogEntry."""
 try:
 logtype = logdata['type']
 return LogEntryFactory._getEntryClass(logtype)(logdata)
diff --git a/pywikibot/login.py b/pywikibot/login.py
index 0026aba..290afa0 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -1,8 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8  -*-
-"""
-Library to log the robot in to a wiki account.
-"""
+"""Library to log the robot in to a wiki account."""
 #
 # (C) Rob W.W. Hooft, 2003
 # (C) Pywikibot team, 2003-2012
diff --git a/pywikibot/page.py b/pywikibot/page.py
index e77b23e..cabcece 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -131,9 +131,11 @@
 return self.site.data_repository()
 
 def namespace(self):
-"""Return the number of the namespace of the page.
+"""
+Return the number of the namespace of the page.
 
-@return: int
+@return: namespace of the page
+@rtype: int
 

[MediaWiki-commits] [Gerrit] Enable thread pool on MariaDB 10 slaves - change (operations/puppet)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: Enable thread pool on MariaDB 10 slaves
..


Enable thread pool on MariaDB 10 slaves

Change-Id: I9f7480f1dea57128e0bf0cc6a8e6247db7f3a7c3
---
M templates/mariadb/production.my.cnf.erb
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/templates/mariadb/production.my.cnf.erb 
b/templates/mariadb/production.my.cnf.erb
index e640bee..700f78e 100644
--- a/templates/mariadb/production.my.cnf.erb
+++ b/templates/mariadb/production.my.cnf.erb
@@ -23,7 +23,8 @@
 skip-name-resolve
 temp-pool
 
-max_connections= 2500
+thread_handling= pool-of-threads
+max_connections= 5000
 max_connect_errors = 10
 max_allowed_packet = 16M
 connect_timeout= 3

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

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

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

[MediaWiki-commits] [Gerrit] Enable thread pool on MariaDB 10 slaves - change (operations/puppet)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: Enable thread pool on MariaDB 10 slaves
..

Enable thread pool on MariaDB 10 slaves

Change-Id: I9f7480f1dea57128e0bf0cc6a8e6247db7f3a7c3
---
M templates/mariadb/production.my.cnf.erb
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/templates/mariadb/production.my.cnf.erb 
b/templates/mariadb/production.my.cnf.erb
index e640bee..700f78e 100644
--- a/templates/mariadb/production.my.cnf.erb
+++ b/templates/mariadb/production.my.cnf.erb
@@ -23,7 +23,8 @@
 skip-name-resolve
 temp-pool
 
-max_connections= 2500
+thread_handling= pool-of-threads
+max_connections= 5000
 max_connect_errors = 10
 max_allowed_packet = 16M
 connect_timeout= 3

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

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

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

[MediaWiki-commits] [Gerrit] Use https for www.aclu.org - change (wikimedia/TransparencyReport)

[Chmarkine (Code Review)]

Chmarkine has uploaded a new change for review.

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

Change subject: Use https for www.aclu.org
..

Use https for www.aclu.org

In I136d08dd, the link to www.aclu.org was changed to protocol relative.
But https://www.aclu.org is https only, so this patch changes the link
to https.

Change-Id: Idf6655dc6ad5b5d4a741b071cc6a26bfaf00c5a4
---
M build/faq.html
M locales/en.yml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/30/157330/1

diff --git a/build/faq.html b/build/faq.html
index e2067b2..1458519 100644
--- a/build/faq.html
+++ b/build/faq.html
@@ -74,7 +74,7 @@
 

Help! My 
personal information is being sought because of something I did on the 
Wikimedia projects. What should I do?
-   If you are the subject of a subpoena, it is 
highly recommended that you consult your own lawyer immediately. There are a 
number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the Electronic Frontier Foundation (EFF). If you 
need help finding an attorney, WMF may be able to put you in touch with some of 
these organizations or help you secure an attorney at reduced or pro-bono 
rates. In rare cases, assistance may also be available under our Legal
 Fees Assistance Program or Defense
 of Contributors Program.Additionally, in certain situations, WMF 
may challenge a subpoena on a user’s behalf if it is unnecessarily broad or 
burdensome, or if we believe the subpoena threatens the free speech of users on 
our projects. For more information about subpoenas, see our Subpoena 
FAQ. 
+   If you are the subject of a subpoena, it is 
highly recommended that you consult your own lawyer immediately. There are a 
number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the 
Electronic Frontier Foundation (EFF). If you 
need help finding an attorney, WMF may be able to put you in touch with some of 
these organizations or help you secure an attorney at reduced or pro-bono 
rates. In rare cases, assistance may also be available under our Legal
 Fees Assistance Program or Defense
 of Contributors Program.Additionally, in certain situations, WMF 
may challenge a subpoena on a user’s behalf if it is unnecessarily broad or 
burdensome, or if we believe the subpoena threatens the free speech of users on 
our projects. For more information about subpoenas, see our Subpoena 
FAQ. 
 

 
diff --git a/locales/en.yml b/locales/en.yml
index aae548f..0f7443d 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -99,7 +99,7 @@
 q_nonpublic_personal_information: "When would you not tell a user that his 
or her nonpublic personal information is being disclosed as a result of a legal 
process, such as a subpoena?"
 a_nonpublic_personal_information: "We are committed to notifying users 
if we plan on disclosing nonpublic personal information. However, we cannot 
notify a user if we are legally restrained from doing so (e.g. by a gag order), 
if a credible threat to life or limb is present, or if the user has not 
provided us with an e-mail address or valid contact information."
 q_my_personal_information: "Help! My personal information is being sought 
because of something I did on the Wikimedia projects. What should I do?"
-a_my_personal_information: "If you are the subject of a subpoena, it is 
highly recommended that you consult your own lawyer immediately. There are a 
number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the Electronic Frontier Foundation (EFF). If you 
need help finding an attorney, WMF may be able to put you in touch with some of 
these organizations or help you secure an attorney at reduced or pro-bono 
rates. In rare cases, assistance may also be available under our Legal
 Fees Assistance Program or Defense
 of Contributors Program.Additionally, in certain situations, WMF 
may challenge a subpoena on a user’s behalf if it is unnecessarily broad or 
burdensome, or if we believe the subpoena threatens the free speech of users on 
our projects. For more information about subpoenas, see our Subpoena 
FAQ. "
+a_my_personal_information: "If you are the subject of a subpoena, it is 
highly recommended that you consult your own lawyer immediately. There are a 
number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the 
Electronic Frontier Foundation (EFF). If you 
need help finding an attorney, WMF may be able to put you in touch with some of 
these organizations or help you secure an attorney at reduced or pro-bono 
rates. In rare cases, assistance may also be available under our Legal
 Fees Assistance Program or Defense
 of Contributors Program.Additionally, in certain situat

[MediaWiki-commits] [Gerrit] prepare es1001 for upgrade - change (operations/puppet)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: prepare es1001 for upgrade
..


prepare es1001 for upgrade

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 2bac609..6465460 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1074,7 +1074,7 @@
 }
 
 # es1 equad
-node /es100[1-4]\.eqiad\.wmnet/ {
+node /es100[2-4]\.eqiad\.wmnet/ {
 include admin
 
 $cluster = 'mysql'
@@ -1083,6 +1083,15 @@
 }
 }
 
+node /es100[1]\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 'es1',
+}
+}
+
 node /es4\.pmtpa\.wmnet/ {
 include admin
 $cluster = 'mysql'

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

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

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

[MediaWiki-commits] [Gerrit] prepare es1001 for upgrade - change (operations/puppet)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: prepare es1001 for upgrade
..

prepare es1001 for upgrade

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/157329/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2bac609..6465460 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1074,7 +1074,7 @@
 }
 
 # es1 equad
-node /es100[1-4]\.eqiad\.wmnet/ {
+node /es100[2-4]\.eqiad\.wmnet/ {
 include admin
 
 $cluster = 'mysql'
@@ -1083,6 +1083,15 @@
 }
 }
 
+node /es100[1]\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 'es1',
+}
+}
+
 node /es4\.pmtpa\.wmnet/ {
 include admin
 $cluster = 'mysql'

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

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

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

[MediaWiki-commits] [Gerrit] reassign db1071 to s5 - change (operations/puppet)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: reassign db1071 to s5
..


reassign db1071 to s5

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 7ea0365..2bac609 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -770,7 +770,7 @@
 }
 
 # eqiad dbs
-node /^db10(51|52|55|61|62|65|66|71)\.eqiad\.wmnet/ {
+node /^db10(51|52|55|61|62|65|66)\.eqiad\.wmnet/ {
 
 include admin
 $cluster = 'mysql'
@@ -861,6 +861,15 @@
 }
 }
 
+node /^db10(71)\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 's5',
+}
+}
+
 ## x1 shard
 node /^db10(29|31)\.eqiad\.wmnet/ {
 

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

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

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

[MediaWiki-commits] [Gerrit] reassign db1071 to s5 - change (operations/puppet)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: reassign db1071 to s5
..

reassign db1071 to s5

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/157328/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 7ea0365..2bac609 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -770,7 +770,7 @@
 }
 
 # eqiad dbs
-node /^db10(51|52|55|61|62|65|66|71)\.eqiad\.wmnet/ {
+node /^db10(51|52|55|61|62|65|66)\.eqiad\.wmnet/ {
 
 include admin
 $cluster = 'mysql'
@@ -861,6 +861,15 @@
 }
 }
 
+node /^db10(71)\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 's5',
+}
+}
+
 ## x1 shard
 node /^db10(29|31)\.eqiad\.wmnet/ {
 

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

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

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

[MediaWiki-commits] [Gerrit] pool db1073, depool db1071 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: pool db1073, depool db1071
..


pool db1073, depool db1071

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 40443cb..dcc73dd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -93,8 +93,8 @@
'db1062' => 200, # 2.8TB 128GB, api
'db1065' => 500, # 2.8TB 160GB
'db1066' => 500, # 2.8TB 160GB
-   'db1071' => 500, # 2.8TB 160GB
'db1072' => 500, # 2.8TB 160GB
+   'db1073' => 500, # 2.8TB 160GB
),
's2' => array(
'db1024' => 0,   # 1.4TB  64GB
@@ -415,6 +415,7 @@
'db1070' => '10.64.48.25', #do not remove or comment out
'db1071' => '10.64.48.26', #do not remove or comment out
'db1072' => '10.64.48.27', #do not remove or comment out
+   'db1073' => '10.64.48.28', #do not remove or comment out
 ),
 
 'externalLoads' => array(

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

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

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

[MediaWiki-commits] [Gerrit] pool db1073, depool db1071 - change (operations/mediawiki-config)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: pool db1073, depool db1071
..

pool db1073, depool db1071

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 40443cb..dcc73dd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -93,8 +93,8 @@
'db1062' => 200, # 2.8TB 128GB, api
'db1065' => 500, # 2.8TB 160GB
'db1066' => 500, # 2.8TB 160GB
-   'db1071' => 500, # 2.8TB 160GB
'db1072' => 500, # 2.8TB 160GB
+   'db1073' => 500, # 2.8TB 160GB
),
's2' => array(
'db1024' => 0,   # 1.4TB  64GB
@@ -415,6 +415,7 @@
'db1070' => '10.64.48.25', #do not remove or comment out
'db1071' => '10.64.48.26', #do not remove or comment out
'db1072' => '10.64.48.27', #do not remove or comment out
+   'db1073' => '10.64.48.28', #do not remove or comment out
 ),
 
 'externalLoads' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Suppress --!> as a comment closing tag in browsers - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Suppress --!> as a comment closing tag in browsers
..


Suppress --!> as a comment closing tag in browsers

 * By converting it to --¡>

 * Still dirty diffs, but the behavior is consistent with what the
   php+tidy combination gives us and should be covered up by selser.

 * Ex. semediawiki/Nästa_dagordning?oldid=27867

Bug: 58184
Change-Id: I99ff6b5058683f535f6fdc38d8e4edb5b43c6210
---
M lib/pegTokenizer.pegjs.txt
M tests/parserTests.txt
2 files changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index c411907..4b63049 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -360,16 +360,21 @@
 / & { stops.dec('h'); return false; }
 ) { return r; }
 
+
 comment
 ='' / eof)
 {
-return [new CommentTk( c.join(''), { tsr: [peg$reportedPos, 
peg$currPos] } )];
+var data = c.join('');
+// Bug 58184: Browsers leniently accept --!> as a closing comment tag,
+// which differs from the php+tidy combo. Suppress that behaviour at
+// the cost of introducing a dirty diff. Selser should take care of it.
+data = data.replace(/--!>/g, "--¡>");
+return [new CommentTk( data, { tsr: [peg$reportedPos, peg$currPos] } 
)];
 }
 
 comment_chars
   = c:[^-] { return c; }
   / c:'-' !'->' { return c; }
-
 
 
 // Behavior switches. See 
https://www.mediawiki.org/wiki/Help:Magic_words#Behavior_switches
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fa1ec0f..89d2c48 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -1487,6 +1487,19 @@
 
 !! end
 
+# Bug 58184: document parsoid's behaviour
+!! test
+Suppress comment closing tag in lenient browsers
+!! options
+parsoid=wt2html,html2html
+!! wikitext
+
+!! html/php
+
+!! html/parsoid
+
+!! end
+
 !! test
 Comment in template title
 !! wikitext

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99ff6b5058683f535f6fdc38d8e4edb5b43c6210
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
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] linter should not lint white spaces as ignored table attr - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: linter should not lint white spaces as ignored table attr
..


linter should not lint white spaces as ignored table attr

Change-Id: Ib36a941ed194a6a0cf601dd5fc977957ad69abda
---
M lib/dom.linter.js
M tests/mocha/lintertest.js
2 files changed, 20 insertions(+), 5 deletions(-)

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



diff --git a/lib/dom.linter.js b/lib/dom.linter.js
index 275667f..aa84ead 100644
--- a/lib/dom.linter.js
+++ b/lib/dom.linter.js
@@ -120,7 +120,6 @@
 * Here foo gets Ignored and is found in the data-parsoid of  tags.
 */
 function logIgnoredTableAttr(env, c, dp, tmpl) {
-
var dsr, inTransclusion = false;
if (DU.hasNodeName(c, "table")) {
var fc = c.firstChild;
@@ -133,12 +132,14 @@
if (dp.sa) {
var wc = false;
// Discard attributes 
that are only whitespace and comments
-   for (var a in dp.sa) {
-   var re = 
/^\s*$|\n[ \t]*([ \t]|)*\n/g;
-   if ( (a || 
dp.sa.a) && (!re.test(a) || !re.test(dp.sa.a))) {
+   for (var key in dp.sa) {
+   var re = 
/^\s*$|^([ \t]|)*$/;
+   if 
((!re.test(key) || !re.test(dp.sa[key]) )) {
wc = 
true;
+   break;
}
}
+
if (wc) {
if ( tmpl ) {
   dsr = 
tmpl.dsr;
diff --git a/tests/mocha/lintertest.js b/tests/mocha/lintertest.js
index fcc953f..a801014 100644
--- a/tests/mocha/lintertest.js
+++ b/tests/mocha/lintertest.js
@@ -125,7 +125,7 @@
});
});
it( 'should lint ignored table attributes found in 
transclusions correctly', function() {
-   return parseWT( '{{echo|\n{{{!}}\n{{!}}- foo\n{{!}} 
bar\n{{!}}}\n}}').then( function ( result ) {
+   return parseWT( '{{echo|\n{{{!}}\n{{!}}- foo\n{{!}} 
bar\n{{!}}}\n}}' ).then( function ( result ) {
result.should.have.length( 1 );
result[0].should.have.a.property( "type", 
"ignored-table-attr" );
result[0].should.have.a.property( "wiki", 
"enwiki" );
@@ -133,6 +133,20 @@
result[0].should.have.a.property( "src", 
"{{echo|\n{{{!}}\n{{!}}- foo\n{{!}} bar\n{{!}}}\n}}" );
});
});
+   it( 'should not lint whitespaces as ignored table attributes', 
function() {
+   return parseWT( '{|\n|- \n| 1 
||style="text-align:left;"| p \n|}' ).then( function ( result ) {
+   result.should.have.length( 0 );
+   });
+   });
+   it( 'should lint as ignored table attributes', function() {
+   return parseWT( '{|\n|- attr\n|bar\n|}' 
).then( function ( result ) {
+   result.should.have.length( 1 );
+   result[0].should.have.a.property( "type", 
"ignored-table-attr" );
+   result[0].should.have.a.property( "wiki", 
"enwiki" );
+   result[0].dsr.should.include.members( [ 3, 30, 
22, 0 ] );
+   result[0].should.have.a.property( "src", "|- 
attr\n|bar" );
+   });
+   });
it( 'should lint Bogus image options correctly', function() {
return parseWT( '[[file:a.jpg|foo|bar]]' ).then( 
function ( result ) {
result.should.have.length( 1 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib36a941ed194a6a0cf601dd5fc977957ad69abda
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Hardikj 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Hardikj 
Gerrit-Reviewer: Marcoil 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-R

[MediaWiki-commits] [Gerrit] ganglia - add codfw to use - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: ganglia - add codfw to use
..

ganglia - add codfw to use

adjust the if-statement so codfw is treated like esams,
and uses the newer ganglia setup.

Then we should be able to add "standard" back to install2001
and not run into a duplicate definition, while being an aggreagator
and also a client.  Per talk with Mark.

Change-Id: Ic8bd2d80c1a826abf2e2352a63e8c0f20f98959d
---
M manifests/ganglia.pp
M modules/cdh
2 files changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index d30d653..bed7f35 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -21,7 +21,7 @@
 class ganglia {
 
 # FIXME: remove after the ganglia module migration
-if $::realm == 'labs' or ($::hostname in ['netmon1001'] or $::site == 
'esams' or ($::site == 'pmtpa' and $cluster in ['cache_bits'])) {
+if $::realm == 'labs' or ($::hostname in ['netmon1001'] or $::site == 
'esams' or $::site == 'codfw' or ($::site == 'pmtpa' and $cluster in 
['cache_bits'])) {
 $ganglia_cluster = $::realm ? {
 labs=> $::instanceproject,
 default => $cluster
diff --git a/modules/cdh b/modules/cdh
index 80dd7cb..895efb7 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 80dd7cbdf860a6f6a9d1574406b65e04735c07b1
+Subproject commit 895efb7097e39a2972ecc8dc28f76c5469d5d663

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

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

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

[MediaWiki-commits] [Gerrit] sanitize input, dont break when names incl. "'s - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: sanitize input, dont break when names incl. "'s
..


sanitize input, dont break when names incl. "'s

when importing wikis, and fetching their names,
escape the input and replace literal "'s

Bug: 59718

Change-Id: If0e89b34a3a9e88d66276000f7eb5eef85729dc5
---
M usr/lib/wikistats/update.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 8c363e7..ca86728 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -328,7 +328,8 @@
 $admins=$result["admins"];
 
 if (isset($import) && $import) {
-$wikiname=get_name_from_api($url);
+$wikiname=mysql_escape_string(get_name_from_api($url));
+$wikiname=str_replace("\"","'",$wikiname);
 }
 } elseif ($parsing_answer == 3) {
 echo "\\n 991 error ! - http: ".$row['http']." method: 
".$row['method']." url: ".$row['statsurl']." version: ".$row['version']." 
agent: $user_agent API: $url\n";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0e89b34a3a9e88d66276000f7eb5eef85729dc5
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] sanitize input, dont break when names incl. "'s - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: sanitize input, dont break when names incl. "'s
..

sanitize input, dont break when names incl. "'s

when importing wikis, and fetching their names,
escape the input and replace literal "'s

Change-Id: If0e89b34a3a9e88d66276000f7eb5eef85729dc5
---
M usr/lib/wikistats/update.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/24/157324/1

diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 8c363e7..ca86728 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -328,7 +328,8 @@
 $admins=$result["admins"];
 
 if (isset($import) && $import) {
-$wikiname=get_name_from_api($url);
+$wikiname=mysql_escape_string(get_name_from_api($url));
+$wikiname=str_replace("\"","'",$wikiname);
 }
 } elseif ($parsing_answer == 3) {
 echo "\\n 991 error ! - http: ".$row['http']." method: 
".$row['method']." url: ".$row['statsurl']." version: ".$row['version']." 
agent: $user_agent API: $url\n";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0e89b34a3a9e88d66276000f7eb5eef85729dc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] wikistats - add cron for gamepedia updates - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: wikistats - add cron for gamepedia updates
..


wikistats - add cron for gamepedia updates

Bug: 60472
Change-Id: I1004ef532b754af42a5b26fb616e354d0503ab16
---
M modules/wikistats/manifests/updates.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index ac19bb0..d281d5c 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -41,6 +41,7 @@
 'ro@21', # Rodovid
 'wk@21', # Wikkii
 're@22', # Referata
+'ga@22', # Gamepedias
 'pa@23', # Pardus
 'w3@23', # W3C
 ]: }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1004ef532b754af42a5b26fb616e354d0503ab16
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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 v1.1.0 - change (oojs/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Tag v1.1.0
..

Tag v1.1.0

Change-Id: I4def829361318ca4227d7e2ed4cfca862e41bae8
---
M History.md
M package.json
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/23/157323/1

diff --git a/History.md b/History.md
index 189599d..91e00df 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 # OOjs Release History
 
+## v1.1.0 / 2014-08-30
+* Make OO.EventEmitter#validateMethod private (Roan Kattouw)
+* readme: Fix "compatibility" and "appropriate" typo (Bartosz Dziewoński)
+
 ## v1.0.12 / 2014-08-20
 
 * build: Tell people which version they're using (James D. Forrester)
diff --git a/package.json b/package.json
index 638ef12..0e96663 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "description": "Power for object oriented javascript libraries.",
   "keywords": [
 "oo",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4def829361318ca4227d7e2ed4cfca862e41bae8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
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] do not require http to be 200 for import feature - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: do not require http to be 200 for import feature
..


do not require http to be 200 for import feature

usually when importing new wikis we just set the
API URLs and haven't ran any update yet, then run
this once to fetch the names. so they dont already
have a http status set. this is leftover from some
special case

Change-Id: I9ce873a3f9226afc6f7762e30f2e5b4b058d5d70
---
M usr/lib/wikistats/update.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 32d97ab..8c363e7 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -229,7 +229,7 @@
 break;
 case "import":
 # original import
-$query = "select id,'foo' as name,statsurl,'8' as method from ${table} 
where name is null and http='200' order by ts asc";
+$query = "select id,'foo' as name,statsurl,'8' as method from ${table} 
where name is null order by ts asc";
 # convert names of existing wikis
 # $query = "select id,name,statsurl,method from ${table} where name is 
not null and method=8 order by ts asc";
 $import=true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ce873a3f9226afc6f7762e30f2e5b4b058d5d70
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] do not require http to be 200 for import feature - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: do not require http to be 200 for import feature
..

do not require http to be 200 for import feature

usually when importing new wikis we just set the
API URLs and haven't ran any update yet, then run
this once to fetch the names. so they dont already
have a http status set. this is leftover from some
special case

Change-Id: I9ce873a3f9226afc6f7762e30f2e5b4b058d5d70
---
M usr/lib/wikistats/update.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/22/157322/1

diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 32d97ab..8c363e7 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -229,7 +229,7 @@
 break;
 case "import":
 # original import
-$query = "select id,'foo' as name,statsurl,'8' as method from ${table} 
where name is null and http='200' order by ts asc";
+$query = "select id,'foo' as name,statsurl,'8' as method from ${table} 
where name is null order by ts asc";
 # convert names of existing wikis
 # $query = "select id,name,statsurl,method from ${table} where name is 
not null and method=8 order by ts asc";
 $import=true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ce873a3f9226afc6f7762e30f2e5b4b058d5d70
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] Test that login required when user logged out - change (mediawiki...UploadWizard)

[Neilk (Code Review)]

Neilk has uploaded a new change for review.

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

Change subject: Test that login required when user logged out
..

Test that login required when user logged out

Change-Id: I4202b78db30da5e8ef32b9dd385e60997e0293dc
---
M tests/browser/features/step_definitions/upload_wizard_steps.rb
A tests/browser/features/support/pages/logout_page.rb
A tests/browser/features/upload_wizard_logged_out.feature
3 files changed, 48 insertions(+), 0 deletions(-)


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

diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb 
b/tests/browser/features/step_definitions/upload_wizard_steps.rb
index fc83382..f387c10 100644
--- a/tests/browser/features/step_definitions/upload_wizard_steps.rb
+++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb
@@ -9,6 +9,10 @@
 # UploadWizard top-level directory and at
 # 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
 #
+Given(/^I am logged out$/) do
+  visit LogoutPage
+end
+
 When(/^click button Continue$/) do
   on(UploadPage).continue_element.when_present(15).click
 end
@@ -44,6 +48,9 @@
   on(ReleaseRightsPage).thumbnail_element.when_present.should be_visible
 end
 
+Then(/^link to log in should appear$/) do
+  on(UploadWizardPage).logged_in_element.should be_visible
+end
 Then(/^(.+) checkbox should be there$/) do |_|
   on(LearnPage).skip_element.when_present.should be_visible
 end
diff --git a/tests/browser/features/support/pages/logout_page.rb 
b/tests/browser/features/support/pages/logout_page.rb
new file mode 100644
index 000..1c08634
--- /dev/null
+++ b/tests/browser/features/support/pages/logout_page.rb
@@ -0,0 +1,22 @@
+# Encoding: utf-8
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+# 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
+# No part of UploadWizard, including this file, may be copied, modified,
+# propagated, or distributed except according to the terms contained in the
+# COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+# 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+
+# Simple page with no elements defined since visiting it does the trick
+class LogoutPage
+  include PageObject
+
+  include URL
+  def self.url
+URL.url('Special:UserLogout')
+  end
+  page_url url
+end
diff --git a/tests/browser/features/upload_wizard_logged_out.feature 
b/tests/browser/features/upload_wizard_logged_out.feature
new file mode 100644
index 000..53e9447
--- /dev/null
+++ b/tests/browser/features/upload_wizard_logged_out.feature
@@ -0,0 +1,19 @@
+#
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+# 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
 No part of
+# UploadWizard, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+# 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+#
+@chrome @commons.wikimedia.beta.wmflabs.org @firefox @login 
@test2.wikipedia.org
+Feature: UploadWizard logged out
+
+  Scenario: Require login
+Given I am logged out 
+When I navigate to Upload Wizard
+Then link to log in should appear
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4202b78db30da5e8ef32b9dd385e60997e0293dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Neilk 

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

[MediaWiki-commits] [Gerrit] No longer use star icon to avoid future conflict w watchlist. - change (apps...wikipedia)

[Mhurd (Code Review)]

Mhurd has uploaded a new change for review.

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

Change subject: No longer use star icon to avoid future conflict w watchlist.
..

No longer use star icon to avoid future conflict w watchlist.

Also bundled font build scripts and svgs.

Removed cruft.

Change-Id: Ib02e9b74d78d523aa491c7a3f1a87b6a7d3b9d19
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Categories/Alerts/UIViewController+Alert.h
M wikipedia/Categories/Alerts/UIViewController+Alert.m
M wikipedia/Defines/WikiGlyph_Chars_iOS.h
A wikipedia/Fonts/Font Svg Import Export/extract/extract.py
A wikipedia/Fonts/Font Svg Import Export/extract/font.ttf
A wikipedia/Fonts/Font Svg Import Export/import/import.py
A wikipedia/Fonts/Font Svg Import Export/import/output/WikiFont-Glyphs-iOS.ttf
A wikipedia/Fonts/Font Svg Import Export/import/output/demo-glyphs.css
A wikipedia/Fonts/Font Svg Import Export/import/output/demo.html
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e950 
IOS_WIKIGLYPH_W 10 10 -155.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e951 
IOS_WIKIGLYPH_SHARE 0 0 -200.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e952 
IOS_WIKIGLYPH_MAGNIFY 0 0 -230.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e953 
IOS_WIKIGLYPH_FORWARD 0 0 -190.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e954 
IOS_WIKIGLYPH_BACKWARD 0 0 -190.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e955 
IOS_WIKIGLYPH_DOWN 0 0 0.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e956 
IOS_WIKIGLYPH_HEART 0 0 -200.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e957 
IOS_WIKIGLYPH_HEART_OUTLINE 0 0 -200.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e958 
IOS_WIKIGLYPH_TOC_COLLAPSED 0 0 -150.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e959 
IOS_WIKIGLYPH_TOC_EXPANDED 0 0 -150.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e95a 
IOS_WIKIGLYPH_RELOAD 0 0 -270.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e95b 
IOS_WIKIGLYPH_STAR 0 0 -220.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e95c 
IOS_WIKIGLYPH_STAR_OUTLINE 0 0 -220.svg
M wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
M wikipedia/MenuLabel/WikiGlyphLabel.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
34 files changed, 880 insertions(+), 88 deletions(-)


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

diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index c07e32a..fcc6f92 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1791,7 +1791,6 @@
buildActionMask = 2147483647;
files = (
04D3082C19991CB60034F106 /* 
logo-placeholder-nea...@2x.png in Resources */,
-   0466F44F183A30CC00EA1FD7 /* 
logo-search-placeholder.png in Resources */,
D46CD8C418A1AC4F0042959E /* InfoPlist.strings 
in Resources */,
045EFF1B19A25FEB00D0EDBB /* 
logo-placeholder-sea...@2x.png in Resources */,
D4991454181D51DE00E6073C /* Images.xcassets in 
Resources */,
diff --git a/wikipedia/Categories/Alerts/AlertLabel.m 
b/wikipedia/Categories/Alerts/AlertLabel.m
index 4b0e0c1..ce30f09 100644
--- a/wikipedia/Categories/Alerts/AlertLabel.m
+++ b/wikipedia/Categories/Alerts/AlertLabel.m
@@ -2,6 +2,8 @@
 //  Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license; 
please copy and modify!
 
 #import "AlertLabel.h"
+#import "WMF_Colors.h"
+#import "Defines.h"
 
 @implementation AlertLabel
 
@@ -16,10 +18,10 @@
 self.minimumScaleFactor = 0.2;
 self.font = [UIFont systemFontOfSize:10];
 self.textAlignment = NSTextAlignmentCenter;
-self.textColor = [UIColor darkGrayColor];
+self.textColor = [UIColor colorWithWhite:0.0 alpha:1.0];
 self.numberOfLines = 0;
 self.lineBreakMode = NSLineBreakByWordWrapping;
-self.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
+self.backgroundColor = CHROME_COLOR;
 self.userInteractionEnabled = YES;
 
 

[MediaWiki-commits] [Gerrit] hadoop: re-enable gelf logging with config update - change (operations/puppet)

[Gage (Code Review)]

Gage has submitted this change and it was merged.

Change subject: hadoop: re-enable gelf logging with config update
..


hadoop: re-enable gelf logging with config update

Change-Id: I94de2f3adeff7d01529ede3d3d4854c591d09c24
---
M manifests/role/analytics/hadoop.pp
M modules/cdh
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 9f3ef48..3cb56cf 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -56,7 +56,7 @@
 $mapreduce_job_reuse_jvm_num_tasks= 1
 $fair_scheduler_template  = 'hadoop/fair-scheduler.xml.erb'
 # setting this to false or undef interferes with defining it within a node
-$gelf_logging_enabled = false
+$gelf_logging_enabled = true
 
 
 # Configs specific to Production.
diff --git a/modules/cdh b/modules/cdh
index 895efb7..80dd7cb 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 895efb7097e39a2972ecc8dc28f76c5469d5d663
+Subproject commit 80dd7cbdf860a6f6a9d1574406b65e04735c07b1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94de2f3adeff7d01529ede3d3d4854c591d09c24
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage 
Gerrit-Reviewer: Gage 
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 syntax error in SQL query (gamepedias) - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: fix syntax error in SQL query (gamepedias)
..


fix syntax error in SQL query (gamepedias)

Bug: 60472
Change-Id: Ie27ed38496981662bc3eedf673c43e3db85420f5
---
M usr/share/php/wikistats/coalesced_query.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Dzahn: Looks good to me, approved



diff --git a/usr/share/php/wikistats/coalesced_query.php 
b/usr/share/php/wikistats/coalesced_query.php
index ae4c77d..77bdd41 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -57,6 +57,7 @@
 (select 'sw' as project,'shoutwiki' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from shoutwiki)
 union all
 (select 'w3' as project,'w3cwikis' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from w3cwikis)
+union all
 (select 'ga' as project,'gamepedias' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from gamepedias)
 order by ${sort};";
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie27ed38496981662bc3eedf673c43e3db85420f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikistats - add cron for gamepedia updates - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: wikistats - add cron for gamepedia updates
..

wikistats - add cron for gamepedia updates

Bug: 60472
Change-Id: I1004ef532b754af42a5b26fb616e354d0503ab16
---
M modules/wikistats/manifests/updates.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/157319/1

diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index ac19bb0..d281d5c 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -41,6 +41,7 @@
 'ro@21', # Rodovid
 'wk@21', # Wikkii
 're@22', # Referata
+'ga@22', # Gamepedias
 'pa@23', # Pardus
 'w3@23', # W3C
 ]: }

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

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

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

[MediaWiki-commits] [Gerrit] hadoop: re-enable gelf logging with config update - change (operations/puppet)

[Gage (Code Review)]

Gage has uploaded a new change for review.

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

Change subject: hadoop: re-enable gelf logging with config update
..

hadoop: re-enable gelf logging with config update

Change-Id: I94de2f3adeff7d01529ede3d3d4854c591d09c24
---
M manifests/role/analytics/hadoop.pp
M modules/cdh
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/157318/1

diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 9f3ef48..3cb56cf 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -56,7 +56,7 @@
 $mapreduce_job_reuse_jvm_num_tasks= 1
 $fair_scheduler_template  = 'hadoop/fair-scheduler.xml.erb'
 # setting this to false or undef interferes with defining it within a node
-$gelf_logging_enabled = false
+$gelf_logging_enabled = true
 
 
 # Configs specific to Production.
diff --git a/modules/cdh b/modules/cdh
index 895efb7..80dd7cb 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 895efb7097e39a2972ecc8dc28f76c5469d5d663
+Subproject commit 80dd7cbdf860a6f6a9d1574406b65e04735c07b1

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

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

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

[MediaWiki-commits] [Gerrit] Hadoop: GELF: update env vars per upstream - change (operations...cdh)

[Gage (Code Review)]

Gage has submitted this change and it was merged.

Change subject: Hadoop: GELF: update env vars per upstream
..


Hadoop: GELF: update env vars per upstream

Change-Id: I17973b4c11fea7044716741b2f6cab1eb097a85c
---
M templates/hadoop/hadoop-env.sh.erb
1 file changed, 12 insertions(+), 14 deletions(-)

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



diff --git a/templates/hadoop/hadoop-env.sh.erb 
b/templates/hadoop/hadoop-env.sh.erb
index 8384e55..7459516 100644
--- a/templates/hadoop/hadoop-env.sh.erb
+++ b/templates/hadoop/hadoop-env.sh.erb
@@ -9,9 +9,8 @@
 <% end -%>
 <% if @gelf_logging_enabled -%>
 <%# For logging to logstash via gelf, per 
http://www.paluch.biz/blog/95-logging-hadoop-messages-into-logstash-using-logstash-gelf.html
 -%>
-<%# in the example this is the only HADOOP_*_OPTS var which is exported, is 
this deviance needed? -%>
-<%# example: export 
HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf 
-Dhdfs.audit.logger=INFO,DRFAAUDIT,gelf $HADOOP_NAMENODE_OPTS" -%>
-export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,gelf 
-Dhdfs.audit.logger=INFO,gelf $HADOOP_NAMENODE_OPTS"
+export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,RFAS,gelf 
-Dhdfs.audit.logger=INFO,gelf $HADOOP_NAMENODE_OPTS"
+export HADOOP_SECONDARYNAMENODE_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf 
-Dhdfs.audit.logger=INFO,DRFAAUDIT,gelf $HADOOP_SECONDARYNAMENODE_OPTS"
 <% end -%>
 
 <% if @datanode_jmxremote_port -%>
@@ -20,18 +19,17 @@
 <% end -%>
 
 <% if @gelf_logging_enabled -%>
-<%# The example sets the default level to ERROR even though they do INFO for 
NAMENODE, interesting. -%>
-<%# example: HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,DRFAS,gelf 
$HADOOP_DATANODE_OPTS" -%>
-HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=INFO,gelf $HADOOP_DATANODE_OPTS"
+HADOOP_JOBTRACKER_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf 
-Dmapred.audit.logger=INFO,MRAUDIT,gelf 
-Dmapred.jobsummary.logger=INFO,JSA,gelf $HADOOP_JOBTRACKER_OPTS"
+HADOOP_TASKTRACKER_OPTS="-Dhadoop.security.logger=ERROR,console,gelf 
-Dmapred.audit.logger=ERROR,console,gelf $HADOOP_TASKTRACKER_OPTS"
+<%# Upstream sets the default level to ERROR to avoid logging every successful 
auth -%>
+HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,DRFAS,gelf 
$HADOOP_DATANODE_OPTS"
 
-<%# example: export YARN_ROOT_LOGGER=INFO,DRFA,gelf -%>
-export YARN_ROOT_LOGGER=INFO,RFA,gelf
-<%# example: export HADOOP_ROOT_LOGGER=INFO,DRFA,gelf -%>
-export HADOOP_ROOT_LOGGER=INFO,RFA,gelf
-<%# example: export HADOOP_JHS_LOGGER=INFO,JSA,gelf -%>
-export HADOOP_JHS_LOGGER=INFO,RFA,gelf
-<%# example: export HADOOP_ROOT_SECURITY_LOGGER=INFO,DRFAS,gelf -%>
-export HADOOP_ROOT_SECURITY_LOGGER=INFO,RFA,gelf
+export YARN_ROOT_LOGGER=INFO,DRFA,gelf
+<%# upstream: export HADOOP_ROOT_LOGGER=INFO,DRFA,gelf -%>
+<%# causes error: java.io.FileNotFoundException: 
/usr/lib/hadoop/logs/hadoop.log (No such file or directory) -%>
+export HADOOP_ROOT_LOGGER=INFO,console,gelf
+export HADOOP_JHS_LOGGER=INFO,JSA,gelf
+export HADOOP_ROOT_SECURITY_LOGGER=INFO,DRFAS,gelf
 <% end -%>
 
 <% if @hadoop_heapsize -%>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17973b4c11fea7044716741b2f6cab1eb097a85c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Gage 
Gerrit-Reviewer: Gage 
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 syntax error in SQL query (gamepedias) - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: fix syntax error in SQL query (gamepedias)
..

fix syntax error in SQL query (gamepedias)

Bug: 60472
Change-Id: Ie27ed38496981662bc3eedf673c43e3db85420f5
---
M usr/share/php/wikistats/coalesced_query.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/17/157317/1

diff --git a/usr/share/php/wikistats/coalesced_query.php 
b/usr/share/php/wikistats/coalesced_query.php
index ae4c77d..77bdd41 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -57,6 +57,7 @@
 (select 'sw' as project,'shoutwiki' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from shoutwiki)
 union all
 (select 'w3' as project,'w3cwikis' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from w3cwikis)
+union all
 (select 'ga' as project,'gamepedias' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from gamepedias)
 order by ${sort};";
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27ed38496981662bc3eedf673c43e3db85420f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] Uploading needs login to work, so configure that - change (mediawiki/vagrant)

[Neilk (Code Review)]

Neilk has uploaded a new change for review.

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

Change subject: Uploading needs login to work, so configure that
..

Uploading needs login to work, so configure that

Some configurations of mediawiki allow anyone to upload
files, but in the current mediawiki-vagrant configuration, that
won't work - the file repo demands all files must be owned.

(I've had some strange errors occur in automated testing because
the user didn't log in first or login failed, but was still
allowed to upload.)

So, we add the configuration requiring users to log in
to upload.

All tests assumed that users were logged in anyway. And
this allows us to test the error messages that occur when
users don't have appropriate permissions.

Change-Id: I6bcfaac69df3abb544f3c79db40330ff375c9e0b
---
M puppet/modules/role/manifests/uploadwizard.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/16/157316/1

diff --git a/puppet/modules/role/manifests/uploadwizard.pp 
b/puppet/modules/role/manifests/uploadwizard.pp
index e0c5ab0..6ccda4c 100644
--- a/puppet/modules/role/manifests/uploadwizard.pp
+++ b/puppet/modules/role/manifests/uploadwizard.pp
@@ -37,8 +37,8 @@
 
 mediawiki::settings { 'UploadWizard permissions':
 values => [
-'$wgGroupPermissions["*"]["upload"] = true;',
-'$wgGroupPermissions["*"]["upload_by_url"] = true;',
+'$wgGroupPermissions["user"]["upload"] = true;',
+'$wgGroupPermissions["user"]["upload_by_url"] = true;',
 ],
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bcfaac69df3abb544f3c79db40330ff375c9e0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Neilk 

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

[MediaWiki-commits] [Gerrit] QA: Add browser test for user rights change - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: QA: Add browser test for user rights change
..


QA: Add browser test for user rights change

Change-Id: I9cb453d1107d0fe961abb32d358a4c00bb9f40c8
---
M tests/browser/features/notifications.feature
A tests/browser/features/notifications_userrights.feature
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/notifications_steps.rb
4 files changed, 37 insertions(+), 7 deletions(-)

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



diff --git a/tests/browser/features/notifications.feature 
b/tests/browser/features/notifications.feature
index c6d484d..b45addb 100644
--- a/tests/browser/features/notifications.feature
+++ b/tests/browser/features/notifications.feature
@@ -29,9 +29,6 @@
And I am on the "Selenium Echo flyout test page" page
 Then I have new notifications
 
-  Scenario: Change in user rights
-# Too hard. Will do later.
-
   Scenario: Page revert
 # Too hard. Will do later.
 
diff --git a/tests/browser/features/notifications_userrights.feature 
b/tests/browser/features/notifications_userrights.feature
new file mode 100644
index 000..f287d1c
--- /dev/null
+++ b/tests/browser/features/notifications_userrights.feature
@@ -0,0 +1,10 @@
+@chrome @firefox @login
+Feature: Notification types
+
+  Scenario: Change in user rights
+Given I am logged in as a new user with no notifications
+# This step requires user rights. Selenium user doesn't have sufficient 
user rights on beta labs.
+When my user rights get changed
+  And I come back from grabbing a cup of coffee
+  And I am on the "Selenium Echo flyout test page" page
+Then I have new notifications
diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 657b131..4a089c8 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -6,6 +6,10 @@
   return "EchoUser"
 end
 
+def get_new_username()
+  return "EchoUserNew" + @random_string
+end
+
 # For use in Firefox browser tests only
 Given /^I am using user agent "(.+)"$/ do |user_agent|
   @user_agent = user_agent
@@ -30,8 +34,9 @@
   on(APIPage).client.log_in(ENV["MEDIAWIKI_USER"], ENV["MEDIAWIKI_PASSWORD"])
   begin
 on(APIPage).client.create_account(username, ENV["MEDIAWIKI_PASSWORD"])
+puts "Successfully created user " + username
   rescue MediawikiApi::ApiError
-puts 'Assuming user ' + username + ' already exists since was unable to 
create.'
+puts 'Assuming in step that user ' + username + ' already exists since was 
unable to create.'
   end
 end
 
@@ -46,7 +51,12 @@
   step 'I am logged in as the user "' + username + '"'
 end
 
-Given(/^I am logged in as a new user$/) do
-  @username = "SeleniumEchoUser" + @random_string
-  step 'I am logged in as the user "' + @username + '"'
+Given(/^my user rights get changed$/) do
+  @username = get_new_username()
+  client = on(APIPage).client
+  client.log_in(ENV["MEDIAWIKI_USER"], ENV["MEDIAWIKI_PASSWORD"])
+  resp = client.query(action: "query", list: "users", ususers: @username, 
ustoken: 'userrights')
+  data = resp.data()
+  @token = data["users"][0]["userrightstoken"]
+  client.action('userrights', token_type: false, token: @token, add: "bot", 
user: @username)
 end
diff --git a/tests/browser/features/step_definitions/notifications_steps.rb 
b/tests/browser/features/step_definitions/notifications_steps.rb
index 71d04fe..b68c5f3 100644
--- a/tests/browser/features/step_definitions/notifications_steps.rb
+++ b/tests/browser/features/step_definitions/notifications_steps.rb
@@ -4,6 +4,13 @@
   client.create_page(title, text)
 end
 
+def clear_notifications( username )
+  client = on(APIPage).client
+  step 'the user "' + username + '" exists'
+  client.log_in(username, ENV["MEDIAWIKI_PASSWORD"])
+  client.action( 'echomarkread', token_type: 'edit', all: '1' )
+end
+
 def make_page_with_user_b( title, text )
   username = get_session_username_b()
   step 'the user "' + username + '" exists'
@@ -44,6 +51,12 @@
   make_page_with_user_b(title, text)
 end
 
+Given(/^I am logged in as a new user with no notifications$/) do
+  @username = get_new_username()
+  clear_notifications( @username )
+  step 'I am logged in as the user "' + @username + '"'
+end
+
 Given(/^I am logged in with no notifications$/) do
   # Mark all messages as read
   client = on(APIPage).client

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cb453d1107d0fe961abb32d358a4c00bb9f40c8
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Spage 
Gerrit-Reviewer: 

[MediaWiki-commits] [Gerrit] Check page_len in ResourceLoaderWikiModule::isKnownEmpty() f... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Check page_len in ResourceLoaderWikiModule::isKnownEmpty() for 
'user' modules
..


Check page_len in ResourceLoaderWikiModule::isKnownEmpty() for 'user' modules

In most cases, we just check whether the pages exist before saying
the module is not empty to avoid generating cached HTML without
the appropriate 

[MediaWiki-commits] [Gerrit] build: Use cssmin after cssjanus rather than before to fix RTL - change (oojs/ui)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: build: Use cssmin after cssjanus rather than before to fix RTL
..

build: Use cssmin after cssjanus rather than before to fix RTL

Also take the opportunity to clean up the different modules and label each
section of the Gruntfile.js with what they do.

Change-Id: Ic8f8194141d644804d3378556ea126ba8597584c
---
M Gruntfile.js
M package.json
2 files changed, 37 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/15/157315/1

diff --git a/Gruntfile.js b/Gruntfile.js
index f7a1e86..3044787 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,6 +8,7 @@
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-concat-sourcemaps' );
grunt.loadNpmTasks( 'grunt-contrib-csslint' );
+   grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-less' );
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
@@ -49,6 +50,8 @@
 
grunt.initConfig( {
pkg: grunt.file.readJSON( 'package.json' ),
+
+   // Build
clean: {
dist: 'dist/*'
},
@@ -58,12 +61,23 @@
apex: lessFiles['dist/oojs-ui-apex.css'],
minerva: lessFiles['dist/oojs-ui-minerva.css']
},
+
+   // Build – JS
+   concat: {
+   options: {
+   banner: grunt.file.read( 'build/banner.txt' )
+   },
+   js: {
+   dest: 'dist/oojs-ui.js',
+   src: modules['oojs-ui'].scripts
+   }
+   },
+
+   // Build – LESS/CSS
less: {
dist: {
options: {
-   ieCompat: true,
-   cleancss: true,
-   report: 'gzip'
+   ieCompat: true
},
files: lessFiles
}
@@ -73,16 +87,14 @@
files: rtlFiles
}
},
-   concat: {
+   cssmin: {
options: {
-   banner: grunt.file.read( 'build/banner.txt' )
+   banner: grunt.file.read( 'build/banner.txt' ),
+   compatibility: 'ie8',
+   report: 'gzip'
},
-   css: {
-   files: concatCssFiles
-   },
-   js: {
-   dest: 'dist/oojs-ui.js',
-   src: modules['oojs-ui'].scripts
+   input: {
+   files: [ concatCssFiles, rtlFiles ]
}
},
copy: {
@@ -101,6 +113,8 @@
dest: 'dist'
}
},
+
+   // Lint – JS
jshint: {
options: {
jshintrc: true
@@ -114,6 +128,8 @@
'!demos/{dist,lib}/**'
]
},
+
+   // Lint – CSS/LESS
csslint: {
options: {
csslintrc: '.csslintrc'
@@ -123,12 +139,18 @@
'!demos/{dist,lib}/**'
]
},
+
+   // Lint – i18n
banana: {
all: 'i18n/'
},
+
+   // Test
qunit: {
all: 'tests/index.html'
},
+
+   // Development
watch: {
files: [
'<%= jshint.dev %>',
@@ -163,7 +185,9 @@
} );
} );
 
-   grunt.registerTask( 'build', [ 'clean', 'fileExists', 'less', 'concat', 
'cssjanus', 'copy' ] );
+   grunt.registerTask( 'build', [ 'clean', 'fileExists', 'build-js', 
'build-css' ] );
+   grunt.registerTask( 'build-js', [ 'concat' ] );
+   grunt.registerTask( 'build-css', [ 'less', 'cssjanus', 'cssmin', 'copy' 
] );
grunt.registerTask( 'git-build', [ 'pre-git-build', 'build' ] );
grunt.registerTask( 'test', [ 'pre-test', 'git-build', 'jshint', 
'jscs', 'csslint', 'banana', 'qunit' ] );
grunt.registerTask( 'default', 'test' );
diff --git

[MediaWiki-commits] [Gerrit] upgrade to version 2.7 - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: upgrade to version 2.7
..


upgrade to version 2.7

Change-Id: I4e1acefe89946d89db12883fb14d82c77a6f21ea
---
M debian/changelog
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Dzahn: Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 38f4aca..a437a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wikistats (2.7) unstable; urgency=low
+
+  * add gamepedias (bug 59718)
+  * fixes for w3cwikis (bug 41023)
+
+ -- Daniel Zahn   Fri, 29 Aug 2014 17:07:23 -0800
+
 wikistats (2.6) unstable; urgency=low
 
   * please see gerrit/git log since the last version

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e1acefe89946d89db12883fb14d82c77a6f21ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] upgrade to version 2.7 - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: upgrade to version 2.7
..

upgrade to version 2.7

Change-Id: I4e1acefe89946d89db12883fb14d82c77a6f21ea
---
M debian/changelog
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/14/157314/1

diff --git a/debian/changelog b/debian/changelog
index 38f4aca..a437a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wikistats (2.7) unstable; urgency=low
+
+  * add gamepedias (bug 59718)
+  * fixes for w3cwikis (bug 41023)
+
+ -- Daniel Zahn   Fri, 29 Aug 2014 17:07:23 -0800
+
 wikistats (2.6) unstable; urgency=low
 
   * please see gerrit/git log since the last version

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e1acefe89946d89db12883fb14d82c77a6f21ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] add statistics table for Gamepedias - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: add statistics table for Gamepedias
..


add statistics table for Gamepedias

Bug: 60472
Change-Id: I6d60b133c2f2c0100d0249d0df8532bd22aaa742
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
M usr/lib/wikistats/update_functions.php
M usr/share/php/wikistats/coalesced_query.php
M usr/share/php/wikistats/largest_query.php
M var/www/wikistats/detail.php
M var/www/wikistats/display.php
M var/www/wikistats/displayw.php
M var/www/wikistats/largest_html.php
9 files changed, 34 insertions(+), 4 deletions(-)

Approvals:
  Dzahn: Looks good to me, approved



diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index e8303d4..6497783 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -60,16 +60,16 @@
 $socket_timeout="10";
 
 # list all tables (which should be displayed on index page and included in 
grand totals)
-$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage','w3cwikis');
+$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage','w3cwikis',
 'gamepedias');
 
 # list tables which are valid for our api.php - CHECKME
-$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis');
+$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis','gamepedias');
 
 # list tables which should have language columns in the html tables
 
$tables_with_language_columns=array('wikipedias','wiktionaries','wikisources','uncyclomedia','wikibooks','wikiquotes','wikinews','wikitravel','anarchopedias','wikimedias','wikifur','wikiversity','pardus','rodovid','lxde','wikivoyage','metapedias');
 
 # list tables with URLs like wikiname.domain.org/api.php
-$tables_with_prefix_short=array('anarchopedias', 'wikisite', 'pardus', 
'rodovid', 'opensuse','wikisite','scoutwiki');
+$tables_with_prefix_short=array('anarchopedias', 'wikisite', 'pardus', 
'rodovid', 'opensuse','wikisite','scoutwiki', 'gamepedias');
 
 # list tables with URLs like domain.org/wikiname/api.php
 $tables_with_suffix_short=array('editthis','lxde');
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index b47..32d97ab 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -170,6 +170,10 @@
 $table="w3cwikis";
 $domain="www.w3.org/community";
 break;
+case "ga":
+$table="gamepedias";
+$domain="gamepedia.com";
+break;
 default:
 $table="unknown";
 print "unknown table. exiting\n";
diff --git a/usr/lib/wikistats/update_functions.php 
b/usr/lib/wikistats/update_functions.php
index 35cb9b4..c74c7dc 100755
--- a/usr/lib/wikistats/update_functions.php
+++ b/usr/lib/wikistats/update_functions.php
@@ -144,6 +144,10 @@
 $table="w3cwikis";
 $domain="www.w3.org/community";
 break;
+case "ga":
+$table="gamepedias";
+$domain="gamepedia.com";
+break;
 default:
 $table="unknown";
 print "unknown table. exiting\n";
diff --git a/usr/share/php/wikistats/coalesced_query.php 
b/usr/share/php/wikistats/coalesced_query.php
index 45c7a60..ae4c77d 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -56,7 +56,8 @@
 union all
 (select 'sw' as project,'shoutwiki' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from shoutwiki)
 union all
-(select 'w3c' as project,'w3cwikis' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from w3cwikis)
+(select 'w3' a

[MediaWiki-commits] [Gerrit] add statistics table for Gamepedias - change (operations...wikistats)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: add statistics table for Gamepedias
..

add statistics table for Gamepedias

Bug: 60472
Change-Id: I6d60b133c2f2c0100d0249d0df8532bd22aaa742
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
M usr/lib/wikistats/update_functions.php
M usr/share/php/wikistats/coalesced_query.php
M usr/share/php/wikistats/largest_query.php
M var/www/wikistats/detail.php
M var/www/wikistats/display.php
M var/www/wikistats/displayw.php
M var/www/wikistats/largest_html.php
9 files changed, 34 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/13/157313/1

diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index e8303d4..6497783 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -60,16 +60,16 @@
 $socket_timeout="10";
 
 # list all tables (which should be displayed on index page and included in 
grand totals)
-$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage','w3cwikis');
+$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage','w3cwikis',
 'gamepedias');
 
 # list tables which are valid for our api.php - CHECKME
-$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis');
+$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis','gamepedias');
 
 # list tables which should have language columns in the html tables
 
$tables_with_language_columns=array('wikipedias','wiktionaries','wikisources','uncyclomedia','wikibooks','wikiquotes','wikinews','wikitravel','anarchopedias','wikimedias','wikifur','wikiversity','pardus','rodovid','lxde','wikivoyage','metapedias');
 
 # list tables with URLs like wikiname.domain.org/api.php
-$tables_with_prefix_short=array('anarchopedias', 'wikisite', 'pardus', 
'rodovid', 'opensuse','wikisite','scoutwiki');
+$tables_with_prefix_short=array('anarchopedias', 'wikisite', 'pardus', 
'rodovid', 'opensuse','wikisite','scoutwiki', 'gamepedias');
 
 # list tables with URLs like domain.org/wikiname/api.php
 $tables_with_suffix_short=array('editthis','lxde');
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index b47..32d97ab 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -170,6 +170,10 @@
 $table="w3cwikis";
 $domain="www.w3.org/community";
 break;
+case "ga":
+$table="gamepedias";
+$domain="gamepedia.com";
+break;
 default:
 $table="unknown";
 print "unknown table. exiting\n";
diff --git a/usr/lib/wikistats/update_functions.php 
b/usr/lib/wikistats/update_functions.php
index 35cb9b4..c74c7dc 100755
--- a/usr/lib/wikistats/update_functions.php
+++ b/usr/lib/wikistats/update_functions.php
@@ -144,6 +144,10 @@
 $table="w3cwikis";
 $domain="www.w3.org/community";
 break;
+case "ga":
+$table="gamepedias";
+$domain="gamepedia.com";
+break;
 default:
 $table="unknown";
 print "unknown table. exiting\n";
diff --git a/usr/share/php/wikistats/coalesced_query.php 
b/usr/share/php/wikistats/coalesced_query.php
index 45c7a60..ae4c77d 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -56,7 +56,8 @@
 union all
 (select 'sw' as project,'shoutwiki' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from shoutwiki)
 union all
-(select 'w3c' as project,'w3cwikis' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gu

[MediaWiki-commits] [Gerrit] i18n: Fix message keys - change (mediawiki...BlueSpiceExtensions)

[Shirayuki (Code Review)]

Shirayuki has uploaded a new change for review.

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

Change subject: i18n: Fix message keys
..

i18n: Fix message keys

- bs-universalexport-pref-metadatadefaults
- bs-universalexport-pref-metadataoverrides

Change-Id: I603b8b8b2724c0c8bf1d2331143c0cf9df1f85b7
---
M UniversalExport/UniversalExport.class.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/UniversalExport/UniversalExport.class.php 
b/UniversalExport/UniversalExport.class.php
index 24309c3..2926fb7 100644
--- a/UniversalExport/UniversalExport.class.php
+++ b/UniversalExport/UniversalExport.class.php
@@ -122,8 +122,8 @@
 
BsConfig::registerVar( 
'MW::UniversalExport::CategoryWhitelist', $this->aCategoryWhitelist,  
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
BsConfig::registerVar( 
'MW::UniversalExport::CategoryBlacklist', $this->aCategoryBlacklist,  
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
-   BsConfig::registerVar( 'MW::UniversalExport::MetadataDefaults', 
 json_encode( $aMetadataDefaults ),  
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-MetadataDefaults', 'textarea' );
-   BsConfig::registerVar( 
'MW::UniversalExport::MetadataOverrides', json_encode( $aMetadataOverrides ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-MetadataOverrides', 'textarea' );
+   BsConfig::registerVar( 'MW::UniversalExport::MetadataDefaults', 
 json_encode( $aMetadataDefaults ),  
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-metadatadefaults', 'textarea' );
+   BsConfig::registerVar( 
'MW::UniversalExport::MetadataOverrides', json_encode( $aMetadataOverrides ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-universalexport-pref-metadataoverrides', 'textarea' );
BsConfig::registerVar( 'MW::UniversalExport::ParamsDefaults',   
 $this->aParamsDefaults, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED 
);
BsConfig::registerVar( 'MW::UniversalExport::ParamsOverrides',  
 $this->aParamsOverrides,BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED 
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I603b8b8b2724c0c8bf1d2331143c0cf9df1f85b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Shirayuki 

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

[MediaWiki-commits] [Gerrit] Hadoop: GELF: update env vars per upstream - change (operations...cdh)

[Gage (Code Review)]

Gage has uploaded a new change for review.

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

Change subject: Hadoop: GELF: update env vars per upstream
..

Hadoop: GELF: update env vars per upstream

Change-Id: I17973b4c11fea7044716741b2f6cab1eb097a85c
---
M templates/hadoop/hadoop-env.sh.erb
1 file changed, 12 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh 
refs/changes/11/157311/1

diff --git a/templates/hadoop/hadoop-env.sh.erb 
b/templates/hadoop/hadoop-env.sh.erb
index 8384e55..7459516 100644
--- a/templates/hadoop/hadoop-env.sh.erb
+++ b/templates/hadoop/hadoop-env.sh.erb
@@ -9,9 +9,8 @@
 <% end -%>
 <% if @gelf_logging_enabled -%>
 <%# For logging to logstash via gelf, per 
http://www.paluch.biz/blog/95-logging-hadoop-messages-into-logstash-using-logstash-gelf.html
 -%>
-<%# in the example this is the only HADOOP_*_OPTS var which is exported, is 
this deviance needed? -%>
-<%# example: export 
HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf 
-Dhdfs.audit.logger=INFO,DRFAAUDIT,gelf $HADOOP_NAMENODE_OPTS" -%>
-export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,gelf 
-Dhdfs.audit.logger=INFO,gelf $HADOOP_NAMENODE_OPTS"
+export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,RFAS,gelf 
-Dhdfs.audit.logger=INFO,gelf $HADOOP_NAMENODE_OPTS"
+export HADOOP_SECONDARYNAMENODE_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf 
-Dhdfs.audit.logger=INFO,DRFAAUDIT,gelf $HADOOP_SECONDARYNAMENODE_OPTS"
 <% end -%>
 
 <% if @datanode_jmxremote_port -%>
@@ -20,18 +19,17 @@
 <% end -%>
 
 <% if @gelf_logging_enabled -%>
-<%# The example sets the default level to ERROR even though they do INFO for 
NAMENODE, interesting. -%>
-<%# example: HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,DRFAS,gelf 
$HADOOP_DATANODE_OPTS" -%>
-HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=INFO,gelf $HADOOP_DATANODE_OPTS"
+HADOOP_JOBTRACKER_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf 
-Dmapred.audit.logger=INFO,MRAUDIT,gelf 
-Dmapred.jobsummary.logger=INFO,JSA,gelf $HADOOP_JOBTRACKER_OPTS"
+HADOOP_TASKTRACKER_OPTS="-Dhadoop.security.logger=ERROR,console,gelf 
-Dmapred.audit.logger=ERROR,console,gelf $HADOOP_TASKTRACKER_OPTS"
+<%# Upstream sets the default level to ERROR to avoid logging every successful 
auth -%>
+HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,DRFAS,gelf 
$HADOOP_DATANODE_OPTS"
 
-<%# example: export YARN_ROOT_LOGGER=INFO,DRFA,gelf -%>
-export YARN_ROOT_LOGGER=INFO,RFA,gelf
-<%# example: export HADOOP_ROOT_LOGGER=INFO,DRFA,gelf -%>
-export HADOOP_ROOT_LOGGER=INFO,RFA,gelf
-<%# example: export HADOOP_JHS_LOGGER=INFO,JSA,gelf -%>
-export HADOOP_JHS_LOGGER=INFO,RFA,gelf
-<%# example: export HADOOP_ROOT_SECURITY_LOGGER=INFO,DRFAS,gelf -%>
-export HADOOP_ROOT_SECURITY_LOGGER=INFO,RFA,gelf
+export YARN_ROOT_LOGGER=INFO,DRFA,gelf
+<%# upstream: export HADOOP_ROOT_LOGGER=INFO,DRFA,gelf -%>
+<%# causes error: java.io.FileNotFoundException: 
/usr/lib/hadoop/logs/hadoop.log (No such file or directory) -%>
+export HADOOP_ROOT_LOGGER=INFO,console,gelf
+export HADOOP_JHS_LOGGER=INFO,JSA,gelf
+export HADOOP_ROOT_SECURITY_LOGGER=INFO,DRFAS,gelf
 <% end -%>
 
 <% if @hadoop_heapsize -%>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17973b4c11fea7044716741b2f6cab1eb097a85c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Gage 

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

[MediaWiki-commits] [Gerrit] search.less: Use static width for the search button - change (mediawiki...Vector)

[jenkins-bot (Code Review)]

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

Change subject: search.less: Use static width for the search button
..


search.less: Use static width for the search button

Now the width of the search box can increased without increasing
the width of the search button.

Change-Id: I0a9746c16dce44ff2a458e76a55741fcb1f7af0b
---
M components/search.less
1 file changed, 6 insertions(+), 8 deletions(-)

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



diff --git a/components/search.less b/components/search.less
index 46c3030..925205c 100644
--- a/components/search.less
+++ b/components/search.less
@@ -18,7 +18,8 @@
 
 div#simpleSearch {
display: block;
-   width: 14em;
+   width: 12.6em;
+   padding-right: 1.4em;
height: 1.4em;
margin-top: 0.65em;
position: relative;
@@ -32,7 +33,6 @@
 
// Styles for both the search input and the button
input {
-   position: absolute;
margin: 0;
padding: 0;
border: 0;
@@ -42,9 +42,7 @@
 
// The search input
#searchInput {
-   top: 0;
-   left: 0;
-   width: 90%;
+   width: 100%;
padding: 0.2em 0 0.2em 0.2em;
font-size: 13px;
direction: ltr;
@@ -87,14 +85,14 @@
// present the fulltext search one obscures the 'Go' one.
#searchButton,
#mw-searchButton {
+   position: absolute;
top: 0;
right: 0;
-   width: 10%;
+   width: 1.65em;
height: 100%;
cursor: pointer;
/* Hide button text and replace it with the image. */
-   /* This would be 100% if not for Firefox shenanigans (bug 
60900). */
-   text-indent: 200%;
+   text-indent: -9px;
/* Needed to make IE6 respect the text-indent. */
line-height: 1;
/* Opera 12 on RTL flips the text in a funny way without this. 
*/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a9746c16dce44ff2a458e76a55741fcb1f7af0b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 
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] Re-add Australian states, card #1799 - change (mediawiki...DonationInterface)

[Ssmith (Code Review)]

Ssmith has uploaded a new change for review.

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

Change subject: Re-add Australian states, card #1799
..

Re-add Australian states, card #1799

Change-Id: Ia94ec91bbce0fc514ef010c0fc82a876a611a2a7
---
A globalcollect_gateway/forms/html/_personal-information/AU.html
1 file changed, 49 insertions(+), 0 deletions(-)


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

diff --git a/globalcollect_gateway/forms/html/_personal-information/AU.html 
b/globalcollect_gateway/forms/html/_personal-information/AU.html
new file mode 100644
index 000..71f19d5
--- /dev/null
+++ b/globalcollect_gateway/forms/html/_personal-information/AU.html
@@ -0,0 +1,49 @@
+
+   
+   %donate_interface-cc-form-header-personal%
+   
+
+
+   
+   
+   
+
+
+   
+
+
+   
+   
+   
+
+
+   
+
+
+   
+   
+   
+   
+   
+   ACT
+   NSW
+   NT
+   QLD
+   SA
+   TAS
+   VIC
+   WA
+   
+   
+   
+
+
+   
+   
+   
+
+
+   
+   
+   
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia94ec91bbce0fc514ef010c0fc82a876a611a2a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ssmith 

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

[MediaWiki-commits] [Gerrit] Make links in preview to author point to user page and user ... - change (mediawiki...Flow)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Make links in preview to author point to user page and user 
talk page
..

Make links in preview to author point to user page and user talk page

Change-Id: Ibd62e796863c2aa36bd8e6d17e42be75d0b487d7
---
M modules/new/components/flow-board.js
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/modules/new/components/flow-board.js 
b/modules/new/components/flow-board.js
index cc2759d..c9f8da6 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -735,6 +735,16 @@
 
creator = {
links: {
+   userpage: {
+   url: mw.util.getUrl( 'User:' + 
username ),
+   // FIXME: Assume, as we don't 
know at this point...
+   exists: true
+   },
+   talk: {
+   url: mw.util.getUrl( 'User 
talk:' + username ),
+   // FIXME: Assume, as we don't 
know at this point...
+   exists: true
+   },
contribs: {
url: mw.util.getUrl( 
'Special:Contributions/' + username ),
exists: true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd62e796863c2aa36bd8e6d17e42be75d0b487d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Conditional scroll textarea into view when hit edit. - change (mediawiki...Flow)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Conditional scroll textarea into view when hit edit.
..

Conditional scroll textarea into view when hit edit.

Change-Id: I9b9cf1dd3ea2e4b4beb463a9312143974157fbd8
---
M modules/new/components/flow-board.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/new/components/flow-board.js 
b/modules/new/components/flow-board.js
index 5c85f0b..cc2759d 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -1042,6 +1042,7 @@
);
 
$post.replaceWith( $rendered );
+   $rendered.find( 'textarea' 
).conditionalScrollIntoView().focus();
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b9cf1dd3ea2e4b4beb463a9312143974157fbd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] WIP: Addition to "Make advanced wikitext that is not content... - change (mediawiki...MobileFrontend)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: WIP: Addition to "Make advanced wikitext that is not content 
gray"
..

WIP: Addition to "Make advanced wikitext that is not content gray"

Based on: I31444304a74d4fd407260f8a5dc4fe6989054aa4

* Added possibility to tap "on the white screen" to edit (like the
textarea using atm)

* _prepareForSave() will use getContent(), too (enables the opportunity
to change the "getContent" behavior in extended classes (e.g. transform
br into \n)

* \n in wikitext will display as br now (\n or \r isn't visible as line
break in div's normally)

ToDo: Find a good way to transform line breaks into \n (for save page with
line breaks).

Thanks apps team :P
-> Thanks Jon :P

Change-Id: If6badc5f7e9fb4fb0e81c1667ef12d907f9c776c
---
M includes/Resources.php
M javascripts/modules/editor/EditorOverlay.js
A javascripts/modules/editor/EditorOverlayBeta.js
M javascripts/modules/editor/editor.js
M less/modules/editor/editor.less
A templates/modules/editor/EditorOverlayBeta.hogan
A tests/qunit/modules/editor/test_EditorOverlayBeta.js
7 files changed, 149 insertions(+), 9 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index ed01dfb..fbb2f37 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -326,6 +326,18 @@
),
),
 
+   'mobile.editor.overlay.beta' => $wgMFMobileResourceBoilerplate + array(
+   'dependencies' => array(
+   'mobile.editor.overlay',
+   ),
+   'scripts' => array(
+   'javascripts/modules/editor/EditorOverlayBeta.js',
+   ),
+   'templates' => array(
+   'modules/editor/EditorOverlayBeta.hogan',
+   ),
+   ),
+
'mobile.editor.overlay' => $wgMFMobileResourceBoilerplate + array(
'dependencies' => array(
'mobile.editor.common',
diff --git a/javascripts/modules/editor/EditorOverlay.js 
b/javascripts/modules/editor/EditorOverlay.js
index 56877c7..f096668 100644
--- a/javascripts/modules/editor/EditorOverlay.js
+++ b/javascripts/modules/editor/EditorOverlay.js
@@ -44,6 +44,19 @@
}
},
 
+   protectContent: function() {
+   this.$content.prop( 'readonly', true );
+   },
+   setContent: function( content ) {
+   this.$content.
+   show().
+   val( content ).
+   microAutosize();
+   },
+   getContent: function() {
+   return this.$content.val();
+   },
+
postRender: function( options ) {
var self = this;
this._super( options );
@@ -51,7 +64,7 @@
this.$preview = this.$( '.preview' );
this.$content = this.$( '.wikitext-editor' ).
on( 'input', function() {
-   self.api.setContent( 
self.$content.val() );
+   self.api.setContent( self.getContent() 
);
self.$( '.continue, .submit' ).prop( 
'disabled', false );
} );
if ( options.isAnon ) {
@@ -83,7 +96,7 @@
 
// If in readOnly mode, make textarea readonly
if ( this.readOnly ) {
-   this.$content.prop( 'readonly', true );
+   this.protectContent();
}
 
if ( !options.isAnon ) {
@@ -111,7 +124,7 @@
},
 
_prepareForSave: function() {
-   var self = this, params = { text: this.$content.val() };
+   var self = this, params = { text: this.getContent() };
 
this._showHidden( '.save-header, .save-panel' );
 
@@ -158,10 +171,7 @@
 
this.api.getContent().
done( function( content ) {
-   self.$content.
-   show().
-   val( content ).
-   microAutosize();
+   self.setContent( content );
self.clearSpinner();
} ).
fail( function( error ) {
diff --git a/javascripts/modules/editor/EditorOverlayBeta.js 
b/ja

[MediaWiki-commits] [Gerrit] Update cc icons for WP forms card #1822 - change (mediawiki...DonationInterface)

[Ssmith (Code Review)]

Ssmith has uploaded a new change for review.

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

Change subject: Update cc icons for WP forms card #1822
..

Update cc icons for WP forms card #1822

Change-Id: I1f834ee9a6b53d36a4e70ef752ed866dd22c0d8d
---
M worldpay_gateway/forms/html/_wp_ott_form/default.html
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/worldpay_gateway/forms/html/_wp_ott_form/default.html 
b/worldpay_gateway/forms/html/_wp_ott_form/default.html
index 4508e8a..1937f5e 100644
--- a/worldpay_gateway/forms/html/_wp_ott_form/default.html
+++ b/worldpay_gateway/forms/html/_wp_ott_form/default.html
@@ -6,7 +6,6 @@



-   




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f834ee9a6b53d36a4e70ef752ed866dd22c0d8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ssmith 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki...DonationInterface)

[Ssmith (Code Review)]

Ssmith has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
..

Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface

Conflicts:
globalcollect_gateway/forms/css/gc.css
worldpay_gateway/forms/html/_wp_ott_form/default.html
worldpay_gateway/forms/js/worldpay.js

Change-Id: Id31a3f925ecfd3f97419082140079e402441edc0
---
M globalcollect_gateway/forms/css/gc.css
M worldpay_gateway/forms/html/_wp_ott_form/default.html
M worldpay_gateway/forms/js/worldpay.js
3 files changed, 4 insertions(+), 25 deletions(-)


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

diff --git a/globalcollect_gateway/forms/css/gc.css 
b/globalcollect_gateway/forms/css/gc.css
index 739ea31..359b613 100644
--- a/globalcollect_gateway/forms/css/gc.css
+++ b/globalcollect_gateway/forms/css/gc.css
@@ -157,14 +157,10 @@
 table#payflow-table-donor{
 /*margin-left: 10px;*/
 }
-<<< HEAD   (25165a Fix expiration date message translation)
 
 button:disabled {
color:red;
 }
-
-===
->>> BRANCH (8be80e Rename GatewayForm to GatewayPage to distinguish from 
Gatewa)
 
 /* Specific element overrides */
 input#zip.ja {
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/default.html 
b/worldpay_gateway/forms/html/_wp_ott_form/default.html
index 0a5d01a..4508e8a 100644
--- a/worldpay_gateway/forms/html/_wp_ott_form/default.html
+++ b/worldpay_gateway/forms/html/_wp_ott_form/default.html
@@ -24,11 +24,7 @@
 


-<<< HEAD   (25165a Fix expiration date message translation)
-   %donate_interface-donor-expiration%
-===
%donate_interface-donor-expiration%
->>> BRANCH (8be80e Rename GatewayForm to GatewayPage to distinguish from 
Gatewa)


diff --git a/worldpay_gateway/forms/js/worldpay.js 
b/worldpay_gateway/forms/js/worldpay.js
index b59dbdd..41a94ad 100644
--- a/worldpay_gateway/forms/js/worldpay.js
+++ b/worldpay_gateway/forms/js/worldpay.js
@@ -51,21 +51,12 @@
 *
 * Show and hide errors as appropriate.
 */
-<<< HEAD   (25165a Fix expiration date message translation)
-   function validate_cc(){
-   var types = [
-   { '.ccNumberError': $accountNumber },
-   { '.ccExpiryError': $accountExpiry },
-   { '.ccCVCError': $accountCVC }
-   ];
-===
function validate_cc() {
var types = [
{ '.ccNumberError': $accountNumber },
{ '.ccExpiryError': $accountExpiry },
{ '.ccCVCError': $accountCVC }
];
->>> BRANCH (8be80e Rename GatewayForm to GatewayPage to distinguish from 
Gatewa)
 
types.forEach( function ( type ) {
var key;
@@ -76,11 +67,7 @@
$( key ).removeClass( 'show' 
).addClass('hide' );
}
}
-<<< HEAD   (25165a Fix expiration date message translation)
-   });
-===
} );
->>> BRANCH (8be80e Rename GatewayForm to GatewayPage to distinguish from 
Gatewa)
 
}
 
@@ -214,18 +201,18 @@
$accountExpiry.payment( 'formatCardExpiry' );
$accountCVC.payment( 'formatCardCVC' );
 
-<<< HEAD   (25165a Fix expiration date message translation)
+<<< HEAD
$( '.form-control' ).keypress( function(e) {
if( e.which == 13) {
 ===
$( '.form-control' ).keypress( function (e) {
if ( e.which === 13 ) {
->>> BRANCH (8be80e Rename GatewayForm to GatewayPage to distinguish from 
Gatewa)
+>>> 8be80ec58a1c0b56e7d9e4d086d3e627b1994984
submitForm();
}
} );
 
-<<< HEAD   (25165a Fix expiration date message translation)
+<<< HEAD
$( '#paymentSubmitBtn' ).click(function() {
submitForm();
});
@@ -235,6 +222,6 @@
$( '#paymentSubmitBtn' ).click( function () {
submitForm();
} );
->>> BRANCH (8be80e Rename GatewayForm to GatewayPage to distinguish from 
Gatewa)
+>>> 8be80ec58a1c0b56e7d9e4d086d3e627b1994984
});
 })( jQuery, mediaWiki );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id31a3f925ecfd3f97419082140079e402441edc0
Gerrit-PatchSet: 

[MediaWiki-commits] [Gerrit] Fix app user block report - change (analytics/limn-mobile-data)

[jenkins-bot (Code Review)]

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

Change subject: Fix app user block report
..


Fix app user block report

Didn't need the date as the first column

Change-Id: I6cf92fa2d0592f23d6c7baa81b14a5074b188b39
---
M mobile/app-user-blocks-en.sql
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/mobile/app-user-blocks-en.sql b/mobile/app-user-blocks-en.sql
index 7d9a865..8735847 100644
--- a/mobile/app-user-blocks-en.sql
+++ b/mobile/app-user-blocks-en.sql
@@ -2,8 +2,7 @@
 -- For this report:
 -- you are considered an 'app user' if you've created the account on the 
Android or iOS native app
 
-SELECT DATE( ipb_timestamp)  AS Date,
-   COUNT( 1 ) AS NumBlocks
+SELECT COUNT( 1 ) AS NumBlocks
 FROM
   (
 SELECT ipb_user,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cf92fa2d0592f23d6c7baa81b14a5074b188b39
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add edit funnel and user block reports to dashboards - change (analytics/limn-mobile-data)

[jenkins-bot (Code Review)]

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

Change subject: Add edit funnel and user block reports to dashboards
..


Add edit funnel and user block reports to dashboards

Change-Id: Icd430a4b686b0259a90aa59b0ea8495b31452806
---
M dashboards/apps.json
M dashboards/reportcard.json
2 files changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/dashboards/apps.json b/dashboards/apps.json
index 7683937..6a3ee2c 100644
--- a/dashboards/apps.json
+++ b/dashboards/apps.json
@@ -6,10 +6,16 @@
 {
 "name": "Apps",
 "graph_ids": [
+"app-edit-funnel-total",
+"app-edit-funnel-android",
+"app-edit-funnel-ios",
+
 "app-edits-starts",
 "app-edits-preview",
 "app-edits-save-attempt",
-"app-edits-success"
+"app-edits-success",
+
+"app-user-blocks-en"
 ]
 }
 ]
diff --git a/dashboards/reportcard.json b/dashboards/reportcard.json
index 44bbe83..9bce056 100644
--- a/dashboards/reportcard.json
+++ b/dashboards/reportcard.json
@@ -41,10 +41,10 @@
 {
 "name": "Apps",
 "graph_ids": [
-"app-edits-starts",
-"app-edits-preview",
-"app-edits-save-attempt",
-"app-edits-success"
+"app-edit-funnel-total",
+"app-edit-funnel-android",
+"app-edit-funnel-ios",
+"app-user-blocks-en"
 ]
 },
 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd430a4b686b0259a90aa59b0ea8495b31452806
Gerrit-PatchSet: 3
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix app user block report - change (analytics/limn-mobile-data)

[BearND (Code Review)]

BearND has uploaded a new change for review.

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

Change subject: Fix app user block report
..

Fix app user block report

Didn't need the date as the first column

Change-Id: I6cf92fa2d0592f23d6c7baa81b14a5074b188b39
---
M mobile/app-user-blocks-en.sql
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data 
refs/changes/04/157304/1

diff --git a/mobile/app-user-blocks-en.sql b/mobile/app-user-blocks-en.sql
index 7d9a865..8735847 100644
--- a/mobile/app-user-blocks-en.sql
+++ b/mobile/app-user-blocks-en.sql
@@ -2,8 +2,7 @@
 -- For this report:
 -- you are considered an 'app user' if you've created the account on the 
Android or iOS native app
 
-SELECT DATE( ipb_timestamp)  AS Date,
-   COUNT( 1 ) AS NumBlocks
+SELECT COUNT( 1 ) AS NumBlocks
 FROM
   (
 SELECT ipb_user,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cf92fa2d0592f23d6c7baa81b14a5074b188b39
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] WIP WorldPay auditing ported to SmashPig - change (wikimedia...SmashPig)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: WIP WorldPay auditing ported to SmashPig
..

WIP WorldPay auditing ported to SmashPig

TODO:
* Fix workflow and data flow.  We'll be called from Drupal as a library.
* Log parsing and PII recovery.

Change-Id: Ice48735a9c899baf012c55ad1c90deb57b5d5bea
---
A PaymentProviders/WorldPay/Audit/ReferenceData.php
A PaymentProviders/WorldPay/Audit/TransactionReconciliationFile.php
A PaymentProviders/WorldPay/Audit/WorldPayAudit.php
3 files changed, 469 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/03/157303/1

diff --git a/PaymentProviders/WorldPay/Audit/ReferenceData.php 
b/PaymentProviders/WorldPay/Audit/ReferenceData.php
new file mode 100644
index 000..0b25a6a
--- /dev/null
+++ b/PaymentProviders/WorldPay/Audit/ReferenceData.php
@@ -0,0 +1,109 @@
+ array(
+   'BC000',
+   'XV000',
+   'BCVIY',
+   'DE000',
+   'XD000',
+   'XVVIY',
+   'PE000',
+   'XE000',
+   'VP001',
+   'VPVIB',
+   'VPVID',
+   'VPVIR',
+   'VPVIS',
+   'VPVIX',
+   'XP001',
+   'XPVIB',
+   'XPVID',
+   'XPVIR',
+   'XPVIS',
+   'XPVIX',
+   ),
+
+   'mc' => array(
+   'AC000',
+   'ACMCW',
+   'ACMNW',
+   'XA000',
+   'XAMCW',
+   'XAMNW',
+   'ACMCY',
+   'DM000',
+   'XAMCY',
+   'XN000',
+   'VP002',
+   'VPMCB',
+   'VPMCO',
+   'VPMCP',
+   'VPMCF',
+   'VPMCX',
+   'XP002',
+   'XPMCB',
+   'XPMCO',
+   'XPMCP',
+   'XPMCF',
+   'XPMCX',
+   ),
+
+   'maestro' => array(
+   'PM000',
+   'XM000',
+   'PMDOM',
+   'XSDOM',
+   ),
+
+   'jcb' => array(
+   'KF000',
+   ),
+
+   'laser' => array(
+   'PT000',
+   ),
+
+   'other' => array(
+   'AS000',
+   'AX000',
+   'BP000',
+   'CM000',
+   'CO000',
+   'CY000',
+   'DC000',
+   'DL000',
+   'EF000',
+   'FS000',
+   'GE000',
+   'JC000',
+   'LC000',
+   'LE000',
+   'LY000',
+   'OD000',
+   'PL000',
+   'SB000',
+   'SC000',
+   'SE000',
+   'SG000',
+   'SH000',
+   'SP000',
+   'SY000',
+   'TE000',
+   'VC000',
+   'VE000',
+   ),
+   );
+
+   foreach ( $mapping as $type_name => $codes ) {
+   if ( in_array( $code, $codes ) ) {
+   return $type_name;
+   }
+   }
+
+   throw new Exception( "Unknown card type code: {$code}" );
+   }
+}
diff --git a/PaymentProviders/WorldPay/Audit/TransactionReconciliationFile.php 
b/PaymentProviders/WorldPay/Audit/TransactionReconciliationFile.php
new file mode 100644
index 000..3edeced
--- /dev/null
+

[MediaWiki-commits] [Gerrit] Update benestar's email address (trusted user) - change (integration/zuul-config)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Update benestar's email address (trusted user)
..

Update benestar's email address (trusted user)

Change-Id: I4894365cb89b13db6a19da418813831b92346741
---
M layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/layout.yaml b/layout.yaml
index dedb451..8e8386b 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -154,7 +154,7 @@
- ^addshorewiki@gmail\.com$
- ^admin@alphacorp\.tk$ # Hydriz
- ^benapetr@gmail\.com$ # petrb
-   - ^benestar\.wikimedia@googlemail\.com$
+   - ^benestar\.wikimedia@gmail\.com$
- ^bryan\.tongminh@gmail\.com$
- ^codereview@emsenhuber\.ch$
- ^d_entous@yahoo\.com$

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4894365cb89b13db6a19da418813831b92346741
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

[Mhurd (Code Review)]

Mhurd has submitted this change and it was merged.

Change subject: Manual import of translations from TWN
..


Manual import of translations from TWN

Had to manually get rid of plurals.

Change-Id: I86e57cfcdd65667cc1730f0a27fc82572a93f579
---
M wikipedia/ce.lproj/Localizable.strings
M wikipedia/de.lproj/Localizable.strings
M wikipedia/fa.lproj/Localizable.strings
M wikipedia/fa.lproj/Main_iPhone.strings
M wikipedia/fr.lproj/Localizable.strings
M wikipedia/mk.lproj/Localizable.strings
M wikipedia/nl.lproj/Localizable.strings
M wikipedia/pl.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
M wikipedia/ro.lproj/Localizable.strings
M wikipedia/ru.lproj/Localizable.strings
M wikipedia/zh-hans.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Localizable.strings
13 files changed, 209 insertions(+), 8 deletions(-)

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



diff --git a/wikipedia/ce.lproj/Localizable.strings 
b/wikipedia/ce.lproj/Localizable.strings
index 7f12e9c..b096f84 100644
--- a/wikipedia/ce.lproj/Localizable.strings
+++ b/wikipedia/ce.lproj/Localizable.strings
@@ -46,7 +46,9 @@
 "main-menu-heading-zero" = "Wikipedia Zero";
 "main-menu-heading-legal" = "Цхьа гӀучӀа бу";
 "main-menu-show-today" = "Тахана";
+"main-menu-nearby" = "Уллехь";
 "saved-pages-title" = "Ӏалашйина агӀонаш";
+"saved-pages-clear-cancel" = "Цаоьшу";
 "page-history-title" = "АгӀона истори";
 "page-history-downloading" = "Историн агӀо гучуяккхар...";
 "navbar-title-mode-login" = "ЧугӀо";
@@ -89,3 +91,12 @@
 "menu-toc-accessibility-label" = "Чулацам";
 "menu-cancel-accessibility-label" = "Цаоьшу";
 "menu-share-accessibility-label" = "Екха";
+"menu-trash-accessibility-label" = "ДӀаяккха";
+"nearby-title" = "Уллехь";
+"nearby-distance-label-meters" = "$1 м";
+"nearby-distance-label-km" = "$1 км";
+"nearby-distance-label-feet" = "$1 фут";
+"nearby-distance-label-miles" = "$1 миль";
+"nearby-pull-to-refresh-prompt" = "ТӀеоза, карлаяккха";
+"nearby-pull-to-refresh-is-refreshing" = "Карлаяккхар";
+"nearby-cancel" = "Цаоьшу";
diff --git a/wikipedia/de.lproj/Localizable.strings 
b/wikipedia/de.lproj/Localizable.strings
index acf1449..f6922a2 100644
--- a/wikipedia/de.lproj/Localizable.strings
+++ b/wikipedia/de.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "main-menu-heading-zero" = "Wikipedia Zero";
 "main-menu-heading-legal" = "Rechtliche Informationen";
 "main-menu-show-today" = "Heute";
+"main-menu-nearby" = "In der Nähe";
 "saved-pages-title" = "Gespeicherte Seiten";
 "saved-pages-clear-confirmation-heading" = "Alle gespeicherten Objekte 
löschen?";
 "saved-pages-clear-confirmation-sub-heading" = "Diese Aktion kann nicht 
rückgängig gemacht werden!";
@@ -190,3 +191,20 @@
 "menu-share-accessibility-label" = "Teilen";
 "menu-more-accessibility-label" = "Weitere Einstellungen";
 "menu-trash-accessibility-label" = "Löschen";
+"nearby-title" = "In der Nähe";
+"nearby-distance-label-meters" = "$1 Meter";
+"nearby-distance-label-km" = "$1 km";
+"nearby-distance-label-feet" = "$1 Fuß";
+"nearby-distance-label-miles" = "$1 Meilen";
+"nearby-pull-to-refresh-prompt" = "Zum Aktualisieren ziehen";
+"nearby-pull-to-refresh-is-refreshing" = "Aktualisiere";
+"nearby-loading" = "Lade Artikel in der Nähe …";
+"nearby-loaded" = "Artikel in der Nähe geladen";
+"nearby-none" = "Keine Artikel in der Nähe gefunden. Zum Aktualisieren ziehen 
oder später erneut versuchen.";
+"nearby-open-in-maps" = "In Maps öffnen";
+"nearby-cancel" = "Abbrechen";
+"nearby-location-updates-denied" = "Diese App hat keine Berechtigung, 
Standortsaktualisierungen zu erhalten.";
+"nearby-location-updates-enable" = "Um die Standortsaktualisierungen zu 
aktivieren, öffne die Einstellungs-App und wähle folgendes aus:";
+"nearby-location-updates-settings-menu" = "Datenschutz > Ortungsdienste > 
Wikipedia";
+"nearby-location-general-error" = "Standort konnte nicht bestimmt werden. Zum 
Aktualisieren ziehen oder später erneut versuchen.";
+"nearby-wifi" = "Das Aktivieren von Wi-Fi kann dabei helfen, den Standort 
deines Gerätes besser zu bestimmen.";
diff --git a/wikipedia/fa.lproj/Localizable.strings 
b/wikipedia/fa.lproj/Localizable.strings
index 09d5017..74c1427 100644
--- a/wikipedia/fa.lproj/Localizable.strings
+++ b/wikipedia/fa.lproj/Localizable.strings
@@ -103,6 +103,7 @@
 "main-menu-heading-zero" = "ویکی‌پدیای صفر";
 "main-menu-heading-legal" = "خرافات";
 "main-menu-show-today" = "امروز";
+"main-menu-nearby" = "در نزدیکی";
 "saved-pages-title" = "صفحات ذخیره شده";
 "saved-pages-clear-confirmation-heading" = "همه موارد ذخیره‌شده حذف شوند؟";
 "saved-pages-clear-confirmation-sub-heading" = "این عمل نمی‌تواند برگردانده 
شود!";
@@ -158,11 +159,34 @@
 "onboarding-login" = "ورود به سامانه";
 "onboarding-already-have-account" = "حساب کاربری دارید؟ $1.";
 "onboarding-skip" = "رها کردن";
+"onboarding-wikipedia" = "ویکی‌پدیا";
+"onboarding-free-encyclopedia" = "دانشنامهٔ آزاد";
 "preferenc

[MediaWiki-commits] [Gerrit] Correctly jump to a specific section from an incoming link. - change (apps...wikipedia)

[BearND (Code Review)]

BearND has submitted this change and it was merged.

Change subject: Correctly jump to a specific section from an incoming link.
..


Correctly jump to a specific section from an incoming link.

Bug: 69948
Change-Id: I5469b77ef259067e82deca426ea68fba13880d89
---
M wikipedia/src/main/java/org/wikipedia/Site.java
M wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
3 files changed, 17 insertions(+), 5 deletions(-)

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



diff --git a/wikipedia/src/main/java/org/wikipedia/Site.java 
b/wikipedia/src/main/java/org/wikipedia/Site.java
index 7cd86ea..007ae08 100644
--- a/wikipedia/src/main/java/org/wikipedia/Site.java
+++ b/wikipedia/src/main/java/org/wikipedia/Site.java
@@ -1,7 +1,9 @@
 package org.wikipedia;
 
+import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 /**
  * Represents a particular Wikimedia project.
@@ -83,6 +85,19 @@
 return new PageTitle(internalLink.replaceFirst("/wiki/", ""), this);
 }
 
+/**
+ * Create a PageTitle object from a Uri, taking into account any fragment 
(section title) in the link.
+ * @param uri Uri object to be turned into a PageTitle.
+ * @return {@link PageTitle} object that corresponds to the given Uri.
+ */
+public PageTitle titleForUri(Uri uri) {
+String path = uri.getPath();
+if (!TextUtils.isEmpty(uri.getFragment())) {
+path += "#" + uri.getFragment();
+}
+return titleForInternalLink(path);
+}
+
 private String language;
 public String getLanguage() {
 if (language == null) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
index 93bc9ac..a8b42a5 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -58,8 +58,6 @@
 }
 Log.d("Wikipedia", "Link clicked was " + href);
 if (href.startsWith("/wiki/")) {
-// TODO: Handle fragments
-
 PageTitle title = currentSite.titleForInternalLink(href);
 onInternalLinkClicked(title);
 } else if (href.startsWith("#")) {
@@ -70,8 +68,7 @@
 // FIXME: Make this more complete, only to not handle URIs that 
contain unsupported actions
 if (authority != null && Site.isSupportedSite(authority) && 
uri.getPath().startsWith("/wiki/")) {
 Site site = new Site(authority);
-//TODO: Handle fragments
-PageTitle title = site.titleForInternalLink(uri.getPath());
+PageTitle title = site.titleForUri(uri);
 onInternalLinkClicked(title);
 } else {
 // if it's a /w/ URI, turn it into a full URI and go external
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 139dca6..f7c6f70 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -167,7 +167,7 @@
 private void handleIntent(Intent intent) {
 if (Intent.ACTION_VIEW.equals(intent.getAction()) && intent.getData() 
!= null) {
 Site site = new Site(intent.getData().getAuthority());
-PageTitle title = 
site.titleForInternalLink(intent.getData().getPath());
+PageTitle title = site.titleForUri(intent.getData());
 HistoryEntry historyEntry = new HistoryEntry(title, 
HistoryEntry.SOURCE_EXTERNAL_LINK);
 bus.post(new NewWikiPageNavigationEvent(title, historyEntry));
 } else if (ACTION_PAGE_FOR_TITLE.equals(intent.getAction())) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5469b77ef259067e82deca426ea68fba13880d89
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve the way that sections are loaded into the WebView. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Improve the way that sections are loaded into the WebView.
..


Improve the way that sections are loaded into the WebView.

* Do it using chained Runnables on the Java side.
* No longer use cascading messages between Java and JS bridge, since that
was prone to occasional stack overflow errors in JS, which would cause
weird/undefined behavior.
* Simplify scrolling to a specific section upon loading the page.
* Improve scrolling to specific y-offset after restoring page from state.

(To be continued with a patch that fixes scrolling to a specific section
from links clicked outside the app)

Bug: 69700
Change-Id: I10a5f1bd025ed77615847f3865ecf72a4e836890
---
M wikipedia/assets/bundle.js
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M www/js/sections.js
3 files changed, 52 insertions(+), 52 deletions(-)

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



diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index b3228e8..bed5e2a 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -491,6 +491,7 @@
 
 function sectionsAllDone() {
 document.getElementById( "loading_sections").className = "";
+bridge.sendMessage( "pageLoadComplete", { } );
 }
 
 bridge.registerListener( "noMoreSections", function() {
@@ -503,18 +504,12 @@
 elementsForSection( payload.section ).forEach( function( element ) {
 contentWrapper.appendChild( element );
 });
-if ( !payload.isLast ) {
-bridge.sendMessage( "requestSection", { index: payload.index + 1 } );
-} else {
+if ( payload.isLast ) {
 sectionsAllDone();
-if ( typeof payload.fragment === "string" ) {
+if ( typeof payload.fragment === "string" && payload.fragment.length > 
0) {
 scrollToSection( payload.fragment );
 }
 }
-});
-
-bridge.registerListener( "startSectionsDisplay", function() {
-bridge.sendMessage( "requestSection", { index: 1 } );
 });
 
 bridge.registerListener( "scrollToSection", function ( payload ) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index f8cf479..9cdbd9b 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -123,7 +123,9 @@
 private View pageFragmentContainer;
 private Page page;
 private HistoryEntry curEntry;
-private int scrollSectionId;
+
+private int sectionTargetFromIntent;
+private String sectionTargetFromTitle;
 
 private CommunicationBridge bridge;
 private LinkHandler linkHandler;
@@ -151,9 +153,6 @@
 this.title = title;
 this.curEntry = historyEntry;
 this.quickReturnBarId = quickReturnBarId;
-
-//FIXME: Make this hold the section to scroll to if you follow a 
section wikilink, e.g. [[Article#Section]]
-this.scrollSectionId = -1;
 }
 
 public PageViewFragment() {
@@ -256,7 +255,42 @@
 }
 
 private void populateNonLeadSections() {
-bridge.sendMessage("startSectionsDisplay", new JSONObject());
+if (page.getSections().size() == 1) {
+bridge.sendMessage("noMoreSections", new JSONObject());
+return;
+} else {
+populateNonLeadSections(1);
+}
+}
+
+private void populateNonLeadSections(final int index) {
+webView.post(new Runnable() {
+@Override
+public void run() {
+try {
+JSONObject wrapper = new JSONObject();
+wrapper.put("section", 
page.getSections().get(index).toJSON());
+wrapper.put("index", index);
+wrapper.put("isLast", index == page.getSections().size() - 
1);
+if (index == page.getSections().size() - 1) {
+if (sectionTargetFromIntent > 0) {
+//if we have a section to scroll to (from our 
Intent), then pass it in the last request!
+wrapper.put("fragment", 
page.getSections().get(sectionTargetFromIntent).getAnchor());
+} else if (sectionTargetFromTitle != null) {
+//if we have a section to scroll to (from our 
PageTitle), then pass it in the last request!
+wrapper.put("fragment", sectionTargetFromTitle);
+}
+}
+bridge.sendMessage("displaySection", wrapper);
+} catch (JSONException e) {
+// Won't happen
+throw new RuntimeException(e);
+}
+if (index < page.getSections().size() - 1) {
+populateNonLeadSec

[MediaWiki-commits] [Gerrit] Provide a Language::listToText reimplementation in the Media... - change (mediawiki/core)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Provide a Language::listToText reimplementation in the 
MediaWiki JS
..

Provide a Language::listToText reimplementation in the MediaWiki JS

For I35e55658 in VE

Change-Id: I5d894f8a1cba65a3d90dfbf3e43be4e515a327d1
---
M resources/Resources.php
M resources/src/mediawiki.language/mediawiki.language.js
2 files changed, 23 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/157301/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 4a9827a..cbb8301 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1106,6 +1106,11 @@
'mediawiki.cldr',
),
'targets' => array( 'desktop', 'mobile' ),
+   'messages' => array(
+   'and',
+   'comma-separator',
+   'word-separator'
+   ),
),
 
'mediawiki.cldr' => array(
diff --git a/resources/src/mediawiki.language/mediawiki.language.js 
b/resources/src/mediawiki.language/mediawiki.language.js
index a0b5569..be8cb11 100644
--- a/resources/src/mediawiki.language/mediawiki.language.js
+++ b/resources/src/mediawiki.language/mediawiki.language.js
@@ -144,8 +144,25 @@
return grammarForms[form][word] || word;
}
return word;
-   }
+   },
 
+   /**
+* See Language::listToText in the PHP.
+* @param {string[]} list
+* @return {string}
+*/
+   listToText: function ( list ) {
+   var text = '', i;
+   for ( i = 0; i < list.length; i++ ) {
+   text += list[i];
+   if ( list.length - 2 === i ) {
+   text += mw.msg( 'and' ) + mw.msg( 
'word-separator' );
+   } else if ( list.length - 1 !== i ) {
+   text += mw.msg( 'comma-separator' );
+   }
+   }
+   return text;
+   }
 } );
 
 }( mediaWiki, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d894f8a1cba65a3d90dfbf3e43be4e515a327d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Remove use of deprecated OutputPage::appendSubtitle - change (mediawiki...ApprovedRevs)

[jenkins-bot (Code Review)]

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

Change subject: Remove use of deprecated OutputPage::appendSubtitle
..


Remove use of deprecated OutputPage::appendSubtitle

Change-Id: If24c4a6f7bde473470bce21160a84add80fac361
---
M ApprovedRevs.hooks.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index 7e8e468..e423c8d 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -453,7 +453,7 @@
 
global $wgOut;
if ( $wgOut->getSubtitle() != '' ) {
-   $wgOut->appendSubtitle( '' . $text );
+   $wgOut->addSubtitle( '' . $text );
} else {
$wgOut->setSubtitle( $text );
}
@@ -844,7 +844,7 @@
) ) );
}
} else {
-   $wgOut->appendSubtitle(
+   $wgOut->addSubtitle(
htmlspecialchars( wfMessage( 
'approvedrevs-blankpageshown' )->text() ) . ' ' .
Xml::element( 'a',
array( 'href' => $title->getLocalUrl(
@@ -882,7 +882,7 @@
$text = wfMessage( 'approvedrevs-noapprovedrevision' 
)->text();
global $wgOut;
if ( $wgOut->getSubtitle() != '' ) {
-   $wgOut->appendSubtitle( '' . $text );
+   $wgOut->addSubtitle( '' . $text );
} else {
$wgOut->setSubtitle( $text );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If24c4a6f7bde473470bce21160a84add80fac361
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove deprecated getResultProperties (since 1.24) - change (mediawiki...MassMessage)

[jenkins-bot (Code Review)]

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

Change subject: Remove deprecated getResultProperties (since 1.24)
..


Remove deprecated getResultProperties (since 1.24)

Change-Id: Ib36397aa8de38d6dbd074969b34a8394e052abed
---
M includes/ApiMassMessage.php
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/includes/ApiMassMessage.php b/includes/ApiMassMessage.php
index 520a0df..4876478 100644
--- a/includes/ApiMassMessage.php
+++ b/includes/ApiMassMessage.php
@@ -68,15 +68,6 @@
);
}
 
-   public function getResultProperties() {
-   return array(
-   '' => array(
-   'result' => 'string',
-   'count' => 'integer'
-   )
-   );
-   }
-
public function mustBePosted() {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib36397aa8de38d6dbd074969b34a8394e052abed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove use of deprecated wfGetIP() - change (mediawiki...CommunityHiring)

[jenkins-bot (Code Review)]

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

Change subject: Remove use of deprecated wfGetIP()
..


Remove use of deprecated wfGetIP()

Change-Id: Ia3f598801bbc211630ba513c439dc262807fc63c
---
M SpecialCommunityHiring.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/SpecialCommunityHiring.php b/SpecialCommunityHiring.php
index 77e783c..6611562 100644
--- a/SpecialCommunityHiring.php
+++ b/SpecialCommunityHiring.php
@@ -202,7 +202,7 @@
 
$dbw->insert( 'community_hiring_application',
array( 'ch_data' => json_encode($info),
-   'ch_ip' => wfGetIP(),
+   'ch_ip' => $this->getRequest()->getIP(),
'ch_timestamp' => wfTimestampNow(TS_DB) 
),
__METHOD__ );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3f598801bbc211630ba513c439dc262807fc63c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CommunityHiring
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove use of deprecated getPossibleErrors (since 1.24) - change (mediawiki...Persona)

[jenkins-bot (Code Review)]

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

Change subject: Remove use of deprecated getPossibleErrors (since 1.24)
..


Remove use of deprecated getPossibleErrors (since 1.24)

Change-Id: I2f9892ac2ef1f054ac419a907f2d5e19484d838f
---
M ApiPersona.php
1 file changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/ApiPersona.php b/ApiPersona.php
index 6d5c37f..21c5c70 100644
--- a/ApiPersona.php
+++ b/ApiPersona.php
@@ -60,19 +60,6 @@
);
}
 
-   function getPossibleErrors() {
-   return array_merge( parent::getPossibleErrors(), array(
-   array( 'sessionfailure' ),
-   array( 'actionthrottledtext' ),
-   array( 'code' => 'insecure', 'info' => 'Secure login is 
enabled, and an insecure (non-HTTPS) request was made.' ),
-   array( 'code' => 'failure', 'info' => 'The Persona 
verification API failed to verify your assertion.' ),
-   array( 'code' => 'error', 'info' => 'There was some 
sort of external server error.' ),
-   array( 'code' => 'dberror', 'info' => 'An internal 
database error occurred.' ),
-   array( 'code' => 'invaliduser', 'info' => 'No valid 
user matched the assertion token provided' ),
-   array( 'code' => 'multipleusers', 'info' => 'Multiple 
users with the same email matched.' )
-   ) );
-   }
-
function execute() {
global $wgSecureLogin;
$webRequest = $this->getRequest();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f9892ac2ef1f054ac419a907f2d5e19484d838f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Persona
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove use of deprecated getPossibleErrors (since 1.24) - change (mediawiki...EducationProgram)

[jenkins-bot (Code Review)]

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

Change subject: Remove use of deprecated getPossibleErrors (since 1.24)
..


Remove use of deprecated getPossibleErrors (since 1.24)

Change-Id: I34111073384f0ccec2186bdd70ad308fbf800a37
---
M includes/api/ApiAddStudents.php
M includes/api/ApiDeleteEducation.php
M includes/api/ApiEnlist.php
M includes/api/ApiListStudents.php
M includes/api/ApiRefreshEducation.php
5 files changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/includes/api/ApiAddStudents.php b/includes/api/ApiAddStudents.php
index 7e20865..2316c6b 100644
--- a/includes/api/ApiAddStudents.php
+++ b/includes/api/ApiAddStudents.php
@@ -177,13 +177,6 @@
);
}
 
-   public function getPossibleErrors() {
-   return array_merge( parent::getPossibleErrors(), array(
-   array( 'code' => 'invalid-course', 'info' => 'There is 
no course with the provided ID.' ),
-   array( 'code' => 'internal-error', 'info' => 'There was 
a problem enrolling students in this course.' ),
-   array( 'code' => 'no-rights', 'info' => 'The user is 
not authorized to perform this action.' ),
-   ) );
-   }
 
protected function getExamples() {
return array(
diff --git a/includes/api/ApiDeleteEducation.php 
b/includes/api/ApiDeleteEducation.php
index 0e0e63b..b8b0e35 100644
--- a/includes/api/ApiDeleteEducation.php
+++ b/includes/api/ApiDeleteEducation.php
@@ -150,12 +150,6 @@
);
}
 
-   public function getPossibleErrors() {
-   return array_merge( parent::getPossibleErrors(), array(
-   array( 'badaccess-groups' ),
-   ) );
-   }
-
protected function getExamples() {
return array(
'api.php?action=deleteeducation&ids=42&type=course',
diff --git a/includes/api/ApiEnlist.php b/includes/api/ApiEnlist.php
index 1cac40d..cf730ce 100644
--- a/includes/api/ApiEnlist.php
+++ b/includes/api/ApiEnlist.php
@@ -183,14 +183,6 @@
);
}
 
-   public function getPossibleErrors() {
-   return array_merge( parent::getPossibleErrors(), array(
-   array( 'code' => 'username-xor-userid', 'info' => 'You 
need to either provide the username or the userid parameter' ),
-   array( 'code' => 'invalid-user', 'info' => 'An invalid 
user name or id was provided' ),
-   array( 'code' => 'invalid-course', 'info' => 'There is 
no course with the provided ID' ),
-   ) );
-   }
-
protected function getExamples() {
return array(

'api.php?action=instructor&subaction=add&courseid=42&userid=9001',
diff --git a/includes/api/ApiListStudents.php b/includes/api/ApiListStudents.php
index 3ec2e61..3b973c8 100644
--- a/includes/api/ApiListStudents.php
+++ b/includes/api/ApiListStudents.php
@@ -445,15 +445,6 @@
);
}
 
-   public function getPossibleErrors() {
-   return array_merge( parent::getPossibleErrors(), array(
-   array( 'code' => 'invalid-course',
-   'info' => 'There is no course with the provided 
ID.' ),
-   array( 'code' => 'over-query-limit',
-   'info' => 'This query would return more 
usernames than allowed.' ),
-   ));
-   }
-
protected function getExamples() {
return array(
'api.php?action=liststudents&courseids=3',
diff --git a/includes/api/ApiRefreshEducation.php 
b/includes/api/ApiRefreshEducation.php
index 6ac9623..969fff9 100644
--- a/includes/api/ApiRefreshEducation.php
+++ b/includes/api/ApiRefreshEducation.php
@@ -84,12 +84,6 @@
);
}
 
-   public function getPossibleErrors() {
-   return array_merge( parent::getPossibleErrors(), array(
-   array( 'badaccess-groups' ),
-   ) );
-   }
-
protected function getExamples() {
return array(
'api.php?action=refresheducation&ids=42&type=course',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34111073384f0ccec2186bdd70ad308fbf800a37
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mai

[MediaWiki-commits] [Gerrit] Error handling for HTTP 4xx and 5xx responses - change (mediawiki...api)

[Dduvall (Code Review)]

Dduvall has uploaded a new change for review.

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

Change subject: Error handling for HTTP 4xx and 5xx responses
..

Error handling for HTTP 4xx and 5xx responses

Client now throws an HttpError when handling HTTP responses with a
status in the 400 and 500 ranges.

Change-Id: Ifb3aa6025f135ea9138a9ffe9eba07da4091796e
Bug: 70193
---
M lib/mediawiki_api/client.rb
M lib/mediawiki_api/exceptions.rb
M spec/client_spec.rb
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api 
refs/changes/00/157300/1

diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index fb63885..146e5c6 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -37,6 +37,8 @@
 
   response = @conn.send(method, "", params.merge(action: name, format: 
FORMAT))
 
+  raise HttpError, response.status if response.status >= 400
+
   if response.headers.include?("mediawiki-api-error")
 raise ApiError.new(Response.new(response, ["error"]))
   end
diff --git a/lib/mediawiki_api/exceptions.rb b/lib/mediawiki_api/exceptions.rb
index 7174fe7..aec622c 100644
--- a/lib/mediawiki_api/exceptions.rb
+++ b/lib/mediawiki_api/exceptions.rb
@@ -28,6 +28,18 @@
   class CreateAccountError < StandardError
   end
 
+  class HttpError < StandardError
+attr_reader :status
+
+def initialize(status)
+  @status = status
+end
+
+def to_s
+  "unexpected HTTP response (#{status})"
+end
+  end
+
   class LoginError < StandardError
   end
 
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 1d7c9db..3e7dc8b 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -18,7 +18,8 @@
 let(:token_type) { action }
 let(:params) { {} }
 
-let(:response) { { headers: response_headers, body: response_body.to_json 
} }
+let(:response) { { status: response_status, headers: response_headers, 
body: response_body.to_json } }
+let(:response_status) { 200 }
 let(:response_headers) { nil }
 let(:response_body) { { "something" => {} } }
 
@@ -100,6 +101,22 @@
   end
 end
 
+context "when the response status is in the 400 range" do
+  let(:response_status) { 403 }
+
+  it "raises an HttpError" do
+expect { subject }.to raise_error(MediawikiApi::HttpError, "unexpected 
HTTP response (403)")
+  end
+end
+
+context "when the response status is in the 500 range" do
+  let(:response_status) { 502 }
+
+  it "raises an HttpError" do
+expect { subject }.to raise_error(MediawikiApi::HttpError, "unexpected 
HTTP response (502)")
+  end
+end
+
 context "when the response is an error" do
   let(:response_headers) { { "MediaWiki-API-Error" => "code" } }
   let(:response_body) { { error: { info: "detailed message", code: "code" 
} } }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb3aa6025f135ea9138a9ffe9eba07da4091796e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
Gerrit-Branch: master
Gerrit-Owner: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Ensure that dependent packages for Trebuchet are installed - change (operations/puppet)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Ensure that dependent packages for Trebuchet are installed
..

Ensure that dependent packages for Trebuchet are installed

The python code for the deployment module needs several packages
installed on the host. If they are not present, salt will give the
cryptic and generally unhelpful error "Function deploy.fetch is not
available" when running `salt-call deploy.fetch`.

Change-Id: Ib487dd5d4680a255e02dc7ab727b6aa3e50af814
---
M manifests/role/trebuchet.pp
A modules/trebuchet/manifests/packages.pp
2 files changed, 26 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/157299/1

diff --git a/manifests/role/trebuchet.pp b/manifests/role/trebuchet.pp
index 3c19703..d117736 100644
--- a/manifests/role/trebuchet.pp
+++ b/manifests/role/trebuchet.pp
@@ -10,6 +10,8 @@
 labs   => pick($::deployment_server_override, 
"${::instanceproject}-deploy.eqiad.wmflabs"),
 }
 
+include ::trebuchet::packages
+
 salt::grain { 'trebuchet_master':
 value   => $trebuchet_master,
 replace => true,
@@ -17,7 +19,9 @@
 
 # Trebuchet needs salt-minion to query grains, and it needs the
 # `trebuchet_master` grain set so that it knows where to fetch from.
+# It also needs the dependencies from ::trebuchet::packages.
 Service['salt-minion'] ->
 Salt::Grain['trebuchet_master'] ->
-Package <| provider == 'trebuchet' |>
+Class['::trebuchet::packages'] ->
+Package <| provider == 'trebuchet' |>
 }
diff --git a/modules/trebuchet/manifests/packages.pp 
b/modules/trebuchet/manifests/packages.pp
new file mode 100644
index 000..cc2629f
--- /dev/null
+++ b/modules/trebuchet/manifests/packages.pp
@@ -0,0 +1,21 @@
+# == Class: trebuchet::packages
+#
+# Provision packages required for trebuchet to operate
+#
+class trebuchet::packages {
+if ! defined(Package['git-core']){
+  package { 'git-core':
+ensure => present,
+  }
+}
+if ! defined(Package['python-redis']){
+  package { 'python-redis':
+ensure => present,
+  }
+}
+if ! defined(Package['git-fat']){
+  package { 'git-fat':
+ensure => present,
+  }
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] wikistats - fix typo in cronjob name - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: wikistats - fix typo in cronjob name
..


wikistats - fix typo in cronjob name

it's called "w3" not "wc", or "unkown table. exiting"

Bug: 41023

Change-Id: If79dc02c0ca86016a66e421a74feca5facb69e52
---
M modules/wikistats/manifests/updates.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 781d4d7..ac19bb0 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -42,7 +42,7 @@
 'wk@21', # Wikkii
 're@22', # Referata
 'pa@23', # Pardus
-'wc@23', # W3C
+'w3@23', # W3C
 ]: }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikistats - fix typo in cronjob name - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: wikistats - fix typo in cronjob name
..

wikistats - fix typo in cronjob name

it's called "w3" not "wc", or "unkown table. exiting"

Change-Id: If79dc02c0ca86016a66e421a74feca5facb69e52
---
M modules/wikistats/manifests/updates.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/157298/1

diff --git a/modules/wikistats/manifests/updates.pp 
b/modules/wikistats/manifests/updates.pp
index 781d4d7..ac19bb0 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -42,7 +42,7 @@
 'wk@21', # Wikkii
 're@22', # Referata
 'pa@23', # Pardus
-'wc@23', # W3C
+'w3@23', # W3C
 ]: }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] Initial extension code - change (mediawiki...SandboxLink)

[Code Review]

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

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

Change subject: Initial extension code
..

Initial extension code

Change-Id: Idace81fc12d10cf4581f0e6fe90ba08f31c79eef
---
A SandboxLink.php
A SandboxLinkHooks.php
A i18n/en.json
3 files changed, 125 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SandboxLink 
refs/changes/96/157296/1

diff --git a/SandboxLink.php b/SandboxLink.php
new file mode 100644
index 000..da28985
--- /dev/null
+++ b/SandboxLink.php
@@ -0,0 +1,28 @@
+https://www.mediawiki.org/wiki/Extension:SandboxLink
+ *
+ * @file
+ * @license MIT
+ */
+
+$wgExtensionCredits['other'][] = array(
+   'path' => __FILE__,
+   'name' => 'SandboxLink',
+   'author' => array(
+   'Bartosz Dziewoński',
+   ),
+   'url' => 'https://www.mediawiki.org/wiki/Extension:SandboxLink',
+   'descriptionmsg' => 'sandboxlink-desc',
+);
+
+$wgMessagesDirs['SandboxLink'] = __DIR__ . '/i18n';
+$wgAutoloadClasses['SandboxLinkHooks'] = __DIR__ . '/SandboxLinkHooks.php';
+
+$wgHooks['SkinPreloadExistence'][] = 
'SandboxLinkHooks::onSkinPreloadExistence';
+$wgHooks['PersonalUrls'][] = 'SandboxLinkHooks::onPersonalUrls';
+
+// Configuration settings
+$wgSandboxLinkDisableAnon = true;
diff --git a/SandboxLinkHooks.php b/SandboxLinkHooks.php
new file mode 100644
index 000..7938835
--- /dev/null
+++ b/SandboxLinkHooks.php
@@ -0,0 +1,90 @@
+https://www.mediawiki.org/wiki/Extension:SandboxLink
+ *
+ * @file
+ * @license MIT
+ */
+
+class SandboxLinkHooks {
+   private static function getSandboxTitle( User $user ) {
+   $subpageMsg = wfMessage( 'sandboxlink-subpage-name' );
+   if ( $subpageMsg->isDisabled() ) {
+   return null;
+   }
+   return Title::makeTitleSafe( NS_USER, $user->getName() . '/' . 
$subpageMsg->plain() );
+   }
+
+   private static function makeSandboxLink( User $user, Title 
$currentTitle ) {
+   $title = self::getSandboxTitle( $user );
+   if ( !$title ) {
+   return null;
+   }
+
+   if ( $title->exists() ) {
+   $href = $title->getLocalURL();
+   } else {
+   $query = array( 'action' => 'edit', 'redlink' => '1' );
+
+   $editintroMsg = wfMessage( 
'sandboxlink-editintro-pagename' );
+   if ( !$editintroMsg->isDisabled() ) {
+   $query['editintro'] = $editintroMsg->plain();
+   }
+
+   $preloadMsg = wfMessage( 'sandboxlink-preload-pagename' 
);
+   if ( !$preloadMsg->isDisabled() ) {
+   $query['preload'] = $preloadMsg->plain();
+   }
+
+   $href = $title->getLocalURL( $query );
+   }
+
+   return array(
+   'id' => 'pt-mysandbox',
+   'text' => wfMessage( 'sandboxlink-portlet-label' 
)->text(),
+   'href' => $href,
+   'class' => $title->exists() ? false : 'new',
+   'active' => $title->equals( $currentTitle ),
+   );
+   }
+
+   public static function onSkinPreloadExistence( &$titles, $skin ) {
+   $title = self::getSandboxTitle( $skin->getUser() );
+   if ( $title ) {
+   $titles[] = $title;
+   }
+   return true;
+   }
+
+   public static function onPersonalUrls( &$personalUrls, &$title, $skin ) 
{
+   if ( $skin->getConfig()->get( 'SandboxLinkDisableAnon' ) && 
$skin->getUser()->isAnon() ) {
+   return true;
+   }
+
+   $link = self::makeSandboxLink( $skin->getUser(), 
$skin->getTitle() );
+   if ( !$link ) {
+   return true;
+   }
+
+   $newPersonalUrls = array();
+   $done = false;
+
+   // Insert our link before the link to user preferences.
+   // If the link to preferences is missing, insert at the end.
+   foreach ( $personalUrls as $key => $value ) {
+   if ( $key === 'preferences' ) {
+   $newPersonalUrls['sandbox'] = $link;
+   $done = true;
+   }
+   $newPersonalUrls[$key] = $value;
+   }
+   if ( !$done ) {
+   $newPersonalUrls['sandbox'] = $link;
+   }
+
+   $personalUrls = $newPersonalUrls;
+   return true;
+   }
+}
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..f9f4262
--- /dev/null
+++ b/i18n/en.

[MediaWiki-commits] [Gerrit] Add SkinPreloadExistence hook - change (mediawiki/core)

[Code Review]

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

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

Change subject: Add SkinPreloadExistence hook
..

Add SkinPreloadExistence hook

Bug: 69650
Change-Id: Ia16c2034cdf6cdc9ac8e37b113ffbbecd272087f
---
M docs/hooks.txt
M includes/skins/Skin.php
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/docs/hooks.txt b/docs/hooks.txt
index ad5377e..bc736c7 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2292,6 +2292,11 @@
 the MediaWiki icon but plain text instead.
 $skin: Skin object
 
+'SkinPreloadExistence': Supply titles that should be added to link existence
+cache before the page is rendered.
+&$titles: Array of Title objects
+$skin: Skin object
+
 'SkinSubPageSubtitle': At the beginning of Skin::subPageSubtitle().
 &$subpages: Subpage links HTML
 $skin: Skin object
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index dc06eba..7d04b95 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -253,6 +253,8 @@
$titles[] = $this->getTitle()->getTalkPage();
}
 
+   wfRunHooks( 'SkinPreloadExistence', array( &$titles, $this ) );
+
$lb = new LinkBatch( $titles );
$lb->setCaller( __METHOD__ );
$lb->execute();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia16c2034cdf6cdc9ac8e37b113ffbbecd272087f
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] Automatically align popup toolgroups - change (oojs/ui)

[Trevor Parscal (Code Review)]

Trevor Parscal has uploaded a new change for review.

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

Change subject: Automatically align popup toolgroups
..

Automatically align popup toolgroups

Changes:
* Check if popup toolgroup is being clipped when made active, and if it is, use 
opposite alignment
* Use margin instead of left/right to compensate for border, allowing the theme 
to be more separated from the base functionality

Bonus:

ClippableElement.js
* The toggleClipping method had an undocumented and uneeded async behavior for 
calling clip the first time after toggling clipping
** This has been removed and calling code has been verified to not be affected
** A comment has been added to inform callers that the element needs to be 
attached and visible before toggling clipping, which is supposedly what the 
setTimeout was in aid of, but no longer seems to be needed for
* Remove size and overflow properties from clippable elements when not clipping
* Add isClippedHorizontally and isClippedVertically methods

Change-Id: I607426423026df90a86a390c8f07cf419790ba0b
---
M src/elements/ClippableElement.js
M src/styles/toolgroups/PopupToolGroup.less
M src/themes/apex/tools.less
M src/themes/minerva/tools.less
M src/toolgroups/PopupToolGroup.js
5 files changed, 51 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/95/157295/1

diff --git a/src/elements/ClippableElement.js b/src/elements/ClippableElement.js
index 775ed4e..34e187c 100644
--- a/src/elements/ClippableElement.js
+++ b/src/elements/ClippableElement.js
@@ -16,7 +16,8 @@
// Properties
this.$clippable = null;
this.clipping = false;
-   this.clipped = false;
+   this.clippedHorizontally = false;
+   this.clippedVertically = false;
this.$clippableContainer = null;
this.$clippableScroller = null;
this.$clippableWindow = null;
@@ -53,6 +54,8 @@
 /**
  * Toggle clipping.
  *
+ * Do not turn clipping on until after the element is attched to the DOM and 
visible.
+ *
  * @param {boolean} [clipping] Enable clipping, omit to toggle
  * @chainable
  */
@@ -60,6 +63,7 @@
clipping = clipping === undefined ? !this.clipping : !!clipping;
 
if ( this.clipping !== clipping ) {
+   this.clipping = clipping;
if ( clipping ) {
this.$clippableContainer = this.$( 
this.getClosestScrollableElementContainer() );
// If the clippable container is the body, we have to 
listen to scroll events and check
@@ -71,15 +75,15 @@
this.$clippableWindow = this.$( this.getElementWindow() 
)
.on( 'resize', 
this.onClippableWindowResizeHandler );
// Initial clip after visible
-   setTimeout( OO.ui.bind( this.clip, this ) );
+   this.clip();
} else {
+   this.$clippable.css( { overflowX: '', width: '', 
overflowY: '', height: '' } );
this.$clippableContainer = null;
this.$clippableScroller.off( 'scroll', 
this.onClippableContainerScrollHandler );
this.$clippableScroller = null;
this.$clippableWindow.off( 'resize', 
this.onClippableWindowResizeHandler );
this.$clippableWindow = null;
}
-   this.clipping = clipping;
}
 
return this;
@@ -100,7 +104,25 @@
  * @return {boolean} Part of the element is being clipped
  */
 OO.ui.ClippableElement.prototype.isClipped = function () {
-   return this.clipped;
+   return this.clippedHorizontally || this.clippedVertically;
+};
+
+/**
+ * Check if the right of the element is being clipped by the nearest 
scrollable container.
+ *
+ * @return {boolean} Part of the element is being clipped
+ */
+OO.ui.ClippableElement.prototype.isClippedHorizontally = function () {
+   return this.clippedHorizontally;
+};
+
+/**
+ * Check if the bottom of the element is being clipped by the nearest 
scrollable container.
+ *
+ * @return {boolean} Part of the element is being clipped
+ */
+OO.ui.ClippableElement.prototype.isClippedVertically = function () {
+   return this.clippedVertically;
 };
 
 /**
@@ -159,7 +181,8 @@
this.$clippable.css( 'overflowY', '' );
}
 
-   this.clipped = clipWidth || clipHeight;
+   this.clippedHorizontally = clipWidth
+   this.clippedVertically = clipHeight;
 
return this;
 };
diff --git a/src/styles/toolgroups/PopupToolGroup.less 
b/src/styles/toolgroups/PopupToolGroup.less
index a5931dc..6cf01a4 100644
--- a/src/styles/toolgroups/PopupToolGroup.less
+++ b/src/styles/toolgroups/PopupToolGroup.less
@@ -38,6 +38,14 @@
}
}
 
+   &-left > .oo-ui-toolGroup-tools {
+   left: 0;
+

[MediaWiki-commits] [Gerrit] mediawiki: add packages::fonts and packages::multimedia - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: mediawiki: add packages::fonts and packages::multimedia
..


mediawiki: add packages::fonts and packages::multimedia

Continue factoring out bunches of package dependencies into discrete subclasses
of mediawiki::packages.

Change-Id: I27e84f9286a4df60b0eb81a0cd31c13746851102
---
M modules/mediawiki/manifests/multimedia.pp
A modules/mediawiki/manifests/packages/fonts.pp
A modules/mediawiki/manifests/packages/multimedia.pp
M modules/toollabs/manifests/exec_environ.pp
4 files changed, 92 insertions(+), 83 deletions(-)

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



diff --git a/modules/mediawiki/manifests/multimedia.pp 
b/modules/mediawiki/manifests/multimedia.pp
index fff3b74..28e95bd 100644
--- a/modules/mediawiki/manifests/multimedia.pp
+++ b/modules/mediawiki/manifests/multimedia.pp
@@ -4,32 +4,8 @@
 # and video processing.
 #
 class mediawiki::multimedia {
-include ::mediawiki::multimedia::fonts
-
-if ubuntu_version('>= trusty') {
-$libav_package   = 'libav-tools'
-$libvips_package = 'libvips37'
-} else {
-$libav_package   = 'ffmpeg'
-$libvips_package = 'libvips15'
-}
-
-package { [
-$libav_package,
-$libvips_package,
-'ffmpeg2theora',
-'fontconfig-config',
-'ghostscript',
-'libjpeg-turbo-progs',
-'libogg0',
-'libtheora0',
-'libvips-tools',
-'libvorbisenc2',
-'netpbm',
-'oggvideotools',
-]:
-ensure => present,
-}
+include ::mediawiki::packages::multimedia
+include ::mediawiki::packages::fonts
 
 file { '/etc/fonts/conf.d/70-no-bitmaps.conf':
 ensure  => link,
@@ -50,61 +26,5 @@
 type=> 'ctime',
 backup  => false,
 recurse => 1,
-}
-}
-
-class mediawiki::multimedia::fonts {
-package { [
-'fonts-arabeyes',
-'fonts-arphic-ukai',
-'fonts-arphic-uming',
-'fonts-farsiweb',
-'fonts-kacst',
-'fonts-khmeros',
-'fonts-lao',
-'fonts-liberation',
-'fonts-linuxlibertine',
-'fonts-manchufont',
-'fonts-mgopen',
-'fonts-nafees',
-'fonts-sil-abyssinica',
-'fonts-sil-ezra',
-'fonts-sil-padauk',
-'fonts-sil-scheherazade',
-'fonts-takao-gothic',
-'fonts-takao-mincho',
-'fonts-thai-tlwg',
-'fonts-tibetan-machine',
-'fonts-unfonts-extra',
-'texlive-fonts-recommended',
-'ttf-alee',
-'ttf-bengali-fonts',
-'ttf-devanagari-fonts',
-'ttf-gujarati-fonts',
-'ttf-kannada-fonts',
-'ttf-malayalam-fonts',
-'ttf-oriya-fonts',
-'ttf-punjabi-fonts',
-'ttf-tamil-fonts',
-'ttf-telugu-fonts',
-'ttf-ubuntu-font-family',
-'ttf-wqy-zenhei',
-'xfonts-100dpi',
-'xfonts-75dpi',
-'xfonts-base',
-'xfonts-mplus',
-'xfonts-scalable',
-'fonts-sil-nuosusil',# RT 6500
-'culmus',# Bug 38946
-'culmus-fancy',  # Bug 38946
-'fonts-lklug-sinhala',   # Bug 55462
-'fonts-vlgothic',# Bug 64002
-'ttf-dejavu-core',   # Bug 63206
-'ttf-dejavu-extra',  # Bug 63206
-'ttf-kochi-gothic',  # Bug 64002
-'ttf-kochi-mincho',  # Bug 64002
-'ttf-lyx',   # Bug 38299
-]:
-ensure => present,
 }
 }
diff --git a/modules/mediawiki/manifests/packages/fonts.pp 
b/modules/mediawiki/manifests/packages/fonts.pp
new file mode 100644
index 000..5f1d152
--- /dev/null
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -0,0 +1,59 @@
+# == Class: mediawiki::packages::fonts
+#
+# Provisions font packages used by MediaWiki.
+#
+class mediawiki::packages::fonts {
+package { [
+'fonts-arabeyes',
+'fonts-arphic-ukai',
+'fonts-arphic-uming',
+'fonts-farsiweb',
+'fonts-kacst',
+'fonts-khmeros',
+'fonts-lao',
+'fonts-liberation',
+'fonts-linuxlibertine',
+'fonts-manchufont',
+'fonts-mgopen',
+'fonts-nafees',
+'fonts-sil-abyssinica',
+'fonts-sil-ezra',
+'fonts-sil-padauk',
+'fonts-sil-scheherazade',
+'fonts-takao-gothic',
+'fonts-takao-mincho',
+'fonts-thai-tlwg',
+'fonts-tibetan-machine',
+'fonts-unfonts-extra',
+'texlive-fonts-recommended',
+'ttf-alee',
+'ttf-bengali-fonts',
+'ttf-devanagari-fonts',
+'ttf-gujarati-fonts',
+'ttf-kannada-fonts',
+'ttf-malayalam-fonts',
+'ttf-oriya-fonts',
+'ttf-punjabi-fonts',

[MediaWiki-commits] [Gerrit] hhvm - make debug log path configurable - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: hhvm - make debug log path configurable
..

hhvm - make debug log path configurable

- move hhvm-dump-debug from file to template
- add parameter for debug log path
- adjust the template to use it

as requested by hashar in

Bug 69979

because labs instances are getting filled up when using /tmp
and just because it should be configurable

Change-Id: I3acc0dea08b2720755be8e4f200408ce3d26bd76
---
D modules/hhvm/files/hhvm-dump-debug
M modules/hhvm/manifests/init.pp
A modules/hhvm/templates/hhvm-dump-debug.erb
3 files changed, 26 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/157294/1

diff --git a/modules/hhvm/files/hhvm-dump-debug 
b/modules/hhvm/files/hhvm-dump-debug
deleted file mode 100755
index 7a2a618..000
--- a/modules/hhvm/files/hhvm-dump-debug
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# hhvm-debug-dump: dump HHVM core and backtrace to /tmp.
-
-die() { local st="$?"; echo "$@" >&2; exit $st; }
-
-. /etc/default/hhvm || die
-
-read PID <"${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid"
-case $PID in ''|*[!0-9]*)
-die "Can't find PID file of HHVM." ;;
-esac
-
-gdb -batch -p "$PID"   \
--ex "thread apply all backtrace full"  \
--ex "generate-core-file /tmp/hhvm.${PID}.core" \
->"/tmp/hhvm.${PID}.bt" 2>/dev/null
-
-cp "/proc/$PID/exe" "/tmp/hhvm.${PID}.bin"
-
-die "Saved HHVM debug data in /tmp/hhvm.${PID}.{bt,core,bin}."
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1ed8f07..8c4de34 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -75,6 +75,7 @@
 $group = 'www-data',
 $fcgi_settings = {},
 $cli_settings  = {},
+$debug_path= '/var/log/hhvm',
 ) {
 requires_ubuntu('>= trusty')
 
@@ -210,11 +211,11 @@
 }
 
 file { '/usr/local/sbin/hhvm-dump-debug':
-source => 'puppet:///modules/hhvm/hhvm-dump-debug',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-before => Service['hhvm'],
+content => template('hhvm/hhvm-dump-debug.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+before  => Service['hhvm'],
 }
 
 
diff --git a/modules/hhvm/templates/hhvm-dump-debug.erb 
b/modules/hhvm/templates/hhvm-dump-debug.erb
new file mode 100755
index 000..1691f33
--- /dev/null
+++ b/modules/hhvm/templates/hhvm-dump-debug.erb
@@ -0,0 +1,20 @@
+#!/bin/bash
+# hhvm-debug-dump: dump HHVM core and backtrace to $debug_path
+
+die() { local st="$?"; echo "$@" >&2; exit $st; }
+
+. /etc/default/hhvm || die
+
+read PID <"${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid"
+case $PID in ''|*[!0-9]*)
+die "Can't find PID file of HHVM." ;;
+esac
+
+gdb -batch -p "$PID"   \
+-ex "thread apply all backtrace full"  \
+-ex "generate-core-file <% @debug_path %>/hhvm.${PID}.core" \
+>"/tmp/hhvm.${PID}.bt" 2>/dev/null
+
+cp "/proc/$PID/exe" "<% @debug_path %>/hhvm.${PID}.bin"
+
+die "Saved HHVM debug data in <% @debug_path %>/hhvm.${PID}.{bt,core,bin}."

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

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

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

[MediaWiki-commits] [Gerrit] page.py: base isEmptyCategory on page.categoryinfo() - change (pywikibot/core)

[Mpaa (Code Review)]

Mpaa has uploaded a new change for review.

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

Change subject: page.py: base isEmptyCategory on page.categoryinfo()
..

page.py: base isEmptyCategory on page.categoryinfo()

No change of functionality.
Test is based on check of properties rather than try to retrieve
content.

Tests added.

Change-Id: I6070c72882fbcd94a5526a158a9827738386bf51
---
M pywikibot/page.py
M tests/page_tests.py
2 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/93/157293/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index e77b23e..39065a8 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2121,9 +2121,8 @@
 
 def isEmptyCategory(self):
 """Return True if category has no members (including subcategories)."""
-for member in self.site.categorymembers(self, total=1):
-return False
-return True
+member_no = [self.categoryinfo[k] for k in ['files', 'pages', 
'subcats']]
+return sum(member_no) == 0
 
 def isHiddenCategory(self):
 """Return True if the category is hidden."""
diff --git a/tests/page_tests.py b/tests/page_tests.py
index ebc37d6..05d3228 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -400,6 +400,17 @@
 #def contributingUsers(self):
 
 
+class TestCategoryObject(PywikibotTestCase):
+
+def test_isEmptyCategory(self):
+"""Test if category is empty or not"""
+site = pywikibot.Site('en', 'wikipedia')
+cat_empty = pywikibot.Category(site, u'Category:foo')
+cat_not_empty = pywikibot.Category(site, u'Category:Wikipedia 
categories')
+self.assertTrue(cat_empty.isEmptyCategory())
+self.assertFalse(cat_not_empty.isEmptyCategory())
+
+
 if __name__ == '__main__':
 try:
 unittest.main()

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

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

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

[MediaWiki-commits] [Gerrit] category.py: consider also files, not only pages - change (pywikibot/core)

[Mpaa (Code Review)]

Mpaa has uploaded a new change for review.

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

Change subject: category.py: consider also files, not only pages
..

category.py: consider also files, not only pages

In CategoryTidyRobot(), a category is considered empty only if no pages
are present, while number of files is not considered.

This patch fixes it.

Change-Id: I1a340e2337d44caeedd435a40160736ea943d7cb
---
M scripts/category.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/92/157292/1

diff --git a/scripts/category.py b/scripts/category.py
index fa7a3ea..117df55 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -887,8 +887,8 @@
 def run(self):
 cat = pywikibot.Category(self.site, self.catTitle)
 
-if cat.categoryinfo['pages'] == 0:
-pywikibot.output(u'There are no articles in category %s'
+if cat.categoryinfo['pages'] == 0 and cat.categoryinfo['files'] == 0:
+pywikibot.output(u'There are no articles or files in category %s'
  % self.catTitle)
 else:
 preloadingGen = pagegenerators.PreloadingGenerator(cat.articles())

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

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

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

[MediaWiki-commits] [Gerrit] Workaround flake8 2.2.3 breaking with pep257 - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: Workaround flake8 2.2.3 breaking with pep257
..


Workaround flake8 2.2.3 breaking with pep257

pep257 yields some error which apparently cause flake8 2.2.3 to stall
completely waiting for some input.  That can be worked around by
disabling multiprocessing (turned on by default with 2.2.3). Simply pass
--jobs=1 to flake8 in the flake8-docstrings job.

Upstream issue:
https://bitbucket.org/tarek/flake8/issue/167/flake8-223-stall-with-multiprocessing

Change-Id: Iff84c926b42846b4c36db30507851859a827e103
---
M tox.ini
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/tox.ini b/tox.ini
index 9fae601..00fcf0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,8 +14,15 @@
 deps = flake8
 
 [testenv:flake8-docstrings]
-commands = flake8 --select=D {posargs}
+commands = flake8 --select=D {posargs} --jobs=1
 deps = flake8-docstrings
+# Note: flake8 is run here with --jobs=1 to disable multiprocessing which stall
+# the run with flake8-docstrings / pep257.
+# That appeared with flake8 2.2.3 which turns multiprocessing on by default.
+#
+# See upstream issue:
+# 
https://bitbucket.org/tarek/flake8/issue/167/flake8-223-stall-with-multiprocessing
+
 
 [testenv:nose]
 setenv = PYWIKIBOT2_NO_USER_CONFIG=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff84c926b42846b4c36db30507851859a827e103
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Workaround flake8 2.2.3 breaking with pep257 - change (pywikibot/core)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Workaround flake8 2.2.3 breaking with pep257
..

Workaround flake8 2.2.3 breaking with pep257

pep257 yields some error which apparently cause flake8 2.2.3 to stall
completely waiting for some input.  That can be worked around by
disabling multiprocessing (turned on by default with 2.2.3). Simply pass
--jobs=1 to flake8 in the flake8-docstrings job.

Upstream issue:
https://bitbucket.org/tarek/flake8/issue/167/flake8-223-stall-with-multiprocessing

Change-Id: Iff84c926b42846b4c36db30507851859a827e103
---
M tox.ini
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/91/157291/1

diff --git a/tox.ini b/tox.ini
index 9fae601..00fcf0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,8 +14,15 @@
 deps = flake8
 
 [testenv:flake8-docstrings]
-commands = flake8 --select=D {posargs}
+commands = flake8 --select=D {posargs} --jobs=1
 deps = flake8-docstrings
+# Note: flake8 is run here with --jobs=1 to disable multiprocessing which stall
+# the run with flake8-docstrings / pep257.
+# That appeared with flake8 2.2.3 which turns multiprocessing on by default.
+#
+# See upstream issue:
+# 
https://bitbucket.org/tarek/flake8/issue/167/flake8-223-stall-with-multiprocessing
+
 
 [testenv:nose]
 setenv = PYWIKIBOT2_NO_USER_CONFIG=1

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

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

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

[MediaWiki-commits] [Gerrit] HHVM: Increase Eval.PCRETableSize - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: HHVM: Increase Eval.PCRETableSize
..

HHVM: Increase Eval.PCRETableSize

Let's try increasing the size of the PCRE cache from the default (96 * 1024
regexps) to 1024 * 1024 regexps. MediaWiki generates a lot of dynamic regexps,
and  proves that we do run into
the limit.

Change-Id: I09015f72c956682478c754f3694c08453932cf95
---
M modules/hhvm/files/config.hdf
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/157290/1

diff --git a/modules/hhvm/files/config.hdf b/modules/hhvm/files/config.hdf
index db9de1c..5fe7b5c 100644
--- a/modules/hhvm/files/config.hdf
+++ b/modules/hhvm/files/config.hdf
@@ -12,5 +12,6 @@
 }
 
 Eval {
-  PerfPidMap = false
+  PerfPidMap= false # Don't create perf-*.map files in /tmp
+  PCRETableSize = 1048576   # Cache up to 1024 * 1024 regexps (the default is 
96 * 1024)
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09015f72c956682478c754f3694c08453932cf95
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] Coalesce the edit funnel SQL queries - change (analytics/limn-mobile-data)

[Milimetric (Code Review)]

Milimetric has submitted this change and it was merged.

Change subject: Coalesce the edit funnel SQL queries
..


Coalesce the edit funnel SQL queries

so they don't blow up when there is no data.

Also move the start date for the iOS queries to the date
when the iOS app was released, for good measure.

Change-Id: Ia08bcd7da281d455bbdd728b518b51eb3778d21f
---
M datasources/app-edit-funnel-ios.json
M mobile/app-edit-funnel-android.sql
M mobile/app-edit-funnel-ios.sql
M mobile/app-edit-funnel-total.sql
M mobile/config.yaml
5 files changed, 14 insertions(+), 14 deletions(-)

Approvals:
  Milimetric: Looks good to me, approved



diff --git a/datasources/app-edit-funnel-ios.json 
b/datasources/app-edit-funnel-ios.json
index fb6baad..95f0b1d 100644
--- a/datasources/app-edit-funnel-ios.json
+++ b/datasources/app-edit-funnel-ios.json
@@ -1,7 +1,7 @@
 {
 "name": "App Edits - iOS (per day)",
 "timespan": {
-"start": "2014/06/25",
+"start": "2014/08/01",
 "step": "1d"
 },
 "url": 
"http://stat1001.wikimedia.org/limn-public-data/mobile/datafiles/app-edit-funnel-ios.csv";,
diff --git a/mobile/app-edit-funnel-android.sql 
b/mobile/app-edit-funnel-android.sql
index ef1984c..2fc7f5b 100644
--- a/mobile/app-edit-funnel-android.sql
+++ b/mobile/app-edit-funnel-android.sql
@@ -1,8 +1,8 @@
 -- derived from cancelled-uploads.sql
-SELECT  SUM( IF( event_action = 'start', 1, 0) ) AS start,
-SUM( IF( event_action = 'preview', 1, 0) ) AS preview,
-SUM( IF( event_action = 'saveAttempt', 1, 0) ) AS saveAttempt,
-SUM( IF( event_action = 'saved', 1, 0) ) AS saved
+SELECT  COALESCE( SUM( IF( event_action = 'start', 1, 0) ), 0 ) AS start,
+COALESCE( SUM( IF( event_action = 'preview', 1, 0) ), 0 ) AS 
preview,
+COALESCE( SUM( IF( event_action = 'saveAttempt', 1, 0) ), 0 ) AS 
saveAttempt,
+COALESCE( SUM( IF( event_action = 'saved', 1, 0) ), 0 ) AS saved
 
 FROM{{ tables.edits_app }}
 
diff --git a/mobile/app-edit-funnel-ios.sql b/mobile/app-edit-funnel-ios.sql
index a2c4d86..8d4e1b4 100644
--- a/mobile/app-edit-funnel-ios.sql
+++ b/mobile/app-edit-funnel-ios.sql
@@ -1,8 +1,8 @@
 -- derived from cancelled-uploads.sql
-SELECT  SUM( IF( event_action = 'start', 1, 0) ) AS start,
-SUM( IF( event_action = 'preview', 1, 0) ) AS preview,
-SUM( IF( event_action = 'saveAttempt', 1, 0) ) AS saveAttempt,
-SUM( IF( event_action = 'saved', 1, 0) ) AS saved
+SELECT  COALESCE( SUM( IF( event_action = 'start', 1, 0) ), 0 ) AS start,
+COALESCE( SUM( IF( event_action = 'preview', 1, 0) ), 0 ) AS 
preview,
+COALESCE( SUM( IF( event_action = 'saveAttempt', 1, 0) ), 0 ) AS 
saveAttempt,
+COALESCE( SUM( IF( event_action = 'saved', 1, 0) ), 0 ) AS saved
 
 FROM{{ tables.edits_app }}
 
diff --git a/mobile/app-edit-funnel-total.sql b/mobile/app-edit-funnel-total.sql
index 36de3f6..07fc52f 100644
--- a/mobile/app-edit-funnel-total.sql
+++ b/mobile/app-edit-funnel-total.sql
@@ -1,8 +1,8 @@
 -- derived from cancelled-uploads.sql
-SELECT  SUM( IF( event_action = 'start', 1, 0) ) AS start,
-SUM( IF( event_action = 'preview', 1, 0) ) AS preview,
-SUM( IF( event_action = 'saveAttempt', 1, 0) ) AS saveAttempt,
-SUM( IF( event_action = 'saved', 1, 0) ) AS saved
+SELECT  COALESCE( SUM( IF( event_action = 'start', 1, 0) ), 0 ) AS start,
+COALESCE( SUM( IF( event_action = 'preview', 1, 0) ), 0 ) AS 
preview,
+COALESCE( SUM( IF( event_action = 'saveAttempt', 1, 0) ), 0 ) AS 
saveAttempt,
+COALESCE( SUM( IF( event_action = 'saved', 1, 0) ), 0 ) AS saved
 
 FROM{{ tables.edits_app }}
 
diff --git a/mobile/config.yaml b/mobile/config.yaml
index 288f233..21f4c27 100644
--- a/mobile/config.yaml
+++ b/mobile/config.yaml
@@ -69,7 +69,7 @@
 title: App Edits - iOS (per day)
 frequency: hourly
 timeboxed: true
-starts: 2014-06-25
+starts: 2014-08-01
 app-edits-starts:
 title: Apps - Impressions on edit pencil (per day)
 frequency: hourly

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia08bcd7da281d455bbdd728b518b51eb3778d21f
Gerrit-PatchSet: 2
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stable IDs for NTCIR wmc1.02 - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: Stable IDs for NTCIR wmc1.02
..


Stable IDs for NTCIR wmc1.02

Use stable IDs for the second round of NTCIR-11
Math 2 Wikipedia Subtask round 2.

Change-Id: Ic1cfa6c35515f7acfc4c03c88710e531de77cd7f
---
M MathSearch.hooks.php
M SpecialMathSearch.php
2 files changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index 65a492f..d5053eb 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -54,6 +54,9 @@
}
}
 
+   private static function curId2OldId( $curId ){
+   return Title::newFromID( $curId )->getLatestRevID();
+   }
/**
 * Updates the formula index in the database
 *
@@ -64,7 +67,7 @@
 */
private static function updateIndex($pid, $eid, $inputHash, $tex){
try {
-   $oldID = Title::newFromID( $pid )->getLatestRevID();
+   $oldID = self::curId2OldId( $pid );
$dbr = wfGetDB( DB_SLAVE );
$exists = $dbr->selectRow( 'mathindex',
array( 'mathindex_page_id', 'mathindex_anchor', 
'mathindex_inputhash' ),
@@ -192,9 +195,10 @@
self::updateIndex( $pid, $eid, 
$Renderer->getInputHash(), $Renderer->getTex() );
}
if ( preg_match( '#[\w\.]+)"#', $Result, 
$matches ) ) {
-   $oldId = $matches['id'];
-   $newID = "math.$pid.$eid";
-   $Result = str_replace( $oldId, $newID, $Result );
+   $rendererId = $matches['id'];
+   $oldId = self::curId2OldId( $pid );
+   $newID = "math.${oldId}.${eid}";
+   $Result = str_replace( $rendererId, $newID, $Result );
}
return true;
}
diff --git a/SpecialMathSearch.php b/SpecialMathSearch.php
index a28eaa6..0ab2514 100644
--- a/SpecialMathSearch.php
+++ b/SpecialMathSearch.php
@@ -164,7 +164,6 @@
}
 
if ( $this->mathBackend && $this->textpattern == "" ) {
-   wfDebugLog( "MathSearch", "Starting output 
(notext mode)" );
$results = $this->mathBackend->getResultSet();
if ( $results ) {
foreach ( $results as $pageID => $page 
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1cfa6c35515f7acfc4c03c88710e531de77cd7f
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] QA: remove uploads tests from the Jenkins builds - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: QA: remove uploads tests from the Jenkins builds
..


QA: remove uploads tests from the Jenkins builds

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

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



diff --git a/tests/browser/features/special_uploads.feature 
b/tests/browser/features/special_uploads.feature
index 8a67bbb..3b9de2f 100644
--- a/tests/browser/features/special_uploads.feature
+++ b/tests/browser/features/special_uploads.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @login @test2.m.wikipedia.org @vagrant
+@chrome @login @vagrant
 Feature: Special:Uploads uploads
   Background:
 Given I am using the mobile site

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

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

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

[MediaWiki-commits] [Gerrit] Scrap unused Twemproxy config files - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Scrap unused Twemproxy config files
..


Scrap unused Twemproxy config files

* Upstream refers to itself inconsistently as Twemproxy or Nutcracker. We've
  standardized on Nutcracker.
* The Nutcracker configs are managed by Puppet, so get rid of the dupes in this
  repo.
* Don't keep the non-Nutcracker setup in a comment. Someone will inevitably
  forget to update it and it will become gradually more dangerous. For better
  or worse, we rely on Nutcracker now. Turning it off will require more than
  uncommenting a few lines.

Change-Id: I812c0bb6cc121d9df58a3eedb14e387507445ee6
---
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/mc.php
D wmf-config/twemproxy-eqiad.yaml
D wmf-config/twemproxy-labs.yaml
4 files changed, 1 insertion(+), 79 deletions(-)

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



diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index 2f627f8..25b1c75 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -39,8 +39,6 @@
squid-labs.php
session.php
session-labs.php
-   twemproxy-eqiad.yaml
-   twemproxy-labs.yaml
Wikibase.php
 )
 
diff --git a/wmf-config/mc.php b/wmf-config/mc.php
index 39644b3..94f1443 100644
--- a/wmf-config/mc.php
+++ b/wmf-config/mc.php
@@ -3,17 +3,8 @@
 $wgMainCacheType = 'memcached-pecl';
 
 $wgMemCachedPersistent = false;
-$wgMemCachedTimeout = 25; # default is 10
+$wgMemCachedTimeout = 0.25 * 1e6;  // 250kμs (a quarter of a second).
 
-# Newer "mc*" servers (only use the pecl client with these).
-# This does not use the "slot" system like the old setup, but
-# rather a consistent hash based on key and server addresses,
-# so the ordering of servers is not important. Additionally, the
-# number of servers can grow/shrink without *too* much disruption.
-
-# Use twemproxy for memcached access - see twemproxy-eqiad.yaml
-# NOTE: after deploying a new twemproxy.yaml config, run restart-twemproxy
-# from the deploy host to make it live.
 $wgObjectCaches['memcached-pecl'] = array(
'class'  => 'MemcachedPeclBagOStuff',
'serializer' => 'php',
@@ -22,30 +13,5 @@
'server_failure_limit' => 1e9,
'retry_timeout' => -1
 );
-
-/*** No Twemproxy
-   $wgObjectCaches['memcached-pecl'] = array(
-   'class'  => 'MemcachedPeclBagOStuff',
-   'serializer' => 'php',
-   'servers'=> array(
-   '10.64.0.180', # mc1001
-   '10.64.0.181', # mc1002
-   '10.64.0.182', # mc1003
-   '10.64.0.183', # mc1004
-   '10.64.0.184', # mc1005
-   '10.64.0.185', # mc1006
-   '10.64.0.186', # mc1007
-   '10.64.0.187', # mc1008
-   '10.64.0.188', # mc1009
-   '10.64.0.189', # mc1010
-   '10.64.0.190', # mc1011
-   '10.64.0.191', # mc1012
-   '10.64.0.192', # mc1013
-   '10.64.0.193', # mc1014
-   '10.64.0.194', # mc1015
-   '10.64.0.195', # mc1016
-   )
-   );
-***/
 
 # vim: set sts=4 sw=4 et :
diff --git a/wmf-config/twemproxy-eqiad.yaml b/wmf-config/twemproxy-eqiad.yaml
deleted file mode 100644
index 8a7f02a..000
--- a/wmf-config/twemproxy-eqiad.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-memcached:
-  listen: 127.0.0.1:11211
-  hash: md5
-  distribution: ketama
-  timeout: 250
-  preconnect: true
-  redis: false
-  auto_eject_hosts: true
-  server_retry_timeout: 3
-  server_failure_limit: 3
-  server_connections: 2
-  servers:
-   - 10.64.0.180:11211:1 # mc1001
-   - 10.64.0.181:11211:1 # mc1002
-   - 10.64.0.182:11211:1 # mc1003
-   - 10.64.0.183:11211:1 # mc1004
-   - 10.64.0.184:11211:1 # mc1005
-   - 10.64.0.185:11211:1 # mc1006
-   - 10.64.0.186:11211:1 # mc1007
-   - 10.64.0.187:11211:1 # mc1008
-   - 10.64.0.188:11211:1 # mc1009
-   - 10.64.0.189:11211:1 # mc1010
-   - 10.64.0.190:11211:1 # mc1011
-   - 10.64.0.191:11211:1 # mc1012
-   - 10.64.0.192:11211:1 # mc1013
-   - 10.64.0.193:11211:1 # mc1014
-   - 10.64.0.194:11211:1 # mc1015
-   - 10.64.0.195:11211:1 # mc1016
diff --git a/wmf-config/twemproxy-labs.yaml b/wmf-config/twemproxy-labs.yaml
deleted file mode 100644
index e9aef91..000
--- a/wmf-config/twemproxy-labs.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-memcached:
-  listen: 127.0.0.1:11211
-  hash: md5
-  distribution: ketama
-  timeout: 250
-  preconnect: true
-  redis: false
-  auto_eject_hosts: true
-  server_retry_timeout: 3
-  server_failure_limit: 3
-  server_connections: 2
-  servers:
-   - 10.68.16.14:11211:1 # deployment-memc02.eqiad.wmflabs
-   - 10.68.16.15:11211

[MediaWiki-commits] [Gerrit] Implement workItermCount for mass index job - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

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

Change subject: Implement workItermCount for mass index job
..


Implement workItermCount for mass index job

The mass index job deserves a useful workItemCount as well.  Other jobs
are either single work item or quite rare so they don't need it.

Also, fix name of LinksUpdateSecondaryTest.  It is already in the Job
namespace so no need for Job in the name.

Change-Id: I6e511e0bb96a3f29547a9d2de097b913d436f9cf
---
M includes/Job/MassIndex.php
R tests/unit/Job/LinksUpdateSecondaryTest.php
C tests/unit/Job/MassIndexTest.php
3 files changed, 13 insertions(+), 11 deletions(-)

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



diff --git a/includes/Job/MassIndex.php b/includes/Job/MassIndex.php
index ad782ae..445a182 100644
--- a/includes/Job/MassIndex.php
+++ b/includes/Job/MassIndex.php
@@ -56,4 +56,8 @@
$count = $updater->updatePages( $pageData, null, null, 
$this->params[ 'updateFlags' ] );
return $count >= 0;
}
+
+   public function workItemCount() {
+   return count( $this->params[ 'pageDBKeys' ] );
+   }
 }
diff --git a/tests/unit/Job/LinksUpdateSecondaryJobTest.php 
b/tests/unit/Job/LinksUpdateSecondaryTest.php
similarity index 95%
rename from tests/unit/Job/LinksUpdateSecondaryJobTest.php
rename to tests/unit/Job/LinksUpdateSecondaryTest.php
index f595f64..ca1375f 100644
--- a/tests/unit/Job/LinksUpdateSecondaryJobTest.php
+++ b/tests/unit/Job/LinksUpdateSecondaryTest.php
@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class LinksUpdateSecondaryJobTest extends MediaWikiTestCase {
+class LinksUpdateSecondaryTest extends MediaWikiTestCase {
/**
 * @dataProvider workItemCountTestCases
 */
diff --git a/tests/unit/Job/LinksUpdateSecondaryJobTest.php 
b/tests/unit/Job/MassIndexTest.php
similarity index 67%
copy from tests/unit/Job/LinksUpdateSecondaryJobTest.php
copy to tests/unit/Job/MassIndexTest.php
index f595f64..965f3cd 100644
--- a/tests/unit/Job/LinksUpdateSecondaryJobTest.php
+++ b/tests/unit/Job/MassIndexTest.php
@@ -6,7 +6,7 @@
 use \Title;
 
 /**
- * Test for LinksUpdateSecondary job.
+ * Test for MassIndex job.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,24 +23,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
-class LinksUpdateSecondaryJobTest extends MediaWikiTestCase {
+class MassIndexTest extends MediaWikiTestCase {
/**
 * @dataProvider workItemCountTestCases
 */
-   public function testWorkItemCount( $addedLinks, $removedLinks, 
$expected ) {
-   $job = new LinksUpdateSecondary( Title::newMainPage(), array(
-   'addedLinks' => $addedLinks,
-   'removedLinks' => $removedLinks,
+   public function testWorkItemCount( $pageDBKeys, $expected ) {
+   $job = new MassIndex( Title::newMainPage(), array(
+   'pageDBKeys' => $pageDBKeys,
) );
$this->assertEquals( $expected, $job->workItemCount() );
}
 
public static function workItemCountTestCases() {
return array(
-   array( array(), array(), 0 ),
-   array( array( 'Foo' ), array(), 1 ),
-   array( array(), array( 'Bar' ), 1 ),
-   array( array( 'Cat', 'Cow', 'Puppy' ), array( 'Lorax' 
), 4 ),
+   array( array(), 0 ),
+   array( array( 'Foo' ), 1 ),
+   array( array( 'Cat', 'Cow', 'Puppy' ), 3 ),
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e511e0bb96a3f29547a9d2de097b913d436f9cf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Ignore missing docstring in PEP257 - change (pywikibot/core)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Ignore missing docstring in PEP257
..

Ignore missing docstring in PEP257

For a while in order to reduce number of errors.
We'll get to them later

Change-Id: I2344b40eda4b437762c4ab48654b246c4db16ebe
---
M tox.ini
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/89/157289/1

diff --git a/tox.ini b/tox.ini
index 9fae601..e25feac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@
 deps = flake8
 
 [testenv:flake8-docstrings]
+ignore = D100,D101,D102,D103
 commands = flake8 --select=D {posargs}
 deps = flake8-docstrings
 

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

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

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

[MediaWiki-commits] [Gerrit] Coalesce the edit funnel SQL queries - change (analytics/limn-mobile-data)

[BearND (Code Review)]

BearND has uploaded a new change for review.

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

Change subject: Coalesce the edit funnel SQL queries
..

Coalesce the edit funnel SQL queries

so they don't blow up when there is no data.

Change-Id: Ia08bcd7da281d455bbdd728b518b51eb3778d21f
---
M mobile/app-edit-funnel-android.sql
M mobile/app-edit-funnel-ios.sql
M mobile/app-edit-funnel-total.sql
3 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data 
refs/changes/88/157288/1

diff --git a/mobile/app-edit-funnel-android.sql 
b/mobile/app-edit-funnel-android.sql
index ef1984c..2fc7f5b 100644
--- a/mobile/app-edit-funnel-android.sql
+++ b/mobile/app-edit-funnel-android.sql
@@ -1,8 +1,8 @@
 -- derived from cancelled-uploads.sql
-SELECT  SUM( IF( event_action = 'start', 1, 0) ) AS start,
-SUM( IF( event_action = 'preview', 1, 0) ) AS preview,
-SUM( IF( event_action = 'saveAttempt', 1, 0) ) AS saveAttempt,
-SUM( IF( event_action = 'saved', 1, 0) ) AS saved
+SELECT  COALESCE( SUM( IF( event_action = 'start', 1, 0) ), 0 ) AS start,
+COALESCE( SUM( IF( event_action = 'preview', 1, 0) ), 0 ) AS 
preview,
+COALESCE( SUM( IF( event_action = 'saveAttempt', 1, 0) ), 0 ) AS 
saveAttempt,
+COALESCE( SUM( IF( event_action = 'saved', 1, 0) ), 0 ) AS saved
 
 FROM{{ tables.edits_app }}
 
diff --git a/mobile/app-edit-funnel-ios.sql b/mobile/app-edit-funnel-ios.sql
index a2c4d86..8d4e1b4 100644
--- a/mobile/app-edit-funnel-ios.sql
+++ b/mobile/app-edit-funnel-ios.sql
@@ -1,8 +1,8 @@
 -- derived from cancelled-uploads.sql
-SELECT  SUM( IF( event_action = 'start', 1, 0) ) AS start,
-SUM( IF( event_action = 'preview', 1, 0) ) AS preview,
-SUM( IF( event_action = 'saveAttempt', 1, 0) ) AS saveAttempt,
-SUM( IF( event_action = 'saved', 1, 0) ) AS saved
+SELECT  COALESCE( SUM( IF( event_action = 'start', 1, 0) ), 0 ) AS start,
+COALESCE( SUM( IF( event_action = 'preview', 1, 0) ), 0 ) AS 
preview,
+COALESCE( SUM( IF( event_action = 'saveAttempt', 1, 0) ), 0 ) AS 
saveAttempt,
+COALESCE( SUM( IF( event_action = 'saved', 1, 0) ), 0 ) AS saved
 
 FROM{{ tables.edits_app }}
 
diff --git a/mobile/app-edit-funnel-total.sql b/mobile/app-edit-funnel-total.sql
index 36de3f6..07fc52f 100644
--- a/mobile/app-edit-funnel-total.sql
+++ b/mobile/app-edit-funnel-total.sql
@@ -1,8 +1,8 @@
 -- derived from cancelled-uploads.sql
-SELECT  SUM( IF( event_action = 'start', 1, 0) ) AS start,
-SUM( IF( event_action = 'preview', 1, 0) ) AS preview,
-SUM( IF( event_action = 'saveAttempt', 1, 0) ) AS saveAttempt,
-SUM( IF( event_action = 'saved', 1, 0) ) AS saved
+SELECT  COALESCE( SUM( IF( event_action = 'start', 1, 0) ), 0 ) AS start,
+COALESCE( SUM( IF( event_action = 'preview', 1, 0) ), 0 ) AS 
preview,
+COALESCE( SUM( IF( event_action = 'saveAttempt', 1, 0) ), 0 ) AS 
saveAttempt,
+COALESCE( SUM( IF( event_action = 'saved', 1, 0) ), 0 ) AS saved
 
 FROM{{ tables.edits_app }}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia08bcd7da281d455bbdd728b518b51eb3778d21f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] QA: remove uploads tests from the Jenkins builds - change (mediawiki...MobileFrontend)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

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

Change subject: QA: remove uploads tests from the Jenkins builds
..

QA: remove uploads tests from the Jenkins builds

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


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

diff --git a/tests/browser/features/special_uploads.feature 
b/tests/browser/features/special_uploads.feature
index 8a67bbb..3b9de2f 100644
--- a/tests/browser/features/special_uploads.feature
+++ b/tests/browser/features/special_uploads.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @login @test2.m.wikipedia.org @vagrant
+@chrome @login @vagrant
 Feature: Special:Uploads uploads
   Background:
 Given I am using the mobile site

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77181df7bb17b8d4dcb8fa2eb5cd4522ecd06489
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] Use staging instead of undo in annotation inspector - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Use staging instead of undo in annotation inspector
..


Use staging instead of undo in annotation inspector

Keeping track of possibly temporary transactions and undoing them
later is what transaction staging was designed for.

Rename and refactor flags for legibility.

Change-Id: I9a2b516a82213b6fd55e52485e40be482231fa2b
---
M src/ui/inspectors/ve.ui.AnnotationInspector.js
1 file changed, 31 insertions(+), 36 deletions(-)

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



diff --git a/src/ui/inspectors/ve.ui.AnnotationInspector.js 
b/src/ui/inspectors/ve.ui.AnnotationInspector.js
index 7cc08c6..7485b8b 100644
--- a/src/ui/inspectors/ve.ui.AnnotationInspector.js
+++ b/src/ui/inspectors/ve.ui.AnnotationInspector.js
@@ -24,7 +24,6 @@
this.initialSelection = null;
this.initialAnnotation = null;
this.initialAnnotationIsCovering = false;
-   this.appliedNewAnnotation = false;
 };
 
 /* Inheritance */
@@ -148,9 +147,11 @@
.next( function () {
var expandedFragment, trimmedFragment, 
initialCoveringAnnotation,
fragment = this.getFragment(),
+   surfaceModel = fragment.getSurface(),
annotation = this.getMatchingAnnotations( 
fragment, true ).get( 0 );
 
this.previousSelection = fragment.getRange();
+   surfaceModel.pushStaging();
 
// Initialize range
if ( !annotation ) {
@@ -171,7 +172,6 @@
annotation = 
this.getAnnotationFromFragment( fragment );
if ( annotation ) {
fragment.annotateContent( 
'set', annotation );
-   this.appliedNewAnnotation = 
true;
}
}
} else {
@@ -209,39 +209,39 @@
return 
ve.ui.AnnotationInspector.super.prototype.getTeardownProcess.call( this, data )
.first( function () {
var i, len, annotations, insertion,
-   add = false,
-   insert = false,
-   undo = false,
-   clear = false,
-   set = false,
+   insertionAnnotation = false,
+   insertText = false,
+   replace = false,
annotation = this.getAnnotation(),
remove = this.shouldRemoveAnnotation() || 
data.action === 'remove',
surfaceModel = this.getFragment().getSurface(),
fragment = surfaceModel.getFragment( 
this.initialSelection, false ),
selection = this.getFragment().getRange();
 
-   if ( this.initialSelection.isCollapsed() && !remove ) {
-   insert = true;
-   }
-   if ( remove ) {
-   clear = true;
-   } else if ( annotation ) {
-   // Check if the initial annotation has changed, 
or didn't cover the whole fragment
-   // to begin with
-   if (
-   !this.initialAnnotationIsCovering ||
-   !this.initialAnnotation ||
-   !this.initialAnnotation.compareTo( 
annotation )
-   ) {
-   set = true;
-   if ( this.appliedNewAnnotation ) {
-   undo = true;
-   } else {
-   clear = true;
+   if ( !remove ) {
+   if ( this.initialSelection.isCollapsed() ) {
+   insertText = true;
+   }
+   if ( annotation ) {
+   // Check if the initial annotation has 
changed, or didn't cover the whole fragment
+   // to begin with
+   if (
+   
!this.initialAnnotationIsCovering ||
+   !this.initialAnnotation ||
+   
!this.initialAnnotation.compareTo

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (8887a66cad) - change (VisualEditor/VisualEditor)

[Trevor Parscal (Code Review)]

Trevor Parscal has uploaded a new change for review.

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

Change subject: Update OOjs UI to v0.1.0-pre (8887a66cad)
..

Update OOjs UI to v0.1.0-pre (8887a66cad)

New changes:
8887a66 [BREAKING CHANGE] Element mixin refactor

Update changes:
* Update references to renamed classes

Change-Id: Iae79d4c41b5c2427365d854058b41f6e1b75bd94
---
M demos/ve/demo.css
A lib/oojs-ui/images/icons.less
A lib/oojs-ui/images/indicators.less
A lib/oojs-ui/images/raster.less
A lib/oojs-ui/images/textures.less
A lib/oojs-ui/images/vector.less
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-minerva.css
M lib/oojs-ui/oojs-ui-minerva.rtl.css
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.rtl.css
M lib/oojs-ui/oojs-ui.svg.css
M lib/oojs-ui/oojs-ui.svg.rtl.css
A lib/oojs-ui/themes/minerva/images/icons.less
A lib/oojs-ui/themes/minerva/images/vector.less
M src/ce/nodes/ve.ce.CommentNode.js
M src/ui/styles/inspectors/ve.ui.FragmentInspector.css
M src/ui/styles/widgets/ve.ui.ContextItemWidget.css
M src/ui/styles/widgets/ve.ui.LanguageInputWidget.css
M src/ui/styles/widgets/ve.ui.MediaSizeWidget.css
21 files changed, 663 insertions(+), 314 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/86/157286/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae79d4c41b5c2427365d854058b41f6e1b75bd94
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to 5858265dcf05b7511bd951608d14d62d... - change (mediawiki...VisualEditor)

[Trevor Parscal (Code Review)]

Trevor Parscal has uploaded a new change for review.

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

Change subject: Update VE core submodule to 
5858265dcf05b7511bd951608d14d62da6f112ee
..

Update VE core submodule to 5858265dcf05b7511bd951608d14d62da6f112ee

New changes:
29233b8 Localisation updates from https://translatewiki.net.
5858265 Update OOjs UI to v0.1.0-pre (8887a66cad)

Update changes:
* Update references to renamed classes

Change-Id: I330c0e308807597dec31dad8dbf713eb29fdc290
---
M lib/ve
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryItemWidget.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
9 files changed, 63 insertions(+), 63 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index d6d6db4..5858265 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit d6d6db4137285775f5089ab2cdfbc402fc0ead29
+Subproject commit 5858265dcf05b7511bd951608d14d62da6f112ee
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 4e6e446..6457d43 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -42,12 +42,12 @@
padding: 0.25em;
 }
 
-.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-buttonedElement-frameless 
{
+.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-buttonElement-frameless {
margin-right: 0.2em;
margin-top: 0.2em;
 }
 
-.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonedElement-framed {
+.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonElement-framed {
margin-left: 0.25em;
margin-right: 0.25em;
margin-top: 0.2em;
@@ -77,12 +77,12 @@
margin-top: 0.8em;
 }
 
-.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless {
+.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonElement-frameless {
display: block;
margin: 0.5em 0;
 }
 
-.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless:first-child {
+.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonElement-frameless:first-child {
margin-top: 0;
 }
 
diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 57d1219..057b57b 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -3,26 +3,26 @@
 
   include URL
   page_url 
URL.url("User:#{ENV['MEDIAWIKI_USER']}/#{ENV['BROWSER']}?vehidebetadialog=true&veaction=edit")
-  span(:bullet_number_selector, class: "oo-ui-iconedElement-icon 
oo-ui-icon-bullet-list")
+  span(:bullet_number_selector, class: "oo-ui-iconElement-icon 
oo-ui-icon-bullet-list")
   span(:cite_button, text: "Cite")
   div(:cite_select, css: "div.oo-ui-widget:nth-child(5) > div:nth-child(2)")
   a(:cite_book, css: ".oo-ui-tool-name-cite-book > a:nth-child(1)")
   a(:cite_journal, css: ".oo-ui-tool-name-cite-journal > a:nth-child(1)")
   a(:cite_news, css: ".oo-ui-tool-name-cite-news > a:nth-child(1)")
   span(:cite_website, css: ".oo-ui-icon-ref-cite-web")
-  div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled 
oo-ui-flaggableElement-constructive oo-ui-.oo-ui-buttonedElement-framed")
+  div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled 
oo-ui-flaggedElement-constructive oo-ui-.oo-ui-buttonElement-framed")
   div(:content, class: "ve-ce-branchNode")
-  span(:decrease_indentation, class: "oo-ui-iconedElement-icon 
oo-ui-icon-outdent-list")
-  span(:downarrow, class: "oo-ui-indicatedElement-indicator 
oo-ui-indicator-down")
+  span(:decrease_indentation, class: "oo-ui-iconElement-icon 
oo-ui-icon-outdent-list")
+  span(:downarrow, class: "oo-ui-indicatorElement-indicator 
oo-ui-indicator-down")
   a(:edit_ve, title: /Edit this page with VisualEditor/)
   a(:edit_wikitext, title: /You can edit this page\./)
   a(:heading, text: /Heading/)
   span(:hamburger_menu, css: "div.oo-ui-listToolGroup:nth-child(2) > 
span:nth-child(1) > span:nth-child(3)")
-  span(:increase_indentation, class: "oo-ui-iconedElement-icon 
oo-ui-icon-indent-list")
+  span(:increase_indentation, class: "oo-ui-iconElement-icon 
oo-ui-icon-indent-list")
   span(:insert_menu, class: "oo-ui-popupToolGroup-handle", index: 4)
   div(:insert_references, class: "oo-ui-processDialog-location")
   div(:ip_warning, cl

[MediaWiki-commits] [Gerrit] Fix WebInstaller style - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Fix WebInstaller style
..

Fix WebInstaller style

The WebInstaller don't use classes, so it broke after Vector skin changed
to use classes instead of ID's

See: Iae873906abcd8b2a986e5f728f0ce207256de770

Bug: 70190
Change-Id: Ia70498a0ee7c99d000790223c44feddce73a5416
---
M includes/installer/WebInstallerOutput.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/installer/WebInstallerOutput.php 
b/includes/installer/WebInstallerOutput.php
index f797ef9..c1562d7 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -271,7 +271,7 @@
  $this->getDir() ) ) . 
"\n"; ?>
 
 
-
+
 
 
 outputTitle(); ?>

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 14b23d7..29da2fc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 14b23d7..29da2fc
..


Syncronize VisualEditor: 14b23d7..29da2fc

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

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



diff --git a/VisualEditor b/VisualEditor
index 14b23d7..29da2fc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 14b23d7ba4241e5327a893d662c11b81a5b090e6
+Subproject commit 29da2fcee207dc693493458c01052891736c463b

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 14b23d7..29da2fc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 14b23d7..29da2fc
..

Syncronize VisualEditor: 14b23d7..29da2fc

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/83/157283/1

diff --git a/VisualEditor b/VisualEditor
index 14b23d7..29da2fc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 14b23d7ba4241e5327a893d662c11b81a5b090e6
+Subproject commit 29da2fcee207dc693493458c01052891736c463b

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (d6d6db4)

New changes:
378bc4c Polyfill Node.prototype.normalize in IE
d54cd30 Call onTargetInputChange when the link inspector is ready
00f7a00 Only undo if an initial annotation was applied
5d39686 Make filibuster code debug only
fdda60a Track selectionBefore in staging transactions

Change-Id: I2a70d599838b3575c5b0a63ffc60d023b04a8e80
---
M .docs/eg-iframe.html
M lib/ve
2 files changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 9a671f4..274b5b8 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -121,7 +121,6 @@



-   



diff --git a/lib/ve b/lib/ve
index be42edf..d6d6db4 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit be42edf8b19b7d6ca868e568a7d3171cd5547cc2
+Subproject commit d6d6db4137285775f5089ab2cdfbc402fc0ead29

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

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

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

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

[BearND (Code Review)]

BearND has uploaded a new change for review.

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

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: I86e57cfcdd65667cc1730f0a27fc82572a93f579
---
M wikipedia/ce.lproj/Localizable.strings
M wikipedia/de.lproj/Localizable.strings
M wikipedia/fa.lproj/Localizable.strings
M wikipedia/fa.lproj/Main_iPhone.strings
M wikipedia/fr.lproj/Localizable.strings
M wikipedia/mk.lproj/Localizable.strings
M wikipedia/nl.lproj/Localizable.strings
M wikipedia/pl.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
M wikipedia/ro.lproj/Localizable.strings
M wikipedia/ru.lproj/Localizable.strings
M wikipedia/zh-hans.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Localizable.strings
13 files changed, 209 insertions(+), 8 deletions(-)


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

diff --git a/wikipedia/ce.lproj/Localizable.strings 
b/wikipedia/ce.lproj/Localizable.strings
index 7f12e9c..ddc52af 100644
--- a/wikipedia/ce.lproj/Localizable.strings
+++ b/wikipedia/ce.lproj/Localizable.strings
@@ -46,7 +46,9 @@
 "main-menu-heading-zero" = "Wikipedia Zero";
 "main-menu-heading-legal" = "Цхьа гӀучӀа бу";
 "main-menu-show-today" = "Тахана";
+"main-menu-nearby" = "Уллехь";
 "saved-pages-title" = "Ӏалашйина агӀонаш";
+"saved-pages-clear-cancel" = "Цаоьшу";
 "page-history-title" = "АгӀона истори";
 "page-history-downloading" = "Историн агӀо гучуяккхар...";
 "navbar-title-mode-login" = "ЧугӀо";
@@ -89,3 +91,12 @@
 "menu-toc-accessibility-label" = "Чулацам";
 "menu-cancel-accessibility-label" = "Цаоьшу";
 "menu-share-accessibility-label" = "Екха";
+"menu-trash-accessibility-label" = "ДӀаяккха";
+"nearby-title" = "Уллехь";
+"nearby-distance-label-meters" = "$1 {{PLURAL:$1|метр}}";
+"nearby-distance-label-km" = "$1 км";
+"nearby-distance-label-feet" = "$1 {{PLURAL:$1|фут}}";
+"nearby-distance-label-miles" = "$1 миль";
+"nearby-pull-to-refresh-prompt" = "ТӀеоза, карлаяккха";
+"nearby-pull-to-refresh-is-refreshing" = "Карлаяккхар";
+"nearby-cancel" = "Цаоьшу";
diff --git a/wikipedia/de.lproj/Localizable.strings 
b/wikipedia/de.lproj/Localizable.strings
index acf1449..f6922a2 100644
--- a/wikipedia/de.lproj/Localizable.strings
+++ b/wikipedia/de.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "main-menu-heading-zero" = "Wikipedia Zero";
 "main-menu-heading-legal" = "Rechtliche Informationen";
 "main-menu-show-today" = "Heute";
+"main-menu-nearby" = "In der Nähe";
 "saved-pages-title" = "Gespeicherte Seiten";
 "saved-pages-clear-confirmation-heading" = "Alle gespeicherten Objekte 
löschen?";
 "saved-pages-clear-confirmation-sub-heading" = "Diese Aktion kann nicht 
rückgängig gemacht werden!";
@@ -190,3 +191,20 @@
 "menu-share-accessibility-label" = "Teilen";
 "menu-more-accessibility-label" = "Weitere Einstellungen";
 "menu-trash-accessibility-label" = "Löschen";
+"nearby-title" = "In der Nähe";
+"nearby-distance-label-meters" = "$1 Meter";
+"nearby-distance-label-km" = "$1 km";
+"nearby-distance-label-feet" = "$1 Fuß";
+"nearby-distance-label-miles" = "$1 Meilen";
+"nearby-pull-to-refresh-prompt" = "Zum Aktualisieren ziehen";
+"nearby-pull-to-refresh-is-refreshing" = "Aktualisiere";
+"nearby-loading" = "Lade Artikel in der Nähe …";
+"nearby-loaded" = "Artikel in der Nähe geladen";
+"nearby-none" = "Keine Artikel in der Nähe gefunden. Zum Aktualisieren ziehen 
oder später erneut versuchen.";
+"nearby-open-in-maps" = "In Maps öffnen";
+"nearby-cancel" = "Abbrechen";
+"nearby-location-updates-denied" = "Diese App hat keine Berechtigung, 
Standortsaktualisierungen zu erhalten.";
+"nearby-location-updates-enable" = "Um die Standortsaktualisierungen zu 
aktivieren, öffne die Einstellungs-App und wähle folgendes aus:";
+"nearby-location-updates-settings-menu" = "Datenschutz > Ortungsdienste > 
Wikipedia";
+"nearby-location-general-error" = "Standort konnte nicht bestimmt werden. Zum 
Aktualisieren ziehen oder später erneut versuchen.";
+"nearby-wifi" = "Das Aktivieren von Wi-Fi kann dabei helfen, den Standort 
deines Gerätes besser zu bestimmen.";
diff --git a/wikipedia/fa.lproj/Localizable.strings 
b/wikipedia/fa.lproj/Localizable.strings
index 09d5017..74c1427 100644
--- a/wikipedia/fa.lproj/Localizable.strings
+++ b/wikipedia/fa.lproj/Localizable.strings
@@ -103,6 +103,7 @@
 "main-menu-heading-zero" = "ویکی‌پدیای صفر";
 "main-menu-heading-legal" = "خرافات";
 "main-menu-show-today" = "امروز";
+"main-menu-nearby" = "در نزدیکی";
 "saved-pages-title" = "صفحات ذخیره شده";
 "saved-pages-clear-confirmation-heading" = "همه موارد ذخیره‌شده حذف شوند؟";
 "saved-pages-clear-confirmation-sub-heading" = "این عمل نمی‌تواند برگردانده 
شود!";
@@ -158,11 +159,34 @@
 "onboarding-login" = "ورود به سامانه";
 "onboarding-already-have-account" = "حساب کاربری دارید؟ $1.";
 "onboarding-skip" = "رها کردن";
+"onboarding-wikipedia" = "ویکی‌پدیا";
+"on

[MediaWiki-commits] [Gerrit] Use page properties to find if a category is hidden - change (pywikibot/core)

[Mpaa (Code Review)]

Mpaa has uploaded a new change for review.

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

Change subject: Use page properties to find if a category is hidden
..

Use page properties to find if a category is hidden

Bug 65149

Change-Id: I349559ee93fae1c6f8832581ed774da965740539
---
M pywikibot/page.py
M tests/page_tests.py
2 files changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/81/157281/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index e77b23e..7416807 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2127,12 +2127,7 @@
 
 def isHiddenCategory(self):
 """Return True if the category is hidden."""
-# FIXME
-# This should use action=query&list=allcategories
-# setting acfrom and acto to the category title and adding
-# acprop=hidden but currently fails  in some cases
-# (see bug 48824)
-return '__HIDDENCAT__' in self.expand_text()
+return u'hiddencat' in self.properties()
 
 def copyTo(self, cat, message):
 """
diff --git a/tests/page_tests.py b/tests/page_tests.py
index ebc37d6..f8ef989 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -400,6 +400,16 @@
 #def contributingUsers(self):
 
 
+class TestCategoryObject(PywikibotTestCase):
+
+def test_isHiddenCategory(self):
+site = pywikibot.Site('en', 'wikipedia')
+cat_hidden = pywikibot.Category(site, u'Category:Hidden categories')
+cat_not_hidden = pywikibot.Category(site, u'Category:Wikipedia 
categories')
+self.assertTrue(cat_hidden.isHiddenCategory())
+self.assertFalse(cat_not_hidden.isHiddenCategory())
+
+
 if __name__ == '__main__':
 try:
 unittest.main()

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

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

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

[MediaWiki-commits] [Gerrit] Readd CAPTCHA (ConfirmEdit extension) support - change (mediawiki...ContactPage)

[jenkins-bot (Code Review)]

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

Change subject: Readd CAPTCHA (ConfirmEdit extension) support
..


Readd CAPTCHA (ConfirmEdit extension) support

Bug: 66811
Change-Id: I46041c24fedc6643fc56f9f53cd59ea5803ebd85
---
M ContactPage_body.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 65 insertions(+), 21 deletions(-)

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



diff --git a/ContactPage_body.php b/ContactPage_body.php
index 02eb34b..5605723 100644
--- a/ContactPage_body.php
+++ b/ContactPage_body.php
@@ -182,6 +182,15 @@
);
}
 
+   if ( $this->useCaptcha() ) {
+   $formItems['Captcha'] = array(
+   'label-message' => 'captcha-label',
+   'type' => 'info',
+   'default' => $this->getCaptcha(),
+   'raw' => true,
+   );
+   }
+
$form = new HTMLForm( $formItems, $this->getContext(), 
"contactpage-{$this->formType}" );
$form->setWrapperLegendMsg( 'contactpage-legend' );
$form->setSubmitTextMsg( 'emailsend' );
@@ -214,7 +223,8 @@
 *  string: Error message to display
 */
public function processInput( $formData ) {
-   global $wgUserEmailUseReplyTo, $wgPasswordSender;
+   global $wgUserEmailUseReplyTo, $wgPasswordSender, $wgCaptcha;
+
$config = $this->getTypeConfig();
 
$request = $this->getRequest();
@@ -338,6 +348,10 @@
$text .= "{$name}: $value\n";
}
 
+   if ( $this->useCaptcha() && !$wgCaptcha->passCaptcha() ) {
+   return wfMessage( 'contactpage-captcha-error' 
)->plain();
+   }
+
// Stolen from Special:EmailUser
$error = '';
if ( !wfRunHooks( 'EmailUser', array( &$targetAddress, 
&$submitterAddress, &$subject, &$text, &$error ) ) ) {
@@ -391,4 +405,32 @@
private static function getYesOrNoMsg( $value ) {
return wfMessage( $value ? 'htmlform-yes' : 'htmlform-no' 
)->inContentLanguage()->text();
}
+
+   /**
+* @return boolean True if CAPTCHA should be used, false otherwise
+*/
+   private function useCaptcha() {
+   global $wgCaptchaClass, $wgCaptchaTriggers;
+
+   return $wgCaptchaClass &&
+   isset( $wgCaptchaTriggers['contactpage'] ) &&
+   $wgCaptchaTriggers['contactpage'] &&
+   !$this->getUser()->isAllowed( 'skipcaptcha' );
+   }
+
+   /**
+* @return string CAPTCHA form HTML
+*/
+   private function getCaptcha() {
+   // NOTE: make sure we have a session. May be required for 
CAPTCHAs to work.
+   wfSetupSession();
+
+   $captcha = ConfirmEditHooks::getInstance();
+   $captcha->trigger = 'contactpage';
+   $captcha->action = 'contact';
+
+   return '' .
+   $captcha->getForm() .
+   "\n";
+   }
 }
diff --git a/i18n/en.json b/i18n/en.json
index 7ab032c..e92938d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,21 +1,22 @@
 {
-"@metadata": {
-"authors": [
-"Daniel Kinzler",
-"Reedy"
-]
-},
-"contactpage": "Contact page",
-"contactpage-desc": "[[Special:Contact|Contact form for visitors]]",
-"contactpage-title": "Contact",
-"contactpage-pagetext": "Please use the form below to contact us.",
-"contactpage-legend": "Send email",
-"contactpage-defsubject": "Contact message",
-"contactpage-subject-and-sender": "$1 (from $2)",
-"contactpage-subject-and-sender-withip": "$1 (from $2 at $3)",
-"contactpage-fromname": "Your name:",
-"contactpage-fromaddress": "Your email address:",
-"contactpage-formfootnotes": "(needed if you want an answer)",
-"contactpage-includeip": "Include my IP address in this message.",
-"contactpage-usermailererror": "Mail object returned error:"
+   "@metadata": {
+   "authors": [
+   "Daniel Kinzler",
+   "Reedy"
+   ]
+   },
+   "contactpage": "Contact page",
+   "contactpage-desc": "[[Special:Contact|Contact form for visitors]]",
+   "contactpage-title": "Contact",
+   "contactpage-pagetext": "Please use the form below to contact us.",
+   "contactpage-legend": "Send email",
+   "contactpage-defsubject": "Contact message",
+   "contactpage-subject-and-sender": "$1 (from $2)",
+   "contactpage-subject-and-sender-withip": "$1 (from $2 at $3)",
+   "conta

[MediaWiki-commits] [Gerrit] Make sure mediawiki.notification is loaded -before- calling ... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Make sure mediawiki.notification is loaded -before- calling 
ViewPageTarget#checkForWikitextWarning
..


Make sure mediawiki.notification is loaded -before- calling 
ViewPageTarget#checkForWikitextWarning

That function needs to return the result immediately, not wait for module 
loading (via mw.notify).
This was breaking us being able to keep track of what wikitextWarning object 
was in use (but only
the first time we used the module), and therefore fail to close the warning 
when the wikitext
disappeared.

Bug: 70168
Change-Id: I0f1427423a5fe82ec8e70e2f0462a3044ca7ace8
---
M VisualEditor.php
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
4 files changed, 20 insertions(+), 17 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index c23119f..e6c88d4 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -289,7 +289,6 @@
'jquery.client',
'mediawiki.Uri',
'mediawiki.api',
-   'mediawiki.notify',
'mediawiki.Title',
'mediawiki.Uri',
'mediawiki.user',
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 abe8f6d..7f1f038 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -386,10 +386,12 @@
this.activating = false;
this.surface.getModel().connect( this, {
documentUpdate: function () {
-   this.wikitextWarning = 
ve.init.mw.ViewPageTarget.static.checkForWikitextWarning(
-   this.surface,
-   this.wikitextWarning
-   );
+   mw.loader.using( 'mediawiki.notification' ).then( 
function () {
+   this.wikitextWarning = 
ve.init.mw.ViewPageTarget.static.checkForWikitextWarning(
+   this.surface,
+   this.wikitextWarning
+   );
+   }.bind( this ) );
},
history: 'updateToolbarSaveButtonState'
} );
@@ -771,7 +773,7 @@
textMatches = text.match( /\[\[|\{\{|''|https://gerrit.wikimedia.org/r/157278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f1427423a5fe82ec8e70e2f0462a3044ca7ace8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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