date:20150423

[MediaWiki-commits] [Gerrit] Replace deprecated configuration variable $wgSpecialPageGroups - change (mediawiki...ApiSandbox)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated configuration variable $wgSpecialPageGroups
..


Replace deprecated configuration variable $wgSpecialPageGroups

With the getGroupName() method overridden for SpecialApiSandbox.

Change-Id: I9d25930fbce6342eea1ff4589380ba269a0a7f5f
---
M ApiSandbox.php
M SpecialApiSandbox.php
M extension.json
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/ApiSandbox.php b/ApiSandbox.php
index be7bf9f..8774c2e 100644
--- a/ApiSandbox.php
+++ b/ApiSandbox.php
@@ -22,7 +22,6 @@
 $wgAutoloadClasses['ApiSandboxHooks'] = __DIR__ . '/ApiSandbox.hooks.php';
 
 $wgSpecialPages['ApiSandbox'] = 'SpecialApiSandbox';
-$wgSpecialPageGroups['ApiSandbox'] = 'wiki';
 
 $wgResourceModules['ext.apiSandbox'] = array(
'scripts' => array(
diff --git a/SpecialApiSandbox.php b/SpecialApiSandbox.php
index 2ee8d63..e0ab433 100644
--- a/SpecialApiSandbox.php
+++ b/SpecialApiSandbox.php
@@ -13,6 +13,10 @@
parent::__construct( 'ApiSandbox' );
}
 
+   protected function getGroupName() {
+   return 'wiki';
+   }
+
/**
 * Main execution function
 * @param $par string|null Parameters passed to the page
diff --git a/extension.json b/extension.json
index 17d3457..c79f409 100644
--- a/extension.json
+++ b/extension.json
@@ -57,9 +57,6 @@
"localBasePath": "resources",
"remoteExtPath": "ApiSandbox/resources"
},
-   "SpecialPageGroups": {
-   "ApiSandbox": "wiki"
-   },
"SpecialPages": {
"ApiSandbox": "SpecialApiSandbox"
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d25930fbce6342eea1ff4589380ba269a0a7f5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
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 Makefile.py for zhtable - change (mediawiki/core)

2015-04-23 Thread Nikerabbit (Code Review)

Nikerabbit has submitted this change and it was merged.

Change subject: Improve Makefile.py for zhtable
..


Improve Makefile.py for zhtable

* Fix incorrect parsing of phrases with spaces in them by using tabs as
  separators only in *.manual
* Make the order of items in PHP array output more stable, so contribs
  from different people don't conflict with each other
* Include version number in file name of Unihan database, so existing
  old file doesn't prevent downloading of a newer version of Unihan

Change-Id: Ifb6b33b937a7b82218172e3fdd937bda4ea4cc6c
---
M includes/ZhConversion.php
M maintenance/language/zhtable/Makefile.py
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/toTrad.manual
M maintenance/language/zhtable/trad2simp.manual
7 files changed, 397 insertions(+), 396 deletions(-)

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



diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index b05c219..ba9f448 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -3000,10 +3000,10 @@
 '𫛢' => '鸋',
 '𫛶' => '鶒',
 '𫛸' => '鶗',
-'0出現' => '0出現',
 '0出现' => '0出現',
-'0出线' => '0出線',
+'0出現' => '0出現',
 '0出線' => '0出線',
+'0出线' => '0出線',
 '0只支持' => '0只支持',
 '0只支援' => '0只支援',
 '0周后' => '0周後',
@@ -3219,8 +3219,8 @@
 '不吊' => '不弔',
 '不卷' => '不捲',
 '不采' => '不採',
-'不斗膽' => '不斗膽',
 '不斗胆' => '不斗膽',
+'不斗膽' => '不斗膽',
 '不断发' => '不斷發',
 '不每只' => '不每只',
 '不谷' => '不穀',
@@ -3281,16 +3281,15 @@
 '丰南' => '丰南',
 '丰姿' => '丰姿',
 '丰容' => '丰容',
-'丰度' => '丰度',
 '丰情' => '丰情',
 '丰标' => '丰標',
-'丰標不凡' => '丰標不凡',
 '丰标不凡' => '丰標不凡',
+'丰標不凡' => '丰標不凡',
 '丰神' => '丰神',
 '丰茸' => '丰茸',
 '丰采' => '丰采',
-'丰韻' => '丰韻',
 '丰韵' => '丰韻',
+'丰韻' => '丰韻',
 '丹棱' => '丹稜',
 '主仆' => '主僕',
 '主干' => '主幹',
@@ -3328,12 +3327,10 @@
 '九扎' => '九紮',
 '九只' => '九隻',
 '九余' => '九餘',
-'干上' => '乾上',
 '干干' => '乾乾',
 '干干净净' => '乾乾淨淨',
-'干了' => '乾了',
 '干井' => '乾井',
-'干个' => '乾個',
+'干个够' => '乾個夠',
 '干儿' => '乾兒',
 '干冰' => '乾冰',
 '干冷' => '乾冷',
@@ -3368,7 +3365,6 @@
 '干巴' => '乾巴',
 '干式' => '乾式',
 '干弟' => '乾弟',
-'干得' => '乾得',
 '干急' => '乾急',
 '干性' => '乾性',
 '干打雷' => '乾打雷',
@@ -3500,8 +3496,8 @@
 '二缶钟惑' => '二缶鐘惑',
 '二老板' => '二老板',
 '二虎相斗' => '二虎相鬥',
-'二里頭' => '二里頭',
 '二里头' => '二里頭',
+'二里頭' => '二里頭',
 '二只' => '二隻',
 '二余' => '二餘',
 '于丹' => '于丹',
@@ -3510,13 +3506,13 @@
 '于仲文' => '于仲文',
 '于佳卉' => '于佳卉',
 '于来山' => '于來山',
-'于偉國' => '于偉國',
 '于伟国' => '于偉國',
+'于偉國' => '于偉國',
 '于光新' => '于光新',
 '于光远' => '于光遠',
 '于光遠' => '于光遠',
-'于克-蘭多縣' => '于克-蘭多縣',
 '于克-兰多县' => '于克-蘭多縣',
+'于克-蘭多縣' => '于克-蘭多縣',
 '于克勒' => '于克勒',
 '于再清' => '于再清',
 '于冕' => '于冕',
@@ -3527,18 +3523,18 @@
 '于化虎' => '于化虎',
 '于占元' => '于占元',
 '于友泽' => '于友澤',
-'于台煙' => '于台煙',
 '于台烟' => '于台煙',
+'于台煙' => '于台煙',
 '于右任' => '于右任',
 '于吉' => '于吉',
 '于和伟' => '于和偉',
 '于品海' => '于品海',
 '于国桢' => '于國楨',
 '于國楨' => '于國楨',
-'于國治' => '于國治',
 '于国治' => '于國治',
-'于堅' => '于堅',
+'于國治' => '于國治',
 '于坚' => '于堅',
+'于堅' => '于堅',
 '于大宝' => '于大寶',
 '于大寶' => '于大寶',
 '于天仁' => '于天仁',
@@ -3550,8 +3546,8 @@
 '于娟' => '于娟',
 '于子千' => '于子千',
 '于孔兼' => '于孔兼',
-'于學忠' => '于學忠',
 '于学忠' => '于學忠',
+'于學忠' => '于學忠',
 '于家堡' => '于家堡',
 '于寘' => '于寘',
 '于宝轩' => '于寶軒',
@@ -3561,10 +3557,10 @@
 '于小惠' => '于小惠',
 '于少保' => '于少保',
 '于山' => '于山',
-'于山國' => '于山國',
 '于山国' => '于山國',
-'于帥' => '于帥',
+'于山國' => '于山國',
 '于帅' => '于帥',
+'于帥' => '于帥',
 '于幼军' => '于幼軍',
 '于幼軍' => '于幼軍',
 '于康震' => '于康震',
@@ -3580,16 +3576,16 @@
 '于思' => '于思',
 '于慎行' => '于慎行',
 '于慧' => '于慧',
-'于成龙' => '于成龍',
 '于成龍' => '于成龍',
+'于成龙' => '于成龍',
 '于振' => '于振',
 '于振武' => '于振武',
 '于敏' => '于敏',
 '于敏中' => '于敏中',
 '于斌' => '于斌',
 '于斯塔德' => '于斯塔德',
-'于斯纳尔斯贝里' => '于斯納爾斯貝里',
 '于斯納爾斯貝里' => '于斯納爾斯貝里',
+'于斯纳尔斯贝里' => '于斯納爾斯貝里',
 '于斯达尔' => '于斯達爾',
 '于斯達爾' => '于斯達爾',
 '于明涛' => '于明濤',
@@ -3597,8 +3593,8 @@
 '于是之' => '于是之',
 '于晨楠' => '于晨楠',
 '于晴' => '于晴',
-'于會泳' => '于會泳',
 '于会泳' => '于會泳',
+'于會泳' => '于會泳',
 '于根伟' => '于根偉',
 '于根偉' => '于根偉',
 '于格' => '于格',
@@ -3606,8 +3602,8 @@
 '于楓' => '于楓',
 '于荣光' => '于榮光',
 '于樂' => '于樂',
-'于樹潔' => '于樹潔',
 '于树洁' => '于樹潔',
+'于樹潔' => '于樹潔',
 '于欣' => '于欣',
 '于欣源' => '于欣源',
 '于正昇' => '于正昇',
@@ -3618,25 +3614,25 @@
 '于江震' => '于江震',
 '于波' => '于波',
 '于洋' => '于洋',
-'于洪區' => '于洪區',
 '于洪区' => '于洪區',
+'于洪區' => '于洪區',
 '于浩威' => '于浩威',
 '于海' => '于海',
 '于海洋' => '于海洋',
 '于湘兰' => '于湘蘭',
 '于湘蘭' => '于湘蘭',
-'于漢超' => '于漢超',
 '于汉超' => '于漢超',
+'于漢超' => '于漢超',
 '于澄' => '于澄',
-'于澤爾' => '于澤爾',
 '于泽尔' => '于澤爾',
-'于濤' => '于濤',
+'于澤爾' => '于澤爾',
 '于涛' => '于濤',
+'于濤' => '于濤',
 '于熙珍' => '于熙珍',
 '于尔岑' => '于爾岑',
 '于爾岑' => '于爾岑',
-'于爾根' => '于爾根',
 '于尔根' => '于爾根',
+'于爾根' => '于爾根',
 '于尔里克' => '于爾里克',
 '于爾里克' => '于爾里克',
 '于特森' => '于特森',
@@ -3656,8 +3652,8 @@
 '于謙' => '于謙',
 '于谦' => '于謙',
 '于谨' => '于謹',
-'于贝尔' => '于貝爾',
 '于貝爾' => '于貝爾',
+'于贝尔' => '于貝爾',
 '于贈' => '于贈',
 '于赠' => '于贈',
 '于越' => '于越',
@@ -3666,8 +3662,8 @@
 '于道泉' => '于道泉',
 '于远伟' => '于遠偉',
 '于遠偉

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

2015-04-23 Thread Eranroz (Code Review)

Eranroz has uploaded a new change for review.

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

Change subject: Fix UnboundLocalError
..

Fix UnboundLocalError

In python3 there may be UnboundLocalError in case of exception during save

Change-Id: I8ae74d00b63bc20b2eed511687a4feb3bc2e58ca
---
M pywikibot/page.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/56/206356/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index e089fc2..6e45c69 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1057,7 +1057,8 @@
 else:
 pywikibot.output(u"Page %s saved" % link)
 # TODO: other "expected" error types to catch?
-except pywikibot.Error as err:
+except pywikibot.Error as edit_err:
+err = edit_err
 pywikibot.log(u"Error saving page %s (%s)\n" % (link, err),
   exc_info=True)
 if not callback and not async:

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

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

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

[MediaWiki-commits] [Gerrit] Fix xml dump gen to use textlib correctly - change (pywikibot/core)

2015-04-23 Thread Eranroz (Code Review)

Eranroz has uploaded a new change for review.

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

Change subject: Fix xml dump gen to use textlib correctly
..

Fix xml dump gen to use textlib correctly

Addressing the following issues:
* sending correct parameters to replaceExcept in
  the correct order (e.g site)
* using the exceptions of the replacement to avoid generation of
  non putative replacements

Change-Id: I5262878d096dd0b25dc22d77337aa5e351e0cbda
---
M scripts/replace.py
1 file changed, 16 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/55/206355/1

diff --git a/scripts/replace.py b/scripts/replace.py
index 19a7855..f78ba77 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -343,23 +343,28 @@
 
 def __iter__(self):
 """Iterator method."""
+def get_exceptions(exceptions):
+return exceptions.get('inside-tags', []) + 
exceptions.get('inside', [])
 try:
 for entry in self.parser:
 if self.skipping:
 if entry.title != self.xmlStart:
 continue
 self.skipping = False
-if not self.isTitleExcepted(entry.title) \
-and not self.isTextExcepted(entry.text):
-new_text = entry.text
-for replacement in self.replacements:
-# This doesn't do an actual replacement but just
-# checks if at least one does apply
-new_text = textlib.replaceExcept(
-new_text, replacement.old_regex, replacement.new,
-self.excsInside, self.site)
-if new_text != entry.text:
-yield pywikibot.Page(self.site, entry.title)
+if self.isTitleExcepted(entry.title) \
+or self.isTextExcepted(entry.text):
+continue
+new_text = entry.text
+for replacement in self.replacements:
+# This doesn't do an actual replacement but just
+# checks if at least one does apply
+new_text = textlib.replaceExcept(
+new_text, replacement.old_regex, replacement.new,
+self.excsInside + 
get_exceptions(replacement.exceptions or {}),
+site=self.site)
+if new_text != entry.text:
+yield pywikibot.Page(self.site, entry.title)
+
 except KeyboardInterrupt:
 try:
 if not self.skipping:

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

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

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

[MediaWiki-commits] [Gerrit] temporarily block Special:Export - change (operations/puppet)

2015-04-23 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: temporarily block Special:Export
..

temporarily block Special:Export

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


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

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index b0815c5..a07e28d 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -121,6 +121,10 @@
 
call evaluate_cookie;
 
+   if (req.url ~ /Special:Export/) {
+   error 403 "Debugging Issues"
+   }
+
return (lookup);
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] CXStats: Reduce the cellpadding to compact the table - change (mediawiki...ContentTranslation)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: CXStats: Reduce the cellpadding to compact the table
..


CXStats: Reduce the cellpadding to compact the table

The stats table is getting bigger. Trying to reduce its size

Change-Id: I3b258ee814b6b95b89359707b6a648577a2c7667
---
M modules/stats/styles/ext.cx.stats.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/stats/styles/ext.cx.stats.less 
b/modules/stats/styles/ext.cx.stats.less
index 654fe0d..99e818c 100644
--- a/modules/stats/styles/ext.cx.stats.less
+++ b/modules/stats/styles/ext.cx.stats.less
@@ -3,7 +3,7 @@
border: 1px solid black;
tr, td {
font-size: smaller;
-   padding: 5px;
+   padding: 2px;
border: 1px solid #ddd;
text-align: center;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b258ee814b6b95b89359707b6a648577a2c7667
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] CXStats: Reduce the cellpadding to compact the table - change (mediawiki...ContentTranslation)

2015-04-23 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: CXStats: Reduce the cellpadding to compact the table
..

CXStats: Reduce the cellpadding to compact the table

The stats table is getting bigger. Trying to reduce its size

Change-Id: I3b258ee814b6b95b89359707b6a648577a2c7667
---
M modules/stats/styles/ext.cx.stats.less
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/stats/styles/ext.cx.stats.less 
b/modules/stats/styles/ext.cx.stats.less
index 654fe0d..99e818c 100644
--- a/modules/stats/styles/ext.cx.stats.less
+++ b/modules/stats/styles/ext.cx.stats.less
@@ -3,7 +3,7 @@
border: 1px solid black;
tr, td {
font-size: smaller;
-   padding: 5px;
+   padding: 2px;
border: 1px solid #ddd;
text-align: center;
}

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

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

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

[MediaWiki-commits] [Gerrit] The title can be null for internal API requests. - change (mediawiki...WikimediaEvents)

2015-04-23 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: The title can be null for internal API requests.
..

The title can be null for internal API requests.

See also https://phabricator.wikimedia.org/T92875#1233108
re external API requests.

Fixes T97104

Bug: T97104
Bug: T92875
Change-Id: Iea401983ed7e5202cccb4b9c0bc18b2803d1f386
---
M WikimediaEventsHooks.php
1 file changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 5d02356..e777996 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -40,10 +40,12 @@
 */
public static function onXAnalyticsHeader( $out, &$headerItems ) {
$title = $out->getTitle();
-   $pageId = $title->getArticleId();
-   if ( is_int( $pageId ) && $pageId > 0 ) {
-   $headerItems['page_id'] = $pageId;
-   $headerItems['ns'] = $title->getNamespace();
+   if ( $title !== null ) {
+   $pageId = $title->getArticleId();
+   if ( is_int( $pageId ) && $pageId > 0 ) {
+   $headerItems['page_id'] = $pageId;
+   $headerItems['ns'] = $title->getNamespace();
+   }
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea401983ed7e5202cccb4b9c0bc18b2803d1f386
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Handle 204s consistently across Varnish roles - change (operations/puppet)

2015-04-23 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Handle 204s consistently across Varnish roles
..

Handle 204s consistently across Varnish roles

Handle requests to beacon endpoints (/event.gif, /statsv, /beacon) with an HTTP
204 across all Varnish roles, not just bits.

Change-Id: Ie6258f74fdd9c8e107b977581f41eaeb9e9d0b61
Task: T95448
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 20 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/206351/1

diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 827b3ab..926dc4e 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -297,6 +297,22 @@
error 200 "OK"; 
}
 
+if (req.url ~ "^/(event\.gif|beacon\/[^/?]+|statsv[/?])") {
+// Logging beacon endpoints
+//
+// They are handled by log tailers (varnishkafka and 
varnishncsa) that filter the
+// Varnish shm log for reqs to these endpoints and forward 
them to log processors
+// for storage and analysis.
+//
+// * /event.gif is used by EventLogging (owner: analytics)
+// * /statsv is used by MediaWiki for statsd-like performance 
metrics (owner: Ori)
+// * /beacon/ is used by all other applications.
+//
+// If you need a custom endpoint, don't modify this regex. 
Tack on a path component
+// to /beacon to claim a namespace instead -- e.g.: 
/beacon/images?...
+error 204;
+}
+
/* Function vcl_recv in <%= @vcl %>.inc.vcl will be appended here */
 }
 
@@ -387,8 +403,11 @@
return(restart);
}
 <% end -%>
-   if (obj.status == 204 && req.request == "PURGE") {
+   if (obj.status == 204) {
set obj.http.Connection = "keep-alive";
+   if (req.request != "PURGE") {
+   return (deliver);  // 204 responses shouldn't contain a 
body
+   }
}
/* Function vcl_error in <%= @vcl %>.inc.vcl will be appended here */
 }

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

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

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

[MediaWiki-commits] [Gerrit] Add XAnalytics MediaWiki extension and make WikimediaEvents ... - change (mediawiki/vagrant)

2015-04-23 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Add XAnalytics MediaWiki extension and make WikimediaEvents 
require it
..

Add XAnalytics MediaWiki extension and make WikimediaEvents require it

Change-Id: I7904afbe8f67dfce7678a328ac05d9f0e9db3fa1
---
M puppet/modules/role/manifests/wikimediaevents.pp
A puppet/modules/role/manifests/xanalytics.pp
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/50/206350/1

diff --git a/puppet/modules/role/manifests/wikimediaevents.pp 
b/puppet/modules/role/manifests/wikimediaevents.pp
index 349c559..86d17d8 100644
--- a/puppet/modules/role/manifests/wikimediaevents.pp
+++ b/puppet/modules/role/manifests/wikimediaevents.pp
@@ -3,6 +3,7 @@
 # EventLogging to log certain events.
 class role::wikimediaevents {
 include ::role::eventlogging
+include ::role::xanalytics
 
 mediawiki::extension { 'WikimediaEvents': }
 }
diff --git a/puppet/modules/role/manifests/xanalytics.pp 
b/puppet/modules/role/manifests/xanalytics.pp
new file mode 100644
index 000..47d0537
--- /dev/null
+++ b/puppet/modules/role/manifests/xanalytics.pp
@@ -0,0 +1,6 @@
+# == Class: role::xanalytics
+# Configures XAnalytics, a MediaWiki extension for
+# sending the X-Analytics header
+class role::xanalytics {
+mediawiki::extension { 'XAnalytics': }
+}

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

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

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

[MediaWiki-commits] [Gerrit] Fix for lock edit pencil showing alert twice. - change (apps...wikipedia)

2015-04-23 Thread Mhurd (Code Review)

Mhurd has uploaded a new change for review.

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

Change subject: Fix for lock edit pencil showing alert twice.
..

Fix for lock edit pencil showing alert twice.

T96822

Change-Id: Idd157331df387c4b91356147ac13e9ede7569192
---
M Wikipedia/assets/bundle.js
M www/js/bridge.js
2 files changed, 22 insertions(+), 18 deletions(-)


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

diff --git a/Wikipedia/assets/bundle.js b/Wikipedia/assets/bundle.js
index 4a429d4..71a91bd 100644
--- a/Wikipedia/assets/bundle.js
+++ b/Wikipedia/assets/bundle.js
@@ -24,16 +24,18 @@
 };
 
 Bridge.prototype.sendMessage = function( messageType, payload ) {
-var messagePack = { type: messageType, payload: payload };
-var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify( 
messagePack ) );
+setTimeout(function() { // See: https://phabricator.wikimedia.org/T96822 
and http://stackoverflow.com/a/9782220/135557
+var messagePack = { type: messageType, payload: payload };
+var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify( 
messagePack ) );
 
-// quick iframe version based on http://stackoverflow.com/a/6508343/82439
-// fixme can this be an XHR instead? check Cordova current state
-var iframe = document.createElement('iframe');
-iframe.setAttribute("src", url);
-document.documentElement.appendChild(iframe);
-iframe.parentNode.removeChild(iframe);
-iframe = null;
+// quick iframe version based on 
http://stackoverflow.com/a/6508343/82439
+// fixme can this be an XHR instead? check Cordova current state
+var iframe = document.createElement('iframe');
+iframe.setAttribute("src", url);
+document.documentElement.appendChild(iframe);
+iframe.parentNode.removeChild(iframe);
+iframe = null;
+}, 0);
 };
 
 module.exports = new Bridge();
diff --git a/www/js/bridge.js b/www/js/bridge.js
index 646d2a9..e0c44b4 100644
--- a/www/js/bridge.js
+++ b/www/js/bridge.js
@@ -23,16 +23,18 @@
 };
 
 Bridge.prototype.sendMessage = function( messageType, payload ) {
-var messagePack = { type: messageType, payload: payload };
-var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify( 
messagePack ) );
+setTimeout(function() { // See: https://phabricator.wikimedia.org/T96822 
and http://stackoverflow.com/a/9782220/135557
+var messagePack = { type: messageType, payload: payload };
+var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify( 
messagePack ) );
 
-// quick iframe version based on http://stackoverflow.com/a/6508343/82439
-// fixme can this be an XHR instead? check Cordova current state
-var iframe = document.createElement('iframe');
-iframe.setAttribute("src", url);
-document.documentElement.appendChild(iframe);
-iframe.parentNode.removeChild(iframe);
-iframe = null;
+// quick iframe version based on 
http://stackoverflow.com/a/6508343/82439
+// fixme can this be an XHR instead? check Cordova current state
+var iframe = document.createElement('iframe');
+iframe.setAttribute("src", url);
+document.documentElement.appendChild(iframe);
+iframe.parentNode.removeChild(iframe);
+iframe = null;
+}, 0);
 };
 
 module.exports = new Bridge();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd157331df387c4b91356147ac13e9ede7569192
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd 

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

[MediaWiki-commits] [Gerrit] varnish: implement 'do_gzip' cluster option for mobile/text ... - change (operations/puppet)

2015-04-23 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: varnish: implement 'do_gzip' cluster option for mobile/text 
frontend, too
..

varnish: implement 'do_gzip' cluster option for mobile/text frontend, too

In anticipation of the dissolution of bits and the serving of text and static
assets from the same hostnames, add the 'do_gzip' cluster option for mobile and
text frontend Varnish roles. To minimize risk, the options are set to false,
leaving the enabling of the setting to a follow-up patch.

Change-Id: Iff604294795216f063119ce23f0ad7e58bd2a951
---
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
4 files changed, 18 insertions(+), 1 deletion(-)


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

diff --git a/modules/role/manifests/cache/mobile.pp 
b/modules/role/manifests/cache/mobile.pp
index b0c0fe5..c24afa0 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -47,7 +47,10 @@
 include varnish::monitoring::ganglia::vhtcpd
 }
 
-$cluster_options = { 'enable_geoiplookup' => true }
+$cluster_options = {
+'enable_geoiplookup' => true,
+'do_gzip'=> false,
+}
 
 class { 'varnish::zero_update':
 site => $zero_site,
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index 25743dd..fde8418 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -123,6 +123,7 @@
 ]),
 cluster_options => {
 'enable_geoiplookup' => true,
+'do_gzip'=> false,
 },
 }
 
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb 
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 14c639f..c2d20d0 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -123,6 +123,13 @@
return (hit_for_pass);
}
 
+<% if @cluster_options.fetch("do_gzip", false) -%>
+   // Compress ico and SVG files
+   if (beresp.http.content-type ~ "^image/(x-icon|svg\+xml)$") {
+   set beresp.do_gzip = true;
+   }
+<% end -%>
+
return (deliver);
 }
 
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 63afd11..6233c49 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -130,6 +130,12 @@
set beresp.ttl = 120s;
return (hit_for_pass);
}
+<% if @cluster_options.fetch("do_gzip", false) -%>
+   // Compress ico and SVG files
+   if (beresp.http.content-type ~ "^image/(x-icon|svg\+xml)$") {
+   set beresp.do_gzip = true;
+   }
+<% end -%>
 
return (deliver);
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff604294795216f063119ce23f0ad7e58bd2a951
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] Don't normalize the path for requests to restbase - change (operations/puppet)

2015-04-23 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Don't normalize the path for requests to restbase
..


Don't normalize the path for requests to restbase

RESTBase uses a path-based layout, in which path components can contain
special characters including slashes. The normalize_path method decodes those,
which breaks requests to RESTBase where components contain %2f.

This patch addresses this issue by disabling the call to normalize_path for
requests matching ^/api/rest_v1/.

Change-Id: I4c5a85f565e8d354a95bdc0f01ef65fc88cb3999
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 689ec15..b0815c5 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -90,7 +90,12 @@
unset req.http.Range;
 
call rewrite_proxy_urls;
-   call normalize_path;
+
+   // Don't decode percent-encoded slashes in paths for REST APIs
+   if (req.url !~ "^/api/rest_v1/") {
+   call normalize_path;
+   }
+
call mobile_redirect;
 
if (req.http.host ~ "^test\.") {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c5a85f565e8d354a95bdc0f01ef65fc88cb3999
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke 
Gerrit-Reviewer: BBlack 
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 MERGE] TEST COMMIT - change (mediawiki/core)

2015-04-23 Thread Parent5446 (Code Review)

Parent5446 has uploaded a new change for review.

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

Change subject: [DO NOT MERGE] TEST COMMIT
..

[DO NOT MERGE] TEST COMMIT

Change-Id: I4e66553f4842fd6662166ed56c1fc16531220c01
---
M api.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/api.php b/api.php
index ea2f60a..42900f9 100644
--- a/api.php
+++ b/api.php
@@ -1,4 +1,5 @@
 https://gerrit.wikimedia.org/r/206347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Add column raw_id_or_name to wiki_user - change (analytics/wikimetrics)

2015-04-23 Thread Madhuvishy (Code Review)

Madhuvishy has uploaded a new change for review.

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

Change subject: Add column raw_id_or_name to wiki_user
..

Add column raw_id_or_name to wiki_user

Bug: T78339
Change-Id: Ia5a3a0bfec6bdb09502dc8237c538325b2ee0573
---
A 
database_migrations/versions/35adbe20f3d_add_column_raw_id_or_name_to_wiki_user.py
M wikimetrics/models/storage/wikiuser.py
2 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics 
refs/changes/46/206346/1

diff --git 
a/database_migrations/versions/35adbe20f3d_add_column_raw_id_or_name_to_wiki_user.py
 
b/database_migrations/versions/35adbe20f3d_add_column_raw_id_or_name_to_wiki_user.py
new file mode 100644
index 000..e150c4d
--- /dev/null
+++ 
b/database_migrations/versions/35adbe20f3d_add_column_raw_id_or_name_to_wiki_user.py
@@ -0,0 +1,26 @@
+"""Add column raw_id_or_name to wiki_user
+
+Revision ID: 35adbe20f3d
+Revises: 483df9b9a389
+Create Date: 2015-04-24 01:17:39.039813
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '35adbe20f3d'
+down_revision = '483df9b9a389'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+### commands auto generated by Alembic - please adjust! ###
+op.add_column('wiki_user', sa.Column('raw_id_or_name', 
sa.String(length=255), nullable=True))
+### end Alembic commands ###
+
+
+def downgrade():
+### commands auto generated by Alembic - please adjust! ###
+op.drop_column('wiki_user', 'raw_id_or_name')
+### end Alembic commands ###
diff --git a/wikimetrics/models/storage/wikiuser.py 
b/wikimetrics/models/storage/wikiuser.py
index 828c1d5..7e87d82 100644
--- a/wikimetrics/models/storage/wikiuser.py
+++ b/wikimetrics/models/storage/wikiuser.py
@@ -14,6 +14,7 @@
 __tablename__ = 'wiki_user'
 
 id  = Column(Integer, primary_key=True)
+raw_id_or_name  = Column(String(255))
 mediawiki_username  = Column(String(255))
 mediawiki_userid= Column(Integer)
 project = Column(String(45))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5a3a0bfec6bdb09502dc8237c538325b2ee0573
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Madhuvishy 

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

[MediaWiki-commits] [Gerrit] Don't normalize the path for requests to restbase - change (operations/puppet)

2015-04-23 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Don't normalize the path for requests to restbase
..

Don't normalize the path for requests to restbase

RESTBase uses a path-based layout, in which path components can contain
special characters including slashes. The normalize_path method decodes those,
which breaks requests to RESTBase where components contain %2f.

This patch addresses this issue by disabling the call to normalize_path for
requests matching ^/api/rest_v1/.

Change-Id: I4c5a85f565e8d354a95bdc0f01ef65fc88cb3999
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/206345/1

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 689ec15..6eb6703 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -90,7 +90,11 @@
unset req.http.Range;
 
call rewrite_proxy_urls;
-   call normalize_path;
+   
+   if (req.url !~ "^/api/rest_v1/") {
+   call normalize_path;
+   }
+
call mobile_redirect;
 
if (req.http.host ~ "^test\.") {

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

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

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

[MediaWiki-commits] [Gerrit] Fix up a[rel=mw:ExtLink] to have class="external" and rel="n... - change (mediawiki...Flow)

2015-04-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Fix up a[rel=mw:ExtLink] to have class="external" and 
rel="nofollow"
..

Fix up a[rel=mw:ExtLink] to have class="external" and rel="nofollow"

Respecting MW's domain exceptions for nofollow.

Bug: T68289
Bug: T96855
Change-Id: I7cfdedb0507f9bb93d941b42c011fe9562d7e274
---
M autoload.php
M container.php
A includes/Parsoid/Fixer/ExtLinkFixer.php
3 files changed, 46 insertions(+), 1 deletion(-)


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

diff --git a/autoload.php b/autoload.php
index ff9e156..5049f53 100644
--- a/autoload.php
+++ b/autoload.php
@@ -248,6 +248,7 @@
'Flow\\Parsoid\\Fixer' => __DIR__ . '/includes/Parsoid/Fixer.php',
'Flow\\Parsoid\\Fixer\\BadImageRemover' => __DIR__ . 
'/includes/Parsoid/Fixer/BadImageRemover.php',
'Flow\\Parsoid\\Fixer\\BaseHrefFixer' => __DIR__ . 
'/includes/Parsoid/Fixer/BaseHrefFixer.php',
+   'Flow\\Parsoid\\Fixer\\ExtLinkFixer' => __DIR__ . 
'/includes/Parsoid/Fixer/ExtLinkFixer.php',
'Flow\\Parsoid\\Fixer\\WikiLinkFixer' => __DIR__ . 
'/includes/Parsoid/Fixer/WikiLinkFixer.php',
'Flow\\Parsoid\\ReferenceExtractor' => __DIR__ . 
'/includes/Parsoid/ReferenceExtractor.php',
'Flow\\Parsoid\\ReferenceFactory' => __DIR__ . 
'/includes/Parsoid/ReferenceFactory.php',
diff --git a/container.php b/container.php
index cb286b4..0f354b3 100644
--- a/container.php
+++ b/container.php
@@ -73,11 +73,16 @@
return new Flow\Parsoid\Fixer\BaseHrefFixer( $wgArticlePath );
 };
 
+$c['ext_link_fixer'] = function ( $c ) {
+   return new Flow\Parsoid\Fixer\ExtLinkFixer();
+};
+
 $c['content_fixer'] = function( $c ) {
return new Flow\Parsoid\ContentFixer(
$c['wiki_link_fixer'],
$c['bad_image_remover'],
-   $c['base_href_fixer']
+   $c['base_href_fixer'],
+   $c['ext_link_fixer']
);
 };
 
diff --git a/includes/Parsoid/Fixer/ExtLinkFixer.php 
b/includes/Parsoid/Fixer/ExtLinkFixer.php
new file mode 100644
index 000..968f836
--- /dev/null
+++ b/includes/Parsoid/Fixer/ExtLinkFixer.php
@@ -0,0 +1,39 @@
+setAttribute( 'class', 'external' );
+
+   global $wgNoFollowLinks, $wgNoFollowDomainExceptions;
+   if ( $wgNoFollowLinks && !wfMatchesDomainList( 
$node->getAttribute( 'href' ), $wgNoFollowDomainExceptions ) ) {
+   $node->setAttribute( 'rel', 'nofollow' );
+   }
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] Add .gitreview - change (labs...cdnjs-index)

2015-04-23 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Add .gitreview
..


Add .gitreview

Change-Id: I97cdb66f8bd834ca53ea47594d3243778c084118
---
A .gitreview
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..69c43be
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=labs/tools/cdnjs-index.git

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97cdb66f8bd834ca53ea47594d3243778c084118
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/cdnjs-index
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Fix models to match migrations - change (analytics/wikimetrics)

2015-04-23 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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

Change subject: Fix models to match migrations
..

Fix models to match migrations

Over time, some indices were added without adding the proper sqlalchemy
model declarations to match.  In the future, developers (including me)
should keep in mind to change the model first, then run

alembic revision --autogenerate

Change-Id: I7b7d26e355352799c2f28cf9fa0df9f73793556a
---
M database_migrations/env.py
M wikimetrics/models/storage/cohort_tag.py
M wikimetrics/models/storage/report.py
M wikimetrics/models/storage/tag.py
M wikimetrics/models/storage/wikiuser.py
5 files changed, 36 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics 
refs/changes/43/206343/1

diff --git a/database_migrations/env.py b/database_migrations/env.py
index f16fde7..23a23d9 100644
--- a/database_migrations/env.py
+++ b/database_migrations/env.py
@@ -88,14 +88,13 @@
 
 if db.config['DEBUG'] is True:
 test_config = setup_testing_config(deepcopy(config))
-# add mediawiki_testing migrations
-mw_test_engine = get_engine(test_config)
-mw_test_metadata = db.WikimetricsBase.metadata
-migrations.append((mw_test_engine, mw_test_metadata))
-# add centralauth_testing migrations
-ca_test_engine = get_engine(test_config, 'CENTRALAUTH_ENGINE_URL')
-ca_test_metadata = db.CentralAuthBase.metadata
-migrations.append((ca_test_engine, ca_test_metadata))
+# add wikimetrics_testing migrations
+test_engine = get_engine(test_config)
+test_metadata = db.WikimetricsBase.metadata
+migrations.append((test_engine, test_metadata))
+# NOTE: centralauth and mediawiki schemas should be maintained
+# manually and not managed with alembic, as they are not schemas
+# we own
 
 for eng, meta_data in migrations:
 connection = eng.connect()
diff --git a/wikimetrics/models/storage/cohort_tag.py 
b/wikimetrics/models/storage/cohort_tag.py
index f77c02b..5dcdfcd 100644
--- a/wikimetrics/models/storage/cohort_tag.py
+++ b/wikimetrics/models/storage/cohort_tag.py
@@ -12,8 +12,8 @@
 __tablename__ = 'cohort_tag'
 
 id= Column(Integer, primary_key=True)
-tag_id= Column(Integer, ForeignKey('tag.id'))
-cohort_id = Column(Integer, ForeignKey('cohort.id'))
+tag_id= Column(Integer, ForeignKey('tag.id'), nullable=False)
+cohort_id = Column(Integer, ForeignKey('cohort.id'), nullable=False)
 
 def __repr__(self):
 return ''.format(self.id)
diff --git a/wikimetrics/models/storage/report.py 
b/wikimetrics/models/storage/report.py
index f4c5757..32e3199 100644
--- a/wikimetrics/models/storage/report.py
+++ b/wikimetrics/models/storage/report.py
@@ -2,7 +2,7 @@
 import json
 from sqlalchemy import Column, Integer, String, DateTime, Boolean, func, 
ForeignKey
 from sqlalchemy.orm import Session
-from sqlalchemy.schema import UniqueConstraint
+from sqlalchemy.schema import UniqueConstraint, Index
 from sqlalchemy.sql.expression import and_
 from sqlalchemy.exc import SQLAlchemyError
 from wikimetrics.configurables import db, app
@@ -30,7 +30,16 @@
 recurrent = Column(Boolean, default=False, nullable=False)
 recurrent_parent_id = Column(Integer, ForeignKey('report.id'))
 
-UniqueConstraint('recurrent_parent_id', 'created', name='uix_report')
+__table_args__ = (
+UniqueConstraint(
+recurrent_parent_id, created,
+name='uix_report'
+),
+Index(
+'ix_report_recurrent',
+recurrent
+)
+)
 
 def update_status(self):
 # if we don't have the result key leave as is
diff --git a/wikimetrics/models/storage/tag.py 
b/wikimetrics/models/storage/tag.py
index 15c3057..70682a0 100644
--- a/wikimetrics/models/storage/tag.py
+++ b/wikimetrics/models/storage/tag.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, String
+from sqlalchemy import Column, Integer, String, UniqueConstraint
 from wikimetrics.configurables import db
 
 
@@ -10,5 +10,12 @@
 id  = Column(Integer, primary_key=True)
 name= Column(String(50), nullable=False, default='')
 
+__table_args__ = (
+UniqueConstraint(
+name,
+name='uix_tag'
+),
+)
+
 def __repr__(self):
 return ''.format(self.id)
diff --git a/wikimetrics/models/storage/wikiuser.py 
b/wikimetrics/models/storage/wikiuser.py
index 027a56f..828c1d5 100644
--- a/wikimetrics/models/storage/wikiuser.py
+++ b/wikimetrics/models/storage/wikiuser.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, String, Boolean
+from sqlalchemy import Column, Integer, String, Boolean, UniqueConstraint
 from wikimetrics.configurables import db
 
 
@@ -25,6 +25,13 @@
 # The cohort id that this wikiuser is being va

[MediaWiki-commits] [Gerrit] Added LICENSE file - change (labs...cdnjs-index)

2015-04-23 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Added LICENSE file
..


Added LICENSE file

Change-Id: Ibdb6572206958c5aada09170b3efa26d66b434f9
---
A LICENSE
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..b86e5ef
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Copyright (C) 2015 Yuvi Panda 
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdb6572206958c5aada09170b3efa26d66b434f9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/cdnjs-index
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Add .gitreview - change (labs...cdnjs-index)

2015-04-23 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: Add .gitreview
..

Add .gitreview

Change-Id: I97cdb66f8bd834ca53ea47594d3243778c084118
---
A .gitreview
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/cdnjs-index 
refs/changes/42/206342/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..69c43be
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=labs/tools/cdnjs-index.git

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97cdb66f8bd834ca53ea47594d3243778c084118
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/cdnjs-index
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Added LICENSE file - change (labs...cdnjs-index)

2015-04-23 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: Added LICENSE file
..

Added LICENSE file

Change-Id: Ibdb6572206958c5aada09170b3efa26d66b434f9
---
A LICENSE
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/cdnjs-index 
refs/changes/41/206341/1

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..b86e5ef
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Copyright (C) 2015 Yuvi Panda 
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdb6572206958c5aada09170b3efa26d66b434f9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/cdnjs-index
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Revert "Use /api/rest_v1/ entry point for VE" - change (operations/mediawiki-config)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Use /api/rest_v1/ entry point for VE"
..


Revert "Use /api/rest_v1/ entry point for VE"

This breaks subpages, because /Foo%2FBar gets decoded to
/Foo/Bar and RESTbase then complains that "Bar" is not a
valid revision ID.

This reverts commit 73e6f126bda7b7c360bd98f9b9588a78b54656a8.

Change-Id: Ib5cc3dd137a32a098d3f119c36e989b4a120dbc9
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 55f86fc..9873c86 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -104,7 +104,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://restbase-beta.wmflabs.org/$wgServerName/v1/page/html/";;
};
}
 }
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 18efed9..f5727ff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2046,7 +2046,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://rest.wikimedia.org/$wgServerName/v1/page/html/";;
};
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5cc3dd137a32a098d3f119c36e989b4a120dbc9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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] Classify staging-cache-.* machines. - change (operations/puppet)

2015-04-23 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Classify staging-cache-.* machines.
..


Classify staging-cache-.* machines.

Change-Id: I96635e05479fe91c08a547c92e419e6f9d637b8c
---
M nodes/labs/staging.yaml
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/nodes/labs/staging.yaml b/nodes/labs/staging.yaml
index 10ce964..c07f0cd 100644
--- a/nodes/labs/staging.yaml
+++ b/nodes/labs/staging.yaml
@@ -10,5 +10,18 @@
   - role::ocg
 .*-rdb\d\d?:
   - role::db::redis
+.*-cache-text\d\d:
+  - role::cache::text
+.*-cache-bits\d\d:
+  - role::cache::cache::bits
+.*-cache-mobile\d\d:
+  - role::cache::mobile
+.*-cache-upload\d\d:
+  - role::cache::upload
+.*-cache-parsoid\d\d:
+  - role::cache::parsoid
+.*-cache-.*:
+  - role::beta::availability_collector
+  - role::protoproxy::ssl::beta
 .*:
   - role::puppet::self

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96635e05479fe91c08a547c92e419e6f9d637b8c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Thcipriani 
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] Revert "Use /api/rest_v1/ entry point for VE" - change (operations/mediawiki-config)

2015-04-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Revert "Use /api/rest_v1/ entry point for VE"
..

Revert "Use /api/rest_v1/ entry point for VE"

This breaks subpages, because /Foo%2FBar gets decoded to
/Foo/Bar and RESTbase then complains that "Bar" is not a
valid revision ID.

This reverts commit 73e6f126bda7b7c360bd98f9b9588a78b54656a8.

Change-Id: Ib5cc3dd137a32a098d3f119c36e989b4a120dbc9
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 55f86fc..9873c86 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -104,7 +104,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://restbase-beta.wmflabs.org/$wgServerName/v1/page/html/";;
};
}
 }
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 18efed9..f5727ff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2046,7 +2046,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://rest.wikimedia.org/$wgServerName/v1/page/html/";;
};
}
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5dd646e..2ee84a1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12565,6 +12565,7 @@
'testwiki' => true,
'test2wiki' => true,
'testwikidatawiki' => true,
+   'enwiki' => true,
 ),
 
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces

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

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

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

[MediaWiki-commits] [Gerrit] Enable Vagrant Gather role - change (mediawiki/vagrant)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Enable Vagrant Gather role
..


Enable Vagrant Gather role

Bug: T90814
Change-Id: Ib0c39a7edc8e735e6298fce897b29f20c2797bb9
---
A puppet/modules/role/manifests/gather.pp
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/gather.pp 
b/puppet/modules/role/manifests/gather.pp
new file mode 100644
index 000..678173e
--- /dev/null
+++ b/puppet/modules/role/manifests/gather.pp
@@ -0,0 +1,13 @@
+# == Class: role::gather
+# Configures Gather, the MediaWiki extension which powers Special:Gather
+#
+class role::gather {
+include ::role::mediawiki
+include ::role::mobilefrontend
+include ::role::pageimages
+include ::role::textextracts
+
+mediawiki::extension { 'Gather':
+browser_tests => true,
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0c39a7edc8e735e6298fce897b29f20c2797bb9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apache: Mute warnings about right-to-left relationships - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: apache: Mute warnings about right-to-left relationships
..


apache: Mute warnings about right-to-left relationships

The Puppet Language Style Guide states that resource relationships may
be expressed with the chaining syntax only in left-to-right ("->")
form
(cf. http://docs.puppetlabs.com/guides/style_guide.html#chaining-arrow-syntax).

In this particular manifest, an exception for uniformity is warranted.
This change mutes the corresponding puppet-lint warnings.

Bug: T87132
Change-Id: I438e78ba2566515f609890f487cac1a3586f1b1e
---
M modules/apache/manifests/mod.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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

Objections:
  JanZerebecki: There's a problem with this change, please improve



diff --git a/modules/apache/manifests/mod.pp b/modules/apache/manifests/mod.pp
index cf3fa7a..be28239 100644
--- a/modules/apache/manifests/mod.pp
+++ b/modules/apache/manifests/mod.pp
@@ -35,6 +35,7 @@
 class apache::mod::userdir { apache::mod_conf { 'userdir':} }
 
 # Modules that depend on additional packages
+# lint:ignore:right_to_left_relationship
 class apache::mod::authz_svn   { apache::mod_conf { 'authz_svn':  } <- 
package { 'libapache2-svn':   } }
 class apache::mod::fastcgi { apache::mod_conf { 'fastcgi':} <- 
package { 'libapache2-mod-fastcgi':   } }
 class apache::mod::fcgid   { apache::mod_conf { 'fcgid':  } <- 
package { 'libapache2-mod-fcgid': } }
@@ -45,6 +46,7 @@
 class apache::mod::rpaf{ apache::mod_conf { 'rpaf':   } <- 
package { 'libapache2-mod-rpaf':  } }
 class apache::mod::uwsgi   { apache::mod_conf { 'uwsgi':  } <- 
package { 'libapache2-mod-uwsgi': } }
 class apache::mod::wsgi{ apache::mod_conf { 'wsgi':   } <- 
package { 'libapache2-mod-wsgi':  } }
+# lint:endignore
 
 # Modules that target a specific distribution
 class apache::mod::access_compat { if os_version('debian >= jessie || ubuntu 
>= 13.10') { apache::mod_conf { 'access_compat': } } }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I438e78ba2566515f609890f487cac1a3586f1b1e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Delete PayflowPro - change (wikimedia...PaymentsListeners)

2015-04-23 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Delete PayflowPro
..

Delete PayflowPro

Change-Id: If73d4817006d29a4552db2ddf8e1eae30e11eea7
---
D payflowpro/executeStompPFPPendingProcessorSA.php.example
D payflowpro/stompPFPPendingProcessorSA.php
D payflowpro/tests/StompPFPPendingProcessorSATest.php
D payflowpro/tests/config.ini-dist
4 files changed, 0 insertions(+), 1,601 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/PaymentsListeners 
refs/changes/39/206339/1

diff --git a/payflowpro/executeStompPFPPendingProcessorSA.php.example 
b/payflowpro/executeStompPFPPendingProcessorSA.php.example
deleted file mode 100644
index 1ea9382..000
--- a/payflowpro/executeStompPFPPendingProcessorSA.php.example
+++ /dev/null
@@ -1,51 +0,0 @@
-
- * @TODO command line argument processing
- */
-
-
-// define a file where you can log the output from the listener
-$log_file = "logs/out_" . date( 'Ymd' ) . '.log';
-// create a file resource pointer
-$output_handle = fopen( $log_file, 'a' );
-
-// require the actual listener
-require_once( 'stompPFPPendingProcessorSA.php' );
-
-// set some configuration variables (for more info, check in 
PaypalIPNListener.php
-$config = array (
-   'pfp_url' => 'https://payflowpro.paypal.com',
-   'pfp_partner_id' => '',
-   'pfp_vendor_id' => '',
-   'pfp_user_id' => '',
-   'pfp_password' => '',
-   'activemq_stomp_uri' => '',
-   'activemq_pending_queue' => '',
-   'activemq_confirmed_queue' => '',
-   'batch_size' => 20,
-   'log_level' => 2,
-   'stomp_path' => 'stomp/Stomp.php',
-   'output_handle' => $output_handle );
-
-// instantaite the processor with our config options
-$processor = new StompPFPPendingProcessorSA( $config );
-
-$success = $processor->execute();
-
-// shutdown the processor
-unset( $processor );
-
-// cleanly close the file pointer for output
-fclose( $output_handle );
-
-if ( $success === false){
-   exit(1); //Can't continue. The specific reason should already have been 
logged by the processor.
-}
-
-?>
diff --git a/payflowpro/stompPFPPendingProcessorSA.php 
b/payflowpro/stompPFPPendingProcessorSA.php
deleted file mode 100644
index 6c9009c..000
--- a/payflowpro/stompPFPPendingProcessorSA.php
+++ /dev/null
@@ -1,443 +0,0 @@
-
- * @author: Katie Horn 
- */
-define('LOG_LEVEL_QUIET', 0); // disables all logging
-define('LOG_LEVEL_INFO', 1); // some useful logging information
-define('LOG_LEVEL_DEBUG', 2);
-
- // verbose logging for debug
-
-class StompPFPPendingProcessorSA {
-
-   /** If TRUE, output extra information for debug purposes * */
-   protected $log_level = LOG_LEVEL_INFO;
-   /** Holds our Stomp connection instance * */
-   protected $stomp;
-   /** The number of items to process * */
-   protected $batch_size = 50;
-   /** Define the path to Stomp.php * */
-   protected $stomp_path;
-   protected $message_cache = array();
-
-   public function __construct($config) {
-   // load the configuration options
-   $this->load_config_options($config);
-
-   // require the Stomp file
-   require_once( $this->stomp_path );
-   }
-
-   public function execute() {
-   $this->log("Pending queue processor bootstrapped and ready to 
go!");
-
-   // estamplish a connection to the stomp listener
-   if (!$this->set_stomp_connection()) {
-   return false;
-   }
-
-   $this->log("Preparing to process up to {$this->batch_size} 
pending transactions.", LOG_LEVEL_DEBUG);
-
-   // batch process pending transactions
-   for ($i = 0; $i < $this->batch_size; $i++) {
-   // empty pending_transaction
-   if (isset($message))
-   unset($message);
-
-   // fetch the latest pending transaction from the queue 
(Stomp_Frame object)
-   $message = 
$this->fetch_message($this->activemq_pending_queue);
-   // if we do not get a pending transaction back...
-   if (!$message) {
-   $this->log("There are no more pending 
transactions to process.", LOG_LEVEL_DEBUG);
-   break;
-   }
-
-   // the message is in it's raw format, we need to decode 
just it's body
-   $pending_transaction = json_decode($message->body, 
TRUE);
-
-   if 
(!array_key_exists($pending_transaction['gateway_txn_id'], 
$this->message_cache)) {
-   
$this->message_cache[$pending_transaction['gateway_txn_id']] = array(
-   'raw' => $message,
-

[MediaWiki-commits] [Gerrit] Bump VisualEditor for Ie10a75327 - change (mediawiki/core)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Bump VisualEditor for Ie10a75327
..


Bump VisualEditor for Ie10a75327

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 5fb2243..100634b 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 5fb2243815d67b494936fd71fca5950618f008da
+Subproject commit 100634b757d939d2f9cc4ac6f9769535fc2c006b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c58a305799238b852bf516863182e7dbf8e6fbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Catrope 
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] Bump VisualEditor for Ie10a75327 - change (mediawiki/core)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Bump VisualEditor for Ie10a75327
..


Bump VisualEditor for Ie10a75327

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 35137cb..2dfac31 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 35137cbe113578af8b40c4d2f39e150582f3b726
+Subproject commit 2dfac313d77ea293cbdc5bcdb73bcff7500e0e0e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I398f4465938cc27fa4955f233c01744b8a9b9d9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Catrope 
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] monitoring: selector outside a resource - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: monitoring: selector outside a resource
..


monitoring: selector outside a resource

Change-Id: Ie2cfe9c215623b92b090d0bf288b0c21cfcbc0c8
---
M modules/monitoring/manifests/service.pp
1 file changed, 36 insertions(+), 24 deletions(-)

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



diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index eb40daf..a56e733 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -23,6 +23,36 @@
 default => hiera('nagios_group',"${cluster_name}_${::site}")
 }
 
+$notification_critical = $critical ? {
+'true'  => 240,
+default => 0,
+}
+
+$contact_critical = $critical ? {
+'true'  => 'admins,sms',
+default => $contact_group,
+}
+
+$is_active = $passive ? {
+'true'  => 0,
+default => 1,
+}
+
+$check_volatile = $passive ? {
+'true'  => 1,
+default => 0,
+}
+
+$check_fresh = $passive ? {
+'true'  => 1,
+default => 0,
+}
+
+$is_fresh = $passive ? {
+'true'  => $freshness,
+default => undef,
+}
+
 # Export the nagios service instance
 @@nagios_service { "${::hostname} ${title}":
 ensure => $ensure,
@@ -35,32 +65,14 @@
 normal_check_interval  => $normal_check_interval,
 retry_check_interval   => $retry_check_interval,
 check_period   => '24x7',
-notification_interval  => $critical ? {
-'true'  => 240,
-default => 0,
-},
+notification_interval  => $notification_critical,
 notification_period=> '24x7',
 notification_options   => 'c,r,f',
-contact_groups => $critical ? {
-'true'  => 'admins,sms',
-default => $contact_group,
-},
+contact_groups => $contact_critical,
 passive_checks_enabled => 1,
-active_checks_enabled  => $passive ? {
-'true'  => 0,
-default => 1,
-},
-is_volatile=> $passive ? {
-'true'  => 1,
-default => 0,
-},
-check_freshness=> $passive ? {
-'true'  => 1,
-default => 0,
-},
-freshness_threshold=> $passive ? {
-'true'  => $freshness,
-default => undef,
-},
+active_checks_enabled  => $is_active,
+is_volatile=> $check_volatile,
+check_freshness=> $check_fresh,
+freshness_threshold=> $is_fresh,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2cfe9c215623b92b090d0bf288b0c21cfcbc0c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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] Use /api/rest_v1/ entry point for VE - change (operations/mediawiki-config)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Use /api/rest_v1/ entry point for VE
..


Use /api/rest_v1/ entry point for VE

Also disable it temporarily for enwiki, so that we can sanity-check things on
mw.org before rolling it out more widely.

Bug: T95229
Change-Id: I8b1853f2ddae67c98aa5a91907e2894677ed5b52
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 9873c86..55f86fc 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -104,7 +104,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://restbase-beta.wmflabs.org/$wgServerName/v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
};
}
 }
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f5727ff..18efed9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2046,7 +2046,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://rest.wikimedia.org/$wgServerName/v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
};
}
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2ee84a1..5dd646e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12565,7 +12565,6 @@
'testwiki' => true,
'test2wiki' => true,
'testwikidatawiki' => true,
-   'enwiki' => true,
 ),
 
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b1853f2ddae67c98aa5a91907e2894677ed5b52
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: GWicke 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump VisualEditor for Ie10a75327 - change (mediawiki/core)

2015-04-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Bump VisualEditor for Ie10a75327
..

Bump VisualEditor for Ie10a75327

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/206338/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 35137cb..2dfac31 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 35137cbe113578af8b40c4d2f39e150582f3b726
+Subproject commit 2dfac313d77ea293cbdc5bcdb73bcff7500e0e0e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I398f4465938cc27fa4955f233c01744b8a9b9d9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Bump VisualEditor for Ie10a75327 - change (mediawiki/core)

2015-04-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Bump VisualEditor for Ie10a75327
..

Bump VisualEditor for Ie10a75327

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


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

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 5fb2243..100634b 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 5fb2243815d67b494936fd71fca5950618f008da
+Subproject commit 100634b757d939d2f9cc4ac6f9769535fc2c006b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c58a305799238b852bf516863182e7dbf8e6fbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Hygiene: Use Button in AbuseFilterOverlay - change (mediawiki...MobileFrontend)

2015-04-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Use Button in AbuseFilterOverlay
..

Hygiene: Use Button in AbuseFilterOverlay

Change-Id: I86983c7d724b80b3fef9d0520628c54bb5ad9fd5
---
M javascripts/modules/editor/AbuseFilterOverlay.js
M templates/modules/editor/AbuseFilterOverlay.hogan
2 files changed, 8 insertions(+), 2 deletions(-)


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

diff --git a/javascripts/modules/editor/AbuseFilterOverlay.js 
b/javascripts/modules/editor/AbuseFilterOverlay.js
index 4ab549e..6974067 100644
--- a/javascripts/modules/editor/AbuseFilterOverlay.js
+++ b/javascripts/modules/editor/AbuseFilterOverlay.js
@@ -1,5 +1,6 @@
 ( function ( M ) {
var AbuseFilterOverlay,
+   Button = M.require( 'Button' ),
Overlay = M.require( 'Overlay' );
 
/**
@@ -16,9 +17,14 @@
 * understanding.
 */
defaults: {
-   confirmMessage: mw.msg( 
'mobile-frontend-photo-ownership-confirm' )
+   confirmButton: new Button( {
+   additionalClassNames: 'cancel',
+   progressive: true,
+   label: mw.msg( 
'mobile-frontend-photo-ownership-confirm' )
+   } ).options
},
templatePartials: {
+   button: Button.prototype.template,
content: mw.template.get( 'mobile.abusefilter', 
'Overlay.hogan' )
},
className: 'overlay abusefilter-overlay',
diff --git a/templates/modules/editor/AbuseFilterOverlay.hogan 
b/templates/modules/editor/AbuseFilterOverlay.hogan
index daedacd..f9925cf 100644
--- a/templates/modules/editor/AbuseFilterOverlay.hogan
+++ b/templates/modules/editor/AbuseFilterOverlay.hogan
@@ -1,4 +1,4 @@
 
{{{message}}}
-   {{confirmMessage}}
+   {{#confirmButton}}{{>button}}{{/confirmButton}}
 

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Drawer uses Icon and Button - change (mediawiki...MobileFrontend)

2015-04-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Drawer uses Icon and Button
..

Hygiene: Drawer uses Icon and Button

Change-Id: I2ab45765139567ebf57c8ec2cb57d24676e1a0bd
---
M javascripts/CtaDrawer.js
M templates/ctaDrawer.hogan
2 files changed, 14 insertions(+), 5 deletions(-)


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

diff --git a/javascripts/CtaDrawer.js b/javascripts/CtaDrawer.js
index 78539b9..ad50534 100644
--- a/javascripts/CtaDrawer.js
+++ b/javascripts/CtaDrawer.js
@@ -1,6 +1,7 @@
 ( function ( M, $ ) {
var Drawer = M.require( 'Drawer' ),
Icon = M.require( 'Icon' ),
+   Button = M.require( 'Button' ),
Anchor = M.require( 'Anchor' ),
CtaDrawer;
 
@@ -10,6 +11,9 @@
 * with options to log in or sign up for a new account.
 * @class CtaDrawer
 * @extends Drawer
+* @uses Button
+* @uses Icon
+* @uses Anchor
 */
CtaDrawer = Drawer.extend( {
/**
@@ -19,6 +23,10 @@
 * @cfg {String} defaults.signup Caption for the signup button.
 */
defaults: {
+   loginButton: new Button( {
+   progressive: true,
+   label: mw.msg( 
'mobile-frontend-watchlist-cta-button-login' )
+   } ).options,
signupAnchor: new Anchor( {
progressive: true,
label: mw.msg( 
'mobile-frontend-watchlist-cta-button-signup' )
@@ -26,10 +34,11 @@
collapseButton: new Icon( {
name: 'arrow-down',
additionalClassNames: 'cancel'
-   } ).toHtmlString(),
-   loginCaption: mw.msg( 
'mobile-frontend-watchlist-cta-button-login' )
+   } ).options
},
templatePartials: {
+   icon: Icon.prototype.template,
+   button: Button.prototype.template,
anchor: Anchor.prototype.template
},
template: mw.template.get( 'mobile.drawers', 'Cta.hogan' ),
@@ -44,7 +53,7 @@
type: 'signup'
}, options.signupQueryParams );
 
-   options.loginUrl = mw.util.getUrl( 'Special:UserLogin', 
params );
+   options.loginButton.href = mw.util.getUrl( 
'Special:UserLogin', params );
options.signupAnchor.href = mw.util.getUrl( 
'Special:UserLogin', $.extend( params, signupParams ) );
}
} );
diff --git a/templates/ctaDrawer.hogan b/templates/ctaDrawer.hogan
index 36684ee..a1e66c7 100644
--- a/templates/ctaDrawer.hogan
+++ b/templates/ctaDrawer.hogan
@@ -1,6 +1,6 @@
-{{{collapseButton}}}
+{{#collapseButton}}{{>icon}}{{/collapseButton}}
 {{content}}
-{{loginCaption}}
+{{#loginButton}}{{>button}}{{/loginButton}}
 
{{#signupAnchor}}{{>anchor}}{{/signupAnchor}}
 

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Use Button for category button - change (mediawiki...MobileFrontend)

2015-04-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Use Button for category button
..

Hygiene: Use Button for category button

Change-Id: I8de81d13132bd39bcd08bca6cbb19e50ab5a324f
---
M includes/Resources.php
M javascripts/modules/categories/CategoryLookupInputWidget.js
D templates/modules/categories/CategoryButton.hogan
3 files changed, 13 insertions(+), 10 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index 0c43de2..5880361 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -772,7 +772,6 @@
'CategoryAddOverlay.hogan' => 
'templates/modules/categories/CategoryAddOverlay.hogan',
'CategoryAddOverlayHeader.hogan' =>

'templates/modules/categories/CategoryAddOverlayHeader.hogan',
-   'CategoryButton.hogan' => 
'templates/modules/categories/CategoryButton.hogan',
),
'messages' => array(
'mobile-frontend-categories-heading',
diff --git a/javascripts/modules/categories/CategoryLookupInputWidget.js 
b/javascripts/modules/categories/CategoryLookupInputWidget.js
index 43cb1a4..4af7a4a 100644
--- a/javascripts/modules/categories/CategoryLookupInputWidget.js
+++ b/javascripts/modules/categories/CategoryLookupInputWidget.js
@@ -1,4 +1,7 @@
 ( function ( M, $, OO ) {
+   var Button = M.require( 'Button' ),
+   Icon = M.require( 'Icon' );
+
/**
 * @class CategoryLookupInputWidget
 * @extends OO.ui.LookupElement
@@ -21,12 +24,16 @@
 * @param {Object} data Data of the clicked element
 */
CategoryLookupInputWidget.prototype.onLookupMenuItemChoose = function ( 
data ) {
-   this.$suggestions.append(
-   mw.template.get( 'mobile.categories', 
'CategoryButton.hogan' ).render( {
-   title: data.data,
-   displayname: data.label
-   } )
-   );
+   var button = new Button( {
+   progressive: true,
+   additionalClassNames: new Icon( {
+   name: 'ok',
+   hasText: true,
+   additionalClassNames: 'suggestion suggested'
+   } ).getClassName(),
+   label: data.label
+   } ).appendTo( this.$suggestions );
+   button.$el.data( 'title', data.data );
this.$saveButton.prop( 'disabled', false );
};
 
diff --git a/templates/modules/categories/CategoryButton.hogan 
b/templates/modules/categories/CategoryButton.hogan
deleted file mode 100644
index ccc3623..000
--- a/templates/modules/categories/CategoryButton.hogan
+++ /dev/null
@@ -1,3 +0,0 @@
-
-   {{displayname}}
-
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Revert "Make ircecho deduplicate statuses on all lin... - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Revert "Revert "Make ircecho deduplicate statuses on all lines 
in buffer""
..


Revert "Revert "Make ircecho deduplicate statuses on all lines in buffer""

This reverts commit a90994a383cd97bcf1c2b6342fbc0b2b511bf287.

Change-Id: Icf6290f5fd6f510edfb6824534d10912c44f87fb
---
M modules/ircecho/files/ircecho
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ircecho/files/ircecho b/modules/ircecho/files/ircecho
index 523a072..051a981 100755
--- a/modules/ircecho/files/ircecho
+++ b/modules/ircecho/files/ircecho
@@ -140,7 +140,7 @@
 class EventHandler(pyinotify.ProcessEvent):
def process_IN_MODIFY(self, event):
s = reader.readfile(event.pathname)
-   s = beautify_message(s)
+   s = '\n'.join(beautify_message(m) for m in s.split('\n') if m)
if s:
chans = reader.getchannels(event.pathname)
try:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf6290f5fd6f510edfb6824534d10912c44f87fb
Gerrit-PatchSet: 1
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] Revert "Revert "Make ircecho deduplicate statuses on all lin... - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: Revert "Revert "Make ircecho deduplicate statuses on all lines 
in buffer""
..

Revert "Revert "Make ircecho deduplicate statuses on all lines in buffer""

This reverts commit a90994a383cd97bcf1c2b6342fbc0b2b511bf287.

Change-Id: Icf6290f5fd6f510edfb6824534d10912c44f87fb
---
M modules/ircecho/files/ircecho
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ircecho/files/ircecho b/modules/ircecho/files/ircecho
index 523a072..051a981 100755
--- a/modules/ircecho/files/ircecho
+++ b/modules/ircecho/files/ircecho
@@ -140,7 +140,7 @@
 class EventHandler(pyinotify.ProcessEvent):
def process_IN_MODIFY(self, event):
s = reader.readfile(event.pathname)
-   s = beautify_message(s)
+   s = '\n'.join(beautify_message(m) for m in s.split('\n') if m)
if s:
chans = reader.getchannels(event.pathname)
try:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf6290f5fd6f510edfb6824534d10912c44f87fb
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] Beta: Add the Tags section - change (mediawiki...MobileFrontend)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Beta: Add the Tags section
..


Beta: Add the Tags section

* Add a wgMFBrowseTags static map of category name to tag name
* Add the MobileFrontend\Browse\TagService and NullTagService classes
* Render the set of tags returned by the service using a Mustache template
* Only enable the feature when `$wgMFIsBrowseEnabled` is truthy

Bug: T94739
Change-Id: I27e78c22c217b3752894bb4ea2bcf3d8bbd9a436
---
M MobileFrontend.php
M i18n/en.json
M i18n/qqq.json
M includes/Resources.php
A includes/browse/NullTagService.php
A includes/browse/TagService.php
M includes/config/Experimental.php
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateBeta.php
M includes/skins/SkinMinervaBeta.php
A less/browse/tags.less
A templates/browse/tags.mustache
A tests/phpunit/browse/TagServiceTest.php
13 files changed, 271 insertions(+), 2 deletions(-)

Approvals:
  Siebrand: Looks good to me, but someone else must approve
  Jdlrobson: Looks good to me, approved
  Bmansurov: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/MobileFrontend.php b/MobileFrontend.php
index eb8acfe..a67efc9 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -100,6 +100,9 @@
'UserLoginAndCreateTemplate' => 'skins/UserLoginAndCreateTemplate',
'UserLoginMobileTemplate' => 'skins/UserLoginMobileTemplate',
'UserAccountCreateMobileTemplate' => 
'skins/UserAccountCreateMobileTemplate',
+
+   'MobileFrontend\Browse\TagService' => 'browse/TagService',
+   'MobileFrontend\Browse\NullTagService' => 'browse/NullTagService',
 );
 
 foreach ( $autoloadClasses as $className => $classFilename ) {
diff --git a/i18n/en.json b/i18n/en.json
index 4d03f1d..2c2e6bd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -408,5 +408,6 @@
"mobile-frontend-days-ago": "$1 {{PLURAL:$1|day|days}} ago",
"mobile-frontend-months-ago": "$1 {{PLURAL:$1|month|months}} ago",
"mobile-frontend-years-ago": "$1 {{PLURAL:$1|year|years}} ago",
-   "mobile-frontend-console-recruit": "\\o/ Hey! This is open source 
software and we need volunteers to help us build this thing, make it better and 
fix any bugs that you might be seeing in this JavaScript console!\n\nYou can 
find our backlog @ https://phabricator.wikimedia.org/project/view/67/";
+   "mobile-frontend-console-recruit": "\\o/ Hey! This is open source 
software and we need volunteers to help us build this thing, make it better and 
fix any bugs that you might be seeing in this JavaScript console!\n\nYou can 
find our backlog @ https://phabricator.wikimedia.org/project/view/67/";,
+   "mobile-frontend-browse-tags-header": "Tags"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 76b6e5e..e32bc86 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -436,5 +436,6 @@
"mobile-frontend-days-ago": "Expression of duration of time passed in 
days.\nParameter:\n* $1 - number of days that have passed.",
"mobile-frontend-months-ago": "Expression of duration of time passed in 
months.\nParameter:\n * $1 - number of months that have passed.",
"mobile-frontend-years-ago": "Expression of duration of time passed in 
years.\nParameter:\n * $1 - number of years that have passed.",
-   "mobile-frontend-console-recruit": "Message that is displayed in the 
JavaScript console aimed at developers in an attempt to recruit volunteers. The 
\\o/ emoticon is a man with his arms in the air with the purpose of drawing 
attention to the message. If this doesn't translate into the destination 
language feel free to omit it or use something more applicable."
+   "mobile-frontend-console-recruit": "Message that is displayed in the 
JavaScript console aimed at developers in an attempt to recruit volunteers. The 
\\o/ emoticon is a man with his arms in the air with the purpose of drawing 
attention to the message. If this doesn't translate into the destination 
language feel free to omit it or use something more applicable.",
+   "mobile-frontend-browse-tags-header": "The header of the \"tags\" 
section of the page, which is part of the Browse experiment."
 }
diff --git a/includes/Resources.php b/includes/Resources.php
index 83cb262..4529f35 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -129,6 +129,7 @@
'less/pageactions.beta.less',
'less/footer.beta.less',
'less/content/main.beta.less',
+   'less/browse/tags.less',
),
),
'skins.minerva.beta.images' => $wgMFResourceFileModuleBoilerplate + 
array(
diff --git a/includes/browse/NullTagService.php 
b/includes/browse/NullTagService.php
new file mode 100644
index 000..60fbd94
--- /dev/null
+++ b/includes/browse/NullTagService.php
@@ -0,0 +1,16 @@
+tags = $tags;
+   }
+
+   /**
+

[MediaWiki-commits] [Gerrit] Bump Flow for: - change (mediawiki/core)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Bump Flow for:
..


Bump Flow for:

Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow changes
588325397f9f692233f2c18afb0fde419828549b

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

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



diff --git a/extensions/Flow b/extensions/Flow
index 5f84033..5883253 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 5f840338bb183c311c2af73300f80d27f4977962
+Subproject commit 588325397f9f692233f2c18afb0fde419828549b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e9d470db1e59ad74f8c35bb03c35b09f7765bb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Robmoen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump Flow cache to 4.7 - change (operations/mediawiki-config)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Bump Flow cache to 4.7
..


Bump Flow cache to 4.7

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1bac00c..e226d40 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2580,7 +2580,7 @@
$wgGroupPermissions['autoconfirmed']['flow-edit-post'] = true;
}
 
-   $wgFlowCacheVersion = '4.6';
+   $wgFlowCacheVersion = '4.7';
 }
 
 if ( $wmgUseDisambiguator ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icede74fb78e6803b3cac3badc913d5034fc61d01
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Mattflaschen 
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 a fallback means for determining CPU count on Windows - change (mediawiki/vagrant)

2015-04-23 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Add a fallback means for determining CPU count on Windows
..

Add a fallback means for determining CPU count on Windows

T97087

Change-Id: I3d619570c4404c2ade279dc895937e823aaaeca4
---
M lib/mediawiki-vagrant/environment.rb
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/32/206332/1

diff --git a/lib/mediawiki-vagrant/environment.rb 
b/lib/mediawiki-vagrant/environment.rb
index 0cc11f9..2d90e6e 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -40,7 +40,12 @@
 when :linux
   `nproc`.to_i
 when :windows
-  `wmic CPU get NumberOfLogicalProcessors | more +1`.to_i
+  `wmic CPU get NumberOfLogicalProcessors`[/\d+/].to_i || begin
+require 'win32ole'
+wmi = WIN32OLE.connect('winmgmts://')
+q = wmi.ExecQuery('select NumberOfCores from Win32_Processor')
+q.to_enum.reduce(0) { |cores, processor| cores + 
processor.NumberOfCores }
+  end
 else
   1
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d619570c4404c2ade279dc895937e823aaaeca4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Reduce nesting - change (mediawiki...WikidataQualityConstraints)

2015-04-23 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Reduce nesting
..

Reduce nesting

Change-Id: Ia7022c78ee0f244949f8739eb6e60bf57461da41
---
M includes/ConstraintCheck/Helper/ConstraintReportHelper.php
1 file changed, 12 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
 refs/changes/31/206331/1

diff --git a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php 
b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
index 03ccec2..1c8a281 100644
--- a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
+++ b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
@@ -44,19 +44,19 @@
private function parseParameter( $parameter, $type = 'String' ) {
if ( $parameter === null ) {
return 'null';
-   } else {
-   if ( $type === 'String' ) {
-   return "$parameter";
-   } else { // ItemId, PropertyId
-   $startsWith = strtoupper( substr( $parameter, 
0, 1 ) );
-   if ( $startsWith === 'Q' || $startsWith === 'P' 
) {
-   $type = 'Wikibase\\DataModel\\Entity\\' 
. $type;
-   return new $type( $parameter );
-   } else {
-   return '';
-   }
-   }
}
+
+   if ( $type === 'String' ) {
+   return "$parameter";
+   }
+
+   $startsWith = strtoupper( substr( $parameter, 0, 1 ) );
+   if ( $startsWith === 'Q' || $startsWith === 'P' ) {
+   $type = 'Wikibase\\DataModel\\Entity\\' . $type;
+   return new $type( $parameter );
+   }
+
+   return '';
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7022c78ee0f244949f8739eb6e60bf57461da41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] Fix TestingAccessWrapper::__call - change (mediawiki/core)

2015-04-23 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Fix TestingAccessWrapper::__call
..


Fix TestingAccessWrapper::__call

We were only passing the first parameter to the wrapped object's methods.

Change-Id: I27a69d1cc1b2d048e44514af8b4ac79d7ee1fb85
---
M tests/phpunit/data/helpers/WellProtectedClass.php
M tests/phpunit/includes/TestingAccessWrapper.php
M tests/phpunit/includes/TestingAccessWrapperTest.php
3 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php 
b/tests/phpunit/data/helpers/WellProtectedClass.php
index 7114cc9..99c7f64 100644
--- a/tests/phpunit/data/helpers/WellProtectedClass.php
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -14,4 +14,8 @@
public function getProperty() {
return $this->property;
}
+
+   protected function whatSecondArg( $a, $b = false ) {
+   return $b;
+   }
 }
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php 
b/tests/phpunit/includes/TestingAccessWrapper.php
index d4ad363..84c0f9b 100644
--- a/tests/phpunit/includes/TestingAccessWrapper.php
+++ b/tests/phpunit/includes/TestingAccessWrapper.php
@@ -31,7 +31,7 @@
$classReflection = new ReflectionClass( $this->object );
$methodReflection = $classReflection->getMethod( $method );
$methodReflection->setAccessible( true );
-   return $methodReflection->invoke( $this->object, $args );
+   return $methodReflection->invokeArgs( $this->object, $args );
}
 
public function __set( $name, $value ) {
diff --git a/tests/phpunit/includes/TestingAccessWrapperTest.php 
b/tests/phpunit/includes/TestingAccessWrapperTest.php
index 8da8e42..7e5b91a 100644
--- a/tests/phpunit/includes/TestingAccessWrapperTest.php
+++ b/tests/phpunit/includes/TestingAccessWrapperTest.php
@@ -27,4 +27,8 @@
$this->assertSame( 2, $this->wrapped->property );
$this->assertSame( 2, $this->raw->getProperty() );
}
+
+   function testCallMethodTwoArgs() {
+   $this->assertSame( 'two', $this->wrapped->whatSecondArg( 'one', 
'two' ) );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27a69d1cc1b2d048e44514af8b4ac79d7ee1fb85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_23
Gerrit-Owner: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] New testing wrapper to circumvent object access - change (mediawiki/core)

2015-04-23 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: New testing wrapper to circumvent object access
..


New testing wrapper to circumvent object access

The new TestingAccessWrapper class provides a convenient way to make
all of an object's methods and properties public.

TODO: We should organize test helpers into a source directory.  Note that the
helper and its test are in the same directory.

Change-Id: I958d55df18c74e9d2b25d98cd0316989a0fbbe6f
---
M tests/TestsAutoLoader.php
A tests/phpunit/data/helpers/WellProtectedClass.php
A tests/phpunit/includes/TestingAccessWrapper.php
A tests/phpunit/includes/TestingAccessWrapperTest.php
4 files changed, 98 insertions(+), 0 deletions(-)

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



diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 29c3269..6587be8 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -49,6 +49,7 @@
# tests/phpunit/includes
'BlockTest' => "$testDir/phpunit/includes/BlockTest.php",
'RevisionStorageTest' => 
"$testDir/phpunit/includes/RevisionStorageTest.php",
+   'TestingAccessWrapper' => 
"$testDir/phpunit/includes/TestingAccessWrapper.php",
'WikiPageTest' => "$testDir/phpunit/includes/WikiPageTest.php",
 
# tests/phpunit/includes/api
diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php 
b/tests/phpunit/data/helpers/WellProtectedClass.php
new file mode 100644
index 000..7114cc9
--- /dev/null
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -0,0 +1,17 @@
+property = 1;
+   }
+
+   protected function incrementPropertyValue() {
+   $this->property++;
+   }
+
+   public function getProperty() {
+   return $this->property;
+   }
+}
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php 
b/tests/phpunit/includes/TestingAccessWrapper.php
new file mode 100644
index 000..d4ad363
--- /dev/null
+++ b/tests/phpunit/includes/TestingAccessWrapper.php
@@ -0,0 +1,50 @@
+getTitleFormatter();
+ *
+ * TODO:
+ * - Provide access to static methods and properties.
+ * - Organize other helper classes in tests/testHelpers.inc into a directory.
+ */
+class TestingAccessWrapper {
+   public $object;
+
+   /**
+* Return the same object, without access restrictions.
+*/
+   public static function newFromObject( $object ) {
+   $wrapper = new TestingAccessWrapper();
+   $wrapper->object = $object;
+   return $wrapper;
+   }
+
+   public function __call( $method, $args ) {
+   $classReflection = new ReflectionClass( $this->object );
+   $methodReflection = $classReflection->getMethod( $method );
+   $methodReflection->setAccessible( true );
+   return $methodReflection->invoke( $this->object, $args );
+   }
+
+   public function __set( $name, $value ) {
+   $classReflection = new ReflectionClass( $this->object );
+   $propertyReflection = $classReflection->getProperty( $name );
+   $propertyReflection->setAccessible( true );
+   $propertyReflection->setValue( $this->object, $value );
+   }
+
+   public function __get( $name ) {
+   $classReflection = new ReflectionClass( $this->object );
+   $propertyReflection = $classReflection->getProperty( $name );
+   $propertyReflection->setAccessible( true );
+   return $propertyReflection->getValue( $this->object );
+   }
+}
diff --git a/tests/phpunit/includes/TestingAccessWrapperTest.php 
b/tests/phpunit/includes/TestingAccessWrapperTest.php
new file mode 100644
index 000..8da8e42
--- /dev/null
+++ b/tests/phpunit/includes/TestingAccessWrapperTest.php
@@ -0,0 +1,30 @@
+raw = new WellProtectedClass();
+   $this->wrapped = TestingAccessWrapper::newFromObject( 
$this->raw );
+   }
+
+   function testGetProperty() {
+   $this->assertSame( 1, $this->wrapped->property );
+   }
+
+   function testSetProperty() {
+   $this->wrapped->property = 10;
+   $this->assertSame( 10, $this->wrapped->property );
+   $this->assertSame( 10, $this->raw->getProperty() );
+   }
+
+   function testCallMethod() {
+   $this->wrapped->incrementPropertyValue();
+   $this->assertSame( 2, $this->wrapped->property );
+   $this->assertSame( 2, $this->raw->getProperty() );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I958d55df18c74e9d2b25d98cd0316989a0fbbe6f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_23
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-

[MediaWiki-commits] [Gerrit] Fix Sentry version to 7.4.3 - change (mediawiki/vagrant)

2015-04-23 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix Sentry version to 7.4.3
..

Fix Sentry version to 7.4.3

The sentry role used to install the newest version of Sentry;
fix it instead to the same version that's being packaged for
production use.

Also remove a workaround for a bug in an older version of Sentry.

Change-Id: I486b55d0ea9f3c2a3d9d222379c2e1c8363d7a39
---
M puppet/modules/sentry/manifests/init.pp
1 file changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/30/206330/1

diff --git a/puppet/modules/sentry/manifests/init.pp 
b/puppet/modules/sentry/manifests/init.pp
index afd623d..a965f7b 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -83,7 +83,7 @@
 # Use virtualenv because Sentry has lots of dependencies
 virtualenv::environment { $deploy_dir:
 ensure   => present,
-packages => ['sentry[mysql]==7.*'],
+packages => ['sentry[mysql]==7.4.3'],
 require  => Package['libmysqlclient-dev'],
 }
 
@@ -142,16 +142,6 @@
 ensure  => present,
 content => template('sentry/upstart.erb'),
 mode=> '0444',
-}
-
-# temporary bugfix for T90832
-file { "${::apache::docroot}/.sentry":
-ensure => directory,
-owner  => 'www-data',
-}
-file { "${::apache::docroot}/.sentry/sentry.conf.py":
-ensure => link,
-target => '/etc/sentry.conf.py',
 }
 
 service { 'sentry':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I486b55d0ea9f3c2a3d9d222379c2e1c8363d7a39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Update for changes in OOjs UI (Ib40e3477) - change (mediawiki...MobileFrontend)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Update for changes in OOjs UI (Ib40e3477)
..


Update for changes in OOjs UI (Ib40e3477)

I can't make head or tails of this code. Adding this line seems to
prevent big regressions, but the sizes of things still change very
slightly, inexplicably. Various "reset" styles make this really hard
to debug and this is probably good enough, so I won't bother.

Bug: T91152
Change-Id: I3f61231162f2963cc16cee9d0249dbb56fb84cf0
---
M less/modules/editor/VisualEditorOverlay.less
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/less/modules/editor/VisualEditorOverlay.less 
b/less/modules/editor/VisualEditorOverlay.less
index c4e9e53..2e2e325 100644
--- a/less/modules/editor/VisualEditorOverlay.less
+++ b/less/modules/editor/VisualEditorOverlay.less
@@ -82,6 +82,7 @@
@targetIconSize: 32px;
.overlay-header-container {
.toolbar {
+   font-size: 0.8em;
border-left: 1px solid @grayLight;
// Expand the toolbar as wide as possible to limit the 
size of the
// overlay-action. (Both are displayed as table-cells.)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f61231162f2963cc16cee9d0249dbb56fb84cf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
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] Removed cruft lower case wikipedia folder reference. - change (apps...wikipedia)

2015-04-23 Thread Dr0ptp4kt (Code Review)

Dr0ptp4kt has submitted this change and it was merged.

Change subject: Removed cruft lower case wikipedia folder reference.
..


Removed cruft lower case wikipedia folder reference.

Change-Id: Id49d8744b397e55fff5f3233b4d4daac04a52259
---
R Wikipedia/Categories/BITHockeyManager+WMFExtensions.h
R Wikipedia/Categories/BITHockeyManager+WMFExtensions.m
M Wikipedia/eo.lproj/Localizable.strings
D wikipedia/eo.lproj/Localizable.strings
4 files changed, 2 insertions(+), 169 deletions(-)

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



diff --git a/wikipedia/Categories/BITHockeyManager+WMFExtensions.h 
b/Wikipedia/Categories/BITHockeyManager+WMFExtensions.h
similarity index 100%
rename from wikipedia/Categories/BITHockeyManager+WMFExtensions.h
rename to Wikipedia/Categories/BITHockeyManager+WMFExtensions.h
diff --git a/wikipedia/Categories/BITHockeyManager+WMFExtensions.m 
b/Wikipedia/Categories/BITHockeyManager+WMFExtensions.m
similarity index 100%
rename from wikipedia/Categories/BITHockeyManager+WMFExtensions.m
rename to Wikipedia/Categories/BITHockeyManager+WMFExtensions.m
diff --git a/Wikipedia/eo.lproj/Localizable.strings 
b/Wikipedia/eo.lproj/Localizable.strings
index 17b4728..c3363d8 100644
--- a/Wikipedia/eo.lproj/Localizable.strings
+++ b/Wikipedia/eo.lproj/Localizable.strings
@@ -90,6 +90,7 @@
 "navbar-title-mode-edit-wikitext-preview" = "Antaŭrigardi";
 "navbar-title-mode-edit-wikitext-summary" = "Priskribu vian redakton";
 "navbar-title-mode-edit-wikitext-save" = "Konservi";
+// Fuzzy
 "edit-summary-choice-linked-words" = "Aldonis ligilojn";
 "edit-summary-choice-fixed-grammar" = "Ĝustigis gramatikon";
 "edit-summary-choice-fixed-styling" = "Ĝustigis stilon";
@@ -98,6 +99,7 @@
 "edit-summary-choice-added-missing-info" = "Aldonis mankantan informon";
 "edit-summary-choice-added-clarification" = "Aldonis klarigon";
 "edit-summary-choice-other" = "Alia";
+// Fuzzy
 "edit-summary-field-placeholder-text" = "Aliaj manieroj en kiuj vi plibonigis 
la artikolon";
 "edit-summary-title" = "Kiel vi plibonigis la artikolon?";
 "about-title" = "Pri";
diff --git a/wikipedia/eo.lproj/Localizable.strings 
b/wikipedia/eo.lproj/Localizable.strings
deleted file mode 100644
index c3363d8..000
--- a/wikipedia/eo.lproj/Localizable.strings
+++ /dev/null
@@ -1,169 +0,0 @@
-// Messages for Esperanto (Esperanto)
-// Exported from translatewiki.net
-// Author: Fitoschido
-// Author: KuboF
-// Author: Remux
-
-"article-languages-label" = "Elekti lingvon";
-"article-languages-cancel" = "Nuligi";
-"article-languages-downloading" = "Ŝarĝante lingvojn de la artikolo...";
-"article-languages-filter-placeholder" = "Lingva filtrilo";
-"article-read-more-title" = "Legi plu";
-"info-box-title" = "Rapidaj faktoj";
-"info-box-close-text" = "Fermi";
-"language-button-text" = "Vi povas legi ĉi tiun artikolon en %d aliaj lingvoj";
-"history-label" = "Lastaj";
-"history-section-today" = "Hodiaŭ";
-"history-section-yesterday" = "Hieraŭ";
-"history-section-lastweek" = "Lasta semajno";
-"history-section-lastmonth" = "Lasta monato";
-"history-clear-cancel" = "Nuligi";
-"history-clear-delete-all" = "Forigi ĉion";
-"zero-interstitial-title" = "Forlasante Vikipedio Zero";
-"zero-interstitial-continue" = "Foriri";
-"zero-interstitial-cancel" = "Resti ĉi tie";
-"zero-learn-more-learn-more" = "Legi plu";
-"zero-learn-more-no-thanks" = "Elimini";
-"zero-wikipedia-zero-heading" = "Vikipedio Zero";
-"zero-warn-when-leaving" = "Avertu kiam forlasi Vikipedio Zero";
-"account-creation-logging-in" = "Ensalutante...";
-"account-creation-saving" = "Konservante...";
-"account-creation-login" = "Ĉu vi jam havas konton? Ensalutu.";
-"account-creation-username-placeholder-text" = "Uzantnomo";
-"account-creation-password-placeholder-text" = "Pasvorto";
-"account-creation-password-confirm-placeholder-text" = "Konfirmu pasvorton";
-"account-creation-email-placeholder-text" = "Retpoŝto (Malnepra)";
-"account-creation-missing-fields" = "Vi devas enigi uzantnomon, pasvorton, kaj 
konfirmi vian pasvorton por krei konton.";
-"login-name-not-found" = "Uzantnomo nepras por ensaluti.";
-"login-name-illegal" = "Vi enigis ne-akcepteblan uzantnomon.";
-"login-name-does-not-exist" = "La uzantnomo enigita ne ekzistas.";
-"login-password-empty" = "Pasvorto nepras por ensaluti.";
-"login-password-wrong" = "La enigita pasvorto estas malĝusta.";
-"login-username-placeholder-text" = "Uzantnomo";
-"login-password-placeholder-text" = "Pasvorto";
-"wikitext-downloading" = "Ŝarĝante enhavon...";
-"wikitext-download-success" = "Enhavo ŝarĝita.";
-"wikitext-upload-save" = "Konservante...";
-"wikitext-upload-save-sign-in" = "Ensaluti";
-"wikitext-upload-save-anonymously" = "Konservi anonime";
-"wikitext-upload-save-terms-name" = "Uzkondiĉoj";
-"wikitext-upload-save-license-name" = "CC BY-SA 3.0";
-"open-link-title" = "Malfermi ligilon";
-"open-link-cancel" = "Nuligi";
-"search-searching" = "Serĉante...";
-"

[MediaWiki-commits] [Gerrit] Revert "Make ircecho deduplicate statuses on all lines in bu... - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Revert "Make ircecho deduplicate statuses on all lines in 
buffer"
..


Revert "Make ircecho deduplicate statuses on all lines in buffer"

This reverts commit f7d347cbbb7e7c9c1ecfc8e1aeda8a29c35d076c.

Change-Id: Ieee24ccd4d661d42333ab840ad5a7bffc03c9ebe
---
M modules/ircecho/files/ircecho
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ircecho/files/ircecho b/modules/ircecho/files/ircecho
index 051a981..523a072 100755
--- a/modules/ircecho/files/ircecho
+++ b/modules/ircecho/files/ircecho
@@ -140,7 +140,7 @@
 class EventHandler(pyinotify.ProcessEvent):
def process_IN_MODIFY(self, event):
s = reader.readfile(event.pathname)
-   s = '\n'.join(beautify_message(m) for m in s.split('\n') if m)
+   s = beautify_message(s)
if s:
chans = reader.getchannels(event.pathname)
try:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieee24ccd4d661d42333ab840ad5a7bffc03c9ebe
Gerrit-PatchSet: 1
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] Revert "Make ircecho deduplicate statuses on all lines in bu... - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: Revert "Make ircecho deduplicate statuses on all lines in 
buffer"
..

Revert "Make ircecho deduplicate statuses on all lines in buffer"

This reverts commit f7d347cbbb7e7c9c1ecfc8e1aeda8a29c35d076c.

Change-Id: Ieee24ccd4d661d42333ab840ad5a7bffc03c9ebe
---
M modules/ircecho/files/ircecho
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ircecho/files/ircecho b/modules/ircecho/files/ircecho
index 051a981..523a072 100755
--- a/modules/ircecho/files/ircecho
+++ b/modules/ircecho/files/ircecho
@@ -140,7 +140,7 @@
 class EventHandler(pyinotify.ProcessEvent):
def process_IN_MODIFY(self, event):
s = reader.readfile(event.pathname)
-   s = '\n'.join(beautify_message(m) for m in s.split('\n') if m)
+   s = beautify_message(s)
if s:
chans = reader.getchannels(event.pathname)
try:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieee24ccd4d661d42333ab840ad5a7bffc03c9ebe
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] Update MobileFrontend to cherry-picks - change (mediawiki/core)

2015-04-23 Thread Robmoen (Code Review)

Robmoen has uploaded a new change for review.

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

Change subject: Update MobileFrontend to cherry-picks
..

Update MobileFrontend to cherry-picks

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/206328/1

diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index 5f35b2f..f27403a 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit 5f35b2f27fb669081e09a77ba9e7a568a695a611
+Subproject commit f27403a3016f8d31b9d0a14a0b035730cdff3235

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fe0ebb5c3b13ca9d993dc3d31e7843d9f0169d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Robmoen 

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

[MediaWiki-commits] [Gerrit] Update MobileFrontend to cherry-picks - change (mediawiki/core)

2015-04-23 Thread Robmoen (Code Review)

Robmoen has submitted this change and it was merged.

Change subject: Update MobileFrontend to cherry-picks
..


Update MobileFrontend to cherry-picks

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

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



diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index 5f35b2f..f27403a 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit 5f35b2f27fb669081e09a77ba9e7a568a695a611
+Subproject commit f27403a3016f8d31b9d0a14a0b035730cdff3235

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fe0ebb5c3b13ca9d993dc3d31e7843d9f0169d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Robmoen 
Gerrit-Reviewer: Robmoen 
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 give up immediately for revid mismatches on second load - change (mediawiki...VisualEditor)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Don't give up immediately for revid mismatches on second load
..


Don't give up immediately for revid mismatches on second load

If a load failed due to a revid mismatch, and a new attempt then
succeeded, we would keep remembering that it initially failed.
Then when we loaded the editor a second time, encountering
a revid mismatch would cause us to give up immediately.

To fix this, forget about any previous failures once
a load succeeds.

Bug: T97069
Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
(cherry picked from commit 7a29cf3dbfb5bb7031dd10db6b12c3fc1df661ef)
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index f9cf8de..f778685 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -383,6 +383,10 @@
this.load();
}
return;
+   } else {
+   // Set this to false after a successful load, so we 
don't immediately give up
+   // if a subsequent load mismatches again
+   this.retriedRevIdConflict = false;
}
 
// Populate link cache

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Catrope 
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] Don't give up immediately for revid mismatches on second load - change (mediawiki...VisualEditor)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Don't give up immediately for revid mismatches on second load
..


Don't give up immediately for revid mismatches on second load

If a load failed due to a revid mismatch, and a new attempt then
succeeded, we would keep remembering that it initially failed.
Then when we loaded the editor a second time, encountering
a revid mismatch would cause us to give up immediately.

To fix this, forget about any previous failures once
a load succeeds.

Bug: T97069
Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
(cherry picked from commit 7a29cf3dbfb5bb7031dd10db6b12c3fc1df661ef)
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 282f2c9..8157055 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -383,6 +383,10 @@
this.load();
}
return;
+   } else {
+   // Set this to false after a successful load, so we 
don't immediately give up
+   // if a subsequent load mismatches again
+   this.retriedRevIdConflict = false;
}
 
// Populate link cache

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Catrope 
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] Don't pass empty message text to strpos - change (mediawiki...MobileFrontend)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Don't pass empty message text to strpos
..


Don't pass empty message text to strpos

Bug: T97050
Change-Id: I2cb6ddb306ca1b0029fc452b7caf0587246b4fb5
(cherry picked from commit 6b5a381dd4accb38cfa0ac7d8a8a4254d83a4a68)
---
M includes/skins/SkinMinerva.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 705250e..ce5b576 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1166,7 +1166,13 @@
// for plural support we need the info, if there is one or more 
licenses used in the license text
// this check if very simple and works on the base, that more 
than one license will
// use "and" as a connective
-   $isPlural = ( strpos( $rightsText, wfMessage( 'and' )->text() ) 
=== false ? 1 : 2 );
+   // 1 - no plural
+   // 2 - plural
+   $delimiterMsg = wfMessage( 'and' );
+   // check, if "and" isn't disabled and exists in site language
+   $isPlural = (
+   !$delimiterMsg->isDisabled() && strpos( $rightsText, 
$delimiterMsg->text() ) === false ? 1 : 2
+   );
 
return array(
'link' => $link,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cb6ddb306ca1b0029fc452b7caf0587246b4fb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Robmoen 
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 comm status and error checking for PaymentStatus - change (mediawiki...DonationInterface)

2015-04-23 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Fix comm status and error checking for PaymentStatus
..

Fix comm status and error checking for PaymentStatus

Check for the correct keys and codes in getResponseErrors
Communication status should still be true if response is valid
but indicates something else is wrong.  It should only be false
when the response is malformed or missing.

Bug: T90504
Change-Id: I02dc5496fd1527ffa1cb9d2e56b9e6e71fec7587
---
M astropay_gateway/astropay.adapter.php
M tests/Adapter/Astropay/AstropayTest.php
A tests/includes/Responses/astropay/NewInvoice_notJson.testresponse
3 files changed, 85 insertions(+), 24 deletions(-)


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

diff --git a/astropay_gateway/astropay.adapter.php 
b/astropay_gateway/astropay.adapter.php
index fe3c070..0b06902 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -399,38 +399,67 @@
}
 
function getResponseStatus( $response ) {
-   if ( $response === NULL || !isset( $response['status'] ) ) {
+   if ( $response === NULL ) {
return false;
}
-   return $response['status'] === '0';
+   $valid = false;
+   switch( $this->getCurrentTransaction() ) {
+   case 'NewInvoice':
+   $valid = isset( $response['status'] );
+   break;
+   case 'PaymentStatus':
+   $valid = isset( $response['result'] );
+   break;
+   }
+   return $valid;
}
 
+   // TODO: getResponseErrors should just return the error codes and any 
debug
+   // info, and another function should decide what to display and 
translate it
function getResponseErrors( $response ) {
$logged = false;
$errors = array();
$code = 'internal-';
 
if ( $response === NULL ) {
-   $logged = 'Astropay response was not valid JSON.  Full 
response: ' .
+   $logged = 'Astropay response was not valid.  Full 
response: ' .
$this->getTransactionRawResponse();
$this->logger->error( $logged );
-   } else if ( !isset( $response['status'] ) ) {
-   $logged = 'Astropay response does not have a status 
code.  Full response: ' .
-   $this->getTransactionRawResponse();
-   $this->logger->error( $logged );
-   } else if ( $response['status'] !== '0' ) {
-   $logged = "Astropay response has non-zero status 
{$response['status']}.  ";
-   if ( isset( $response['desc'] ) ) {
-   // They don't give us codes to distinguish 
failure modes, so we
-   // have to parse the description.
-   if ( preg_match( '/invoice already used/i', 
$response['desc'] ) ) {
-   $code = $this::DUPLICATE_ORDER_ID_ERROR;
-   }
-   $logged .= 'Error description: ' . 
$response['desc'];
-   } else {
-   $logged .= 'Full response: ' . 
$this->getTransactionRawResponse();
+   } else {
+   switch( $this->getCurrentTransaction() ) {
+   case 'NewInvoice':
+   if ( !isset( $response['status'] ) ) {
+   $logged = 'Astropay response 
does not have a status code.  Full response: ' .
+   
$this->getTransactionRawResponse();
+   $this->logger->error( $logged );
+   } else if ( $response['status'] !== '0' 
) {
+   $logged = "Astropay response 
has non-zero status {$response['status']}.  ";
+   if ( isset( $response['desc'] ) 
) {
+   // They don't give us 
codes to distinguish failure modes, so we
+   // have to parse the 
description.
+   if ( preg_match( 
'/invoice already used/i', $response['desc'] ) ) {
+   $code = 
$this::DUPLICATE_ORDER_ID_ERROR;
+   }
+

[MediaWiki-commits] [Gerrit] Don't give up immediately for revid mismatches on second load - change (mediawiki...VisualEditor)

2015-04-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Don't give up immediately for revid mismatches on second load
..

Don't give up immediately for revid mismatches on second load

If a load failed due to a revid mismatch, and a new attempt then
succeeded, we would keep remembering that it initially failed.
Then when we loaded the editor a second time, encountering
a revid mismatch would cause us to give up immediately.

To fix this, forget about any previous failures once
a load succeeds.

Bug: T97069
Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
(cherry picked from commit 7a29cf3dbfb5bb7031dd10db6b12c3fc1df661ef)
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index f9cf8de..f778685 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -383,6 +383,10 @@
this.load();
}
return;
+   } else {
+   // Set this to false after a successful load, so we 
don't immediately give up
+   // if a subsequent load mismatches again
+   this.retriedRevIdConflict = false;
}
 
// Populate link cache

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf2
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Don't give up immediately for revid mismatches on second load - change (mediawiki...VisualEditor)

2015-04-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Don't give up immediately for revid mismatches on second load
..

Don't give up immediately for revid mismatches on second load

If a load failed due to a revid mismatch, and a new attempt then
succeeded, we would keep remembering that it initially failed.
Then when we loaded the editor a second time, encountering
a revid mismatch would cause us to give up immediately.

To fix this, forget about any previous failures once
a load succeeds.

Bug: T97069
Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
(cherry picked from commit 7a29cf3dbfb5bb7031dd10db6b12c3fc1df661ef)
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 282f2c9..8157055 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -383,6 +383,10 @@
this.load();
}
return;
+   } else {
+   // Set this to false after a successful load, so we 
don't immediately give up
+   // if a subsequent load mismatches again
+   this.retriedRevIdConflict = false;
}
 
// Populate link cache

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie10a7532759095cbb5fb8d23af602aa7b9611a06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Update Mobilefrontend to cherry pick - change (mediawiki/core)

2015-04-23 Thread Robmoen (Code Review)

Robmoen has submitted this change and it was merged.

Change subject: Update Mobilefrontend to cherry pick
..


Update Mobilefrontend to cherry pick

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

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



diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index 2cb4084..1ab0377 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit 2cb408472df7fea3e66536f4b35d26f858da4481
+Subproject commit 1ab0377c2c0676f365b0244d797b84678a327bae

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie40c7fc00711b4cad908183b2f69806720161a94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Robmoen 
Gerrit-Reviewer: Robmoen 
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 type hint in ViolationLookup - change (mediawiki...WikidataQuality)

2015-04-23 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Fix type hint in ViolationLookup
..

Fix type hint in ViolationLookup

Change-Id: I181cbddc8f01fa363d3f82da873efb7374e4aa4a
---
M includes/Violations/ViolationLookup.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/Violations/ViolationLookup.php 
b/includes/Violations/ViolationLookup.php
index 72ff228..4aa8700 100644
--- a/includes/Violations/ViolationLookup.php
+++ b/includes/Violations/ViolationLookup.php
@@ -21,7 +21,7 @@
private $db;
 
/**
-* @param array $conditions
+* @param ViolationQuery $violationQuery
 *
 * @return array of Violations|null
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I181cbddc8f01fa363d3f82da873efb7374e4aa4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] Update Mobilefrontend to cherry pick - change (mediawiki/core)

2015-04-23 Thread Robmoen (Code Review)

Robmoen has uploaded a new change for review.

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

Change subject: Update Mobilefrontend to cherry pick
..

Update Mobilefrontend to cherry pick

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/206324/1

diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index 2cb4084..1ab0377 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit 2cb408472df7fea3e66536f4b35d26f858da4481
+Subproject commit 1ab0377c2c0676f365b0244d797b84678a327bae

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie40c7fc00711b4cad908183b2f69806720161a94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Robmoen 

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

[MediaWiki-commits] [Gerrit] Bump Flow for: - change (mediawiki/core)

2015-04-23 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Bump Flow for:
..

Bump Flow for:

Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow changes
588325397f9f692233f2c18afb0fde419828549b

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/206322/1

diff --git a/extensions/Flow b/extensions/Flow
index 5f84033..5883253 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 5f840338bb183c311c2af73300f80d27f4977962
+Subproject commit 588325397f9f692233f2c18afb0fde419828549b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9d470db1e59ad74f8c35bb03c35b09f7765bb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Correctly display Flow in RTL interface and content - change (mediawiki...Flow)

2015-04-23 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Correctly display Flow in RTL interface and content
..

Correctly display Flow in RTL interface and content

There are two types of directionalities Flow should adhere to -
content language and interface language. CSSJanus flips directions
dependent on interface language, but some of those operatiosn are
not correct, since they are content-dependent. For instance, the
topic subject is content-dependent regardless of the interface.

For those content dependent casees, make sure the display flips
between content directionalities and add @noflip rules so that
CSSJanus does not touch those regardless of interface.

On top of that there are several elements that should flip for
interface values, like the flow-board-navigation elements. For
those to work properly we have to add LTR rules so CSSJanus flips
those in RTL.

Bug: T95717
Change-Id: I5e8112b2259cbc8badf2b3ce93b53b38b0ade319
---
M modules/styles/board/menu.less
M modules/styles/board/navigation.less
M modules/styles/board/terms-of-use.less
M modules/styles/board/topic/post.less
M modules/styles/board/topic/titlebar.less
M modules/styles/board/topic/watchlist.less
M modules/styles/common.less
7 files changed, 191 insertions(+), 44 deletions(-)


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

diff --git a/modules/styles/board/menu.less b/modules/styles/board/menu.less
index 5aa8ce2..16ef1d2 100644
--- a/modules/styles/board/menu.less
+++ b/modules/styles/board/menu.less
@@ -8,7 +8,6 @@
top: 0;
clear: both;
position: static;
-   right: 0;
bottom: 0;
 
ul {
@@ -31,6 +30,18 @@
.flow-menu-js-drop {
display: none;
}
+}
+
+// Correctly display positions based on content language
+div#content .mw-content-ltr .flow-menu {
+   /* @noflip */
+   right: 0;
+}
+
+// Correctly display positions based on content language
+div#content .mw-content-rtl .flow-menu {
+   /* @noflip */
+   left: 0;
 }
 
 div.flow-menu-inverted {
@@ -114,7 +125,6 @@
// This is the menu opener handler; it contains an anchor which 
triggers the menu in touch devices, without JS
.flow-menu-js-drop {
display: block;
-   text-align: right;
text-indent: 0;
cursor: pointer;
 
@@ -136,6 +146,19 @@
}
 }
 
+// Correct positioning for ltr/rtl content direction
+div#content .mw-content-ltr div > .flow-menu .flow-menu-js-drop {
+   /* @noflip */
+   text-align: right;
+}
+
+// Correct positioning for ltr/rtl content direction
+div#content .mw-content-rtl div > .flow-menu .flow-menu-js-drop {
+   /* @noflip */
+   text-align: left;
+}
+
+
 // @todo move this
 div.flow-post > .flow-menu {
.flow-menu-js-drop {
diff --git a/modules/styles/board/navigation.less 
b/modules/styles/board/navigation.less
index 9641992..784fbe0 100644
--- a/modules/styles/board/navigation.less
+++ b/modules/styles/board/navigation.less
@@ -15,11 +15,25 @@
padding: 0.2em 0.3em;
}
 
+   // We need these because CSSJanus will flip it in rtl
+   a.flow-board-navigator-first {
+   float: left;
+   position: static;
+   }
+
a.flow-board-navigator-last {
float: right;
position: static;
}
 
+   a.flow-board-navigator-first .wikiglyph {
+   float: left;
+   }
+
+   a.flow-board-navigator-last .wikiglyph {
+   float: right;
+   }
+
.flow-board-navigation-inner {
overflow: hidden;
border-bottom: 1px solid @colorGrayLight;
diff --git a/modules/styles/board/terms-of-use.less 
b/modules/styles/board/terms-of-use.less
index 7aa0ef6..f1dbd19 100644
--- a/modules/styles/board/terms-of-use.less
+++ b/modules/styles/board/terms-of-use.less
@@ -13,6 +13,9 @@
color: @colorTextLight;
font-size: .75em;
line-height: 1.4;
+   // These two will flip in RTL inerface
+   text-align: left;
+   direction: ltr;
 }
 
 @media all and (min-width: @wgFlowDeviceWidthTablet) {
diff --git a/modules/styles/board/topic/post.less 
b/modules/styles/board/topic/post.less
index aba5c5b..8afd0bb 100644
--- a/modules/styles/board/topic/post.less
+++ b/modules/styles/board/topic/post.less
@@ -18,47 +18,8 @@
 
 .flow-post {
position: relative;
-   margin: .5em 0 0 .75em;
-   padding: 0 .5em 0 0;
color: @colorText;
word-wrap: break-word;
-
-   // Nested comments (replies & reply forms)
-   .flow-replies {
-   margin-left: @topicIndent;
-   padding-left: 0.5em;
-   border-left: 1px dotted @colorGrayLighter;
-   }
-
-   &.flow-post-max-depth .flow-replies {
-

[MediaWiki-commits] [Gerrit] Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow... - change (mediawiki...Flow)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow 
changes
..


Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow changes

Bug: T96325
Change-Id: I6c9056f03ae8e2770e19e5b2876a0f6c50fd8b81
(cherry picked from commit 2d92aae7437cc769563bedd033d993734201fea0)
---
M container.php
M includes/Import/Importer.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M maintenance/convertToText.php
M tests/phpunit/Import/TalkpageImportOperationTest.php
6 files changed, 38 insertions(+), 44 deletions(-)

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



diff --git a/container.php b/container.php
index 5077e4e..8e97dcb 100644
--- a/container.php
+++ b/container.php
@@ -1195,7 +1195,8 @@
$c['factory.loader.workflow'],
$c['memcache.buffered'],
$c['db.factory'],
-   $c['deferred_queue']
+   $c['deferred_queue'],
+   $c['occupation_controller']
);
 
$importer->addPostprocessor( new 
Flow\Import\Postprocessor\SpecialLogTopic(
diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php
index 20fa46f..740eeb4 100644
--- a/includes/Import/Importer.php
+++ b/includes/Import/Importer.php
@@ -2,6 +2,7 @@
 
 namespace Flow\Import;
 
+use Article;
 use DeferredUpdates;
 use Flow\Data\BufferedCache;
 use Flow\Data\ManagerGroup;
@@ -15,6 +16,7 @@
 use Flow\Model\TopicListEntry;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
+use Flow\OccupationController;
 use Flow\WorkflowLoaderFactory;
 use IP;
 use MWCryptRand;
@@ -48,13 +50,16 @@
protected $postprocessors;
/** @var SplQueue Callbacks for DeferredUpdate that are queue'd up by 
the commit process */
protected $deferredQueue;
+   /** @var OccupationController */
+   protected $occupationController;
 
public function __construct(
ManagerGroup $storage,
WorkflowLoaderFactory $workflowLoaderFactory,
BufferedCache $cache,
DbFactory $dbFactory,
-   SplQueue $deferredQueue
+   SplQueue $deferredQueue,
+   OccupationController $occupationController
) {
$this->storage = $storage;
$this->workflowLoaderFactory = $workflowLoaderFactory;
@@ -62,6 +67,7 @@
$this->dbFactory = $dbFactory;
$this->postprocessors = new ProcessorGroup;
$this->deferredQueue = $deferredQueue;
+   $this->occupationController = $occupationController;
}
 
public function addPostprocessor( Postprocessor $proc ) {
@@ -103,8 +109,8 @@
 * @return bool True When the import completes with no failures
 */
public function import( IImportSource $source, Title $targetPage, 
ImportSourceStore $sourceStore ) {
-   $operation = new TalkpageImportOperation( $source );
-   return $operation->import( new PageImportState(
+   $operation = new TalkpageImportOperation( $source, 
$this->occupationController );
+   $pageImportState = new PageImportState(
$this->workflowLoaderFactory
->createWorkflowLoader( $targetPage )
->getWorkflow(),
@@ -116,7 +122,8 @@
$this->postprocessors,
$this->deferredQueue,
$this->allowUnknownUsernames
-   ) );
+   );
+   return $operation->import( $pageImportState );
}
 }
 
@@ -495,11 +502,15 @@
 */
protected $importSource;
 
+   /** @var OccupationController */
+   protected $occupationController;
+
/**
 * @param IImportSource $source
 */
-   public function __construct( IImportSource $source ) {
+   public function __construct( IImportSource $source, 
OccupationController $occupationController ) {
$this->importSource = $source;
+   $this->occupationController = $occupationController;
}
 
/**
@@ -509,8 +520,17 @@
 * @throws \Exception
 */
public function import( PageImportState $state ) {
-   $state->logger->info( 'Importing to ' . 
$state->boardWorkflow->getArticleTitle()->getPrefixedText() );
+   $destinationTitle = $state->boardWorkflow->getArticleTitle();
+   $state->logger->info( 'Importing to ' . 
$destinationTitle->getPrefixedText() );
if ( $state->boardWorkflow->isNew() ) {
+   $this->occupationController->allowCreation(
+   $destinationTitle,
+   
$this->occupationController->getTalkpageManage

[MediaWiki-commits] [Gerrit] Don't pass empty message text to strpos - change (mediawiki...MobileFrontend)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Don't pass empty message text to strpos
..


Don't pass empty message text to strpos

Bug: T97050
Change-Id: I2cb6ddb306ca1b0029fc452b7caf0587246b4fb5
(cherry picked from commit 6b5a381dd4accb38cfa0ac7d8a8a4254d83a4a68)
---
M includes/skins/SkinMinerva.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 403e530..f293686 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1168,7 +1168,13 @@
// for plural support we need the info, if there is one or more 
licenses used in the license text
// this check if very simple and works on the base, that more 
than one license will
// use "and" as a connective
-   $isPlural = ( strpos( $rightsText, wfMessage( 'and' )->text() ) 
=== false ? 1 : 2 );
+   // 1 - no plural
+   // 2 - plural
+   $delimiterMsg = wfMessage( 'and' );
+   // check, if "and" isn't disabled and exists in site language
+   $isPlural = (
+   !$delimiterMsg->isDisabled() && strpos( $rightsText, 
$delimiterMsg->text() ) === false ? 1 : 2
+   );
 
return array(
'link' => $link,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cb6ddb306ca1b0029fc452b7caf0587246b4fb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Robmoen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Load HTML directly from RESTBase on all wikipedias - change (operations/mediawiki-config)

2015-04-23 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Load HTML directly from RESTBase on all wikipedias
..

Load HTML directly from RESTBase on all wikipedias

Bug: T95229
Change-Id: I83490d648817530fa2783a339747faa8ef38654d
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1744f7d..c7d5279 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12350,7 +12350,7 @@
'testwiki' => true,
'test2wiki' => true,
'testwikidatawiki' => true,
-   'enwiki' => true,
+   'wikipedia' => true,
 ),
 
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces

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

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

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

[MediaWiki-commits] [Gerrit] Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow... - change (mediawiki...Flow)

2015-04-23 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow 
changes
..

Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow changes

Bug: T96325
Change-Id: I6c9056f03ae8e2770e19e5b2876a0f6c50fd8b81
(cherry picked from commit 2d92aae7437cc769563bedd033d993734201fea0)
---
M container.php
M includes/Import/Importer.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M maintenance/convertToText.php
M tests/phpunit/Import/TalkpageImportOperationTest.php
6 files changed, 38 insertions(+), 44 deletions(-)


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

diff --git a/container.php b/container.php
index 5077e4e..8e97dcb 100644
--- a/container.php
+++ b/container.php
@@ -1195,7 +1195,8 @@
$c['factory.loader.workflow'],
$c['memcache.buffered'],
$c['db.factory'],
-   $c['deferred_queue']
+   $c['deferred_queue'],
+   $c['occupation_controller']
);
 
$importer->addPostprocessor( new 
Flow\Import\Postprocessor\SpecialLogTopic(
diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php
index 20fa46f..740eeb4 100644
--- a/includes/Import/Importer.php
+++ b/includes/Import/Importer.php
@@ -2,6 +2,7 @@
 
 namespace Flow\Import;
 
+use Article;
 use DeferredUpdates;
 use Flow\Data\BufferedCache;
 use Flow\Data\ManagerGroup;
@@ -15,6 +16,7 @@
 use Flow\Model\TopicListEntry;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
+use Flow\OccupationController;
 use Flow\WorkflowLoaderFactory;
 use IP;
 use MWCryptRand;
@@ -48,13 +50,16 @@
protected $postprocessors;
/** @var SplQueue Callbacks for DeferredUpdate that are queue'd up by 
the commit process */
protected $deferredQueue;
+   /** @var OccupationController */
+   protected $occupationController;
 
public function __construct(
ManagerGroup $storage,
WorkflowLoaderFactory $workflowLoaderFactory,
BufferedCache $cache,
DbFactory $dbFactory,
-   SplQueue $deferredQueue
+   SplQueue $deferredQueue,
+   OccupationController $occupationController
) {
$this->storage = $storage;
$this->workflowLoaderFactory = $workflowLoaderFactory;
@@ -62,6 +67,7 @@
$this->dbFactory = $dbFactory;
$this->postprocessors = new ProcessorGroup;
$this->deferredQueue = $deferredQueue;
+   $this->occupationController = $occupationController;
}
 
public function addPostprocessor( Postprocessor $proc ) {
@@ -103,8 +109,8 @@
 * @return bool True When the import completes with no failures
 */
public function import( IImportSource $source, Title $targetPage, 
ImportSourceStore $sourceStore ) {
-   $operation = new TalkpageImportOperation( $source );
-   return $operation->import( new PageImportState(
+   $operation = new TalkpageImportOperation( $source, 
$this->occupationController );
+   $pageImportState = new PageImportState(
$this->workflowLoaderFactory
->createWorkflowLoader( $targetPage )
->getWorkflow(),
@@ -116,7 +122,8 @@
$this->postprocessors,
$this->deferredQueue,
$this->allowUnknownUsernames
-   ) );
+   );
+   return $operation->import( $pageImportState );
}
 }
 
@@ -495,11 +502,15 @@
 */
protected $importSource;
 
+   /** @var OccupationController */
+   protected $occupationController;
+
/**
 * @param IImportSource $source
 */
-   public function __construct( IImportSource $source ) {
+   public function __construct( IImportSource $source, 
OccupationController $occupationController ) {
$this->importSource = $source;
+   $this->occupationController = $occupationController;
}
 
/**
@@ -509,8 +520,17 @@
 * @throws \Exception
 */
public function import( PageImportState $state ) {
-   $state->logger->info( 'Importing to ' . 
$state->boardWorkflow->getArticleTitle()->getPrefixedText() );
+   $destinationTitle = $state->boardWorkflow->getArticleTitle();
+   $state->logger->info( 'Importing to ' . 
$destinationTitle->getPrefixedText() );
if ( $state->boardWorkflow->isNew() ) {
+   $this->occupationController->allowCreation(
+   $destinationTitle,
+

[MediaWiki-commits] [Gerrit] [roundtrip-test] Strip from HTML when comparing wikite... - change (mediawiki...parsoid)

2015-04-23 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: [roundtrip-test] Strip  from HTML when comparing wikitext 
diffs
..

[roundtrip-test] Strip  from HTML when comparing wikitext diffs

*  are always added by Parsoid when multiple newlines are
  encountered in wikitext. So, they are not really semantic diffs
  but more semantic diffs.

* Stripping these during normalization makes for better categorization
  of diffs seen in rt-testing.

* Unsure if these should be part of the regular HTML normalization
  routines, so not adding there.

* Eliminates false-positive reports on the following pages:
nlwiki:Watergang
iswiki:Fyrsta_ráðuneyti_Geirs_Haarde
iswiki:Jón_Vídalín
  and possibly more.

Change-Id: I2097301920d5f1fc5c2cec5150090479ff08a8ad
---
M tests/roundtrip-test.js
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index ae192f1..7fbb85f 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -454,7 +454,8 @@
// node need not be an element always!
origOrigHTML += DU.serializeNode(origOut[k], { 
smartQuote: false });
}
-   origHTML = DU.formatHTML(DU.normalizeOut(origOrigHTML));
+   // Normalize away 's added by Parsoid because of newlines 
in wikitext
+   origHTML = 
DU.formatHTML(DU.normalizeOut(origOrigHTML.replace(//g, '')));
 
res = findMatchingNodes(newBody, offset[1] || {}, newWt.length);
newOut = res ? res.nodes : [];
@@ -462,7 +463,8 @@
// node need not be an element always!
origNewHTML += DU.serializeNode(newOut[k], { 
smartQuote: false });
}
-   newHTML = DU.formatHTML(DU.normalizeOut(origNewHTML));
+   // Normalize away 's added by Parsoid because of newlines 
in wikitext
+   newHTML = 
DU.formatHTML(DU.normalizeOut(origNewHTML.replace(//g, '')));
 
// compute wt diffs
var wt1 = oldWt.substring(offset[0].start, offset[0].end);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2097301920d5f1fc5c2cec5150090479ff08a8ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] Load HTML directly from RESTBase for enwiki - change (operations/mediawiki-config)

2015-04-23 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Load HTML directly from RESTBase for enwiki
..

Load HTML directly from RESTBase for enwiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 06913b4..1744f7d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12350,6 +12350,7 @@
'testwiki' => true,
'test2wiki' => true,
'testwikidatawiki' => true,
+   'enwiki' => true,
 ),
 
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces

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

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

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

[MediaWiki-commits] [Gerrit] Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow... - change (mediawiki...Flow)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow 
changes
..


Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow changes

Bug: T96325
Change-Id: I6c9056f03ae8e2770e19e5b2876a0f6c50fd8b81
---
M container.php
M includes/Import/Importer.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M maintenance/convertToText.php
M tests/phpunit/Import/TalkpageImportOperationTest.php
6 files changed, 38 insertions(+), 44 deletions(-)

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



diff --git a/container.php b/container.php
index ed3bd1a..cb286b4 100644
--- a/container.php
+++ b/container.php
@@ -1189,7 +1189,8 @@
$c['factory.loader.workflow'],
$c['memcache.buffered'],
$c['db.factory'],
-   $c['deferred_queue']
+   $c['deferred_queue'],
+   $c['occupation_controller']
);
 
$importer->addPostprocessor( new 
Flow\Import\Postprocessor\SpecialLogTopic(
diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php
index 20fa46f..740eeb4 100644
--- a/includes/Import/Importer.php
+++ b/includes/Import/Importer.php
@@ -2,6 +2,7 @@
 
 namespace Flow\Import;
 
+use Article;
 use DeferredUpdates;
 use Flow\Data\BufferedCache;
 use Flow\Data\ManagerGroup;
@@ -15,6 +16,7 @@
 use Flow\Model\TopicListEntry;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
+use Flow\OccupationController;
 use Flow\WorkflowLoaderFactory;
 use IP;
 use MWCryptRand;
@@ -48,13 +50,16 @@
protected $postprocessors;
/** @var SplQueue Callbacks for DeferredUpdate that are queue'd up by 
the commit process */
protected $deferredQueue;
+   /** @var OccupationController */
+   protected $occupationController;
 
public function __construct(
ManagerGroup $storage,
WorkflowLoaderFactory $workflowLoaderFactory,
BufferedCache $cache,
DbFactory $dbFactory,
-   SplQueue $deferredQueue
+   SplQueue $deferredQueue,
+   OccupationController $occupationController
) {
$this->storage = $storage;
$this->workflowLoaderFactory = $workflowLoaderFactory;
@@ -62,6 +67,7 @@
$this->dbFactory = $dbFactory;
$this->postprocessors = new ProcessorGroup;
$this->deferredQueue = $deferredQueue;
+   $this->occupationController = $occupationController;
}
 
public function addPostprocessor( Postprocessor $proc ) {
@@ -103,8 +109,8 @@
 * @return bool True When the import completes with no failures
 */
public function import( IImportSource $source, Title $targetPage, 
ImportSourceStore $sourceStore ) {
-   $operation = new TalkpageImportOperation( $source );
-   return $operation->import( new PageImportState(
+   $operation = new TalkpageImportOperation( $source, 
$this->occupationController );
+   $pageImportState = new PageImportState(
$this->workflowLoaderFactory
->createWorkflowLoader( $targetPage )
->getWorkflow(),
@@ -116,7 +122,8 @@
$this->postprocessors,
$this->deferredQueue,
$this->allowUnknownUsernames
-   ) );
+   );
+   return $operation->import( $pageImportState );
}
 }
 
@@ -495,11 +502,15 @@
 */
protected $importSource;
 
+   /** @var OccupationController */
+   protected $occupationController;
+
/**
 * @param IImportSource $source
 */
-   public function __construct( IImportSource $source ) {
+   public function __construct( IImportSource $source, 
OccupationController $occupationController ) {
$this->importSource = $source;
+   $this->occupationController = $occupationController;
}
 
/**
@@ -509,8 +520,17 @@
 * @throws \Exception
 */
public function import( PageImportState $state ) {
-   $state->logger->info( 'Importing to ' . 
$state->boardWorkflow->getArticleTitle()->getPrefixedText() );
+   $destinationTitle = $state->boardWorkflow->getArticleTitle();
+   $state->logger->info( 'Importing to ' . 
$destinationTitle->getPrefixedText() );
if ( $state->boardWorkflow->isNew() ) {
+   $this->occupationController->allowCreation(
+   $destinationTitle,
+   
$this->occupationController->getTalkpageManager()
+   );
+   $this->occupat

[MediaWiki-commits] [Gerrit] Fix flag button, stop unnecessary API request - change (mediawiki...Gather)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Fix flag button, stop unnecessary API request
..


Fix flag button, stop unnecessary API request

Use data attributes and delay API request until action
itself.
This can't go out to production in current form.

Bug: T97076
Change-Id: I3a98d0f5234d2ccb50fff6095f30b9ce52c051ad
---
M includes/views/Collection.php
M resources/ext.gather.special/init.js
2 files changed, 21 insertions(+), 25 deletions(-)

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



diff --git a/includes/views/Collection.php b/includes/views/Collection.php
index 46a2ef5..9b2e381 100644
--- a/includes/views/Collection.php
+++ b/includes/views/Collection.php
@@ -103,6 +103,7 @@
 
/**
 * Get the edit button html if user should edit
+* FIXME: Move this to JavaScript.
 */
public function getEditButtonHtml() {
$id = $this->collection->getId();
@@ -171,7 +172,11 @@
protected function getHtml( $data = array() ) {
$collection = $this->collection;
 
-   $html = Html::openElement( 'div', array( 'class' => 'collection 
content' ) ) .
+   $html = Html::openElement( 'div', array(
+   'class' => 'collection content',
+   'data-id' => $collection->getId(),
+   'data-is-owner' => $collection->isOwner( 
$this->user ) ? true : false,
+   ) ) .
$this->getHeaderHtml( $collection );
 
if ( $collection->getCount() > 0 ) {
diff --git a/resources/ext.gather.special/init.js 
b/resources/ext.gather.special/init.js
index b4a2137..48c352b 100644
--- a/resources/ext.gather.special/init.js
+++ b/resources/ext.gather.special/init.js
@@ -3,25 +3,14 @@
var CollectionsApi = M.require( 'ext.gather.watchstar/CollectionsApi' ),
CollectionFlagOverlay = M.require( 
'ext.gather.flag/CollectionFlagOverlay' ),
Icon = M.require( 'Icon' ),
-   user = M.require( 'user' ),
-   api = new CollectionsApi(),
-   id = window.location.pathname.split( '/' ).pop();
+   api = new CollectionsApi();
 
$( function () {
+   var flagIcon, $flag,
+   $collection = $( '.collection' );
 
-   api.getCollection( id ).done( function ( collection ) {
-   var flagIcon, $flag;
-   if (
-   // No flagging on watchlist
-   collection.id === 0 ||
-   // Don't show icon if user is the collection 
owner
-   collection.owner === user.getName() ||
-   // Only show flag icon in minerva as mobile 
overlays require it
-   mw.config.get( 'skin' ) !== 'minerva'
-   ) {
-   return;
-   }
-
+   // Only apply to mobile skin since EventLogging doesn't run 
there
+   if ( !$collection.data( 'is-owner' ) && mw.config.get( 'skin' ) 
=== 'minerva' ) {
flagIcon = new Icon( {
name: 'collection-flag',
tagName: 'a',
@@ -33,18 +22,20 @@
ev.stopPropagation();
ev.preventDefault();
if ( !$flag.hasClass( 'disabled' ) ) {
-   flagOverlay = new 
CollectionFlagOverlay( {
-   collection: collection
-   } );
-   flagOverlay.show();
-   flagOverlay.on( 'collection-flagged', 
function () {
-   // After flagging, prevent 
click from opening flag confirmation again
-   $flag.addClass( 'disabled' );
+   api.getCollection( $collection.data( 
'id' ) ).done( function ( collection ) {
+   flagOverlay = new 
CollectionFlagOverlay( {
+   collection: collection
+   } );
+   flagOverlay.show();
+   flagOverlay.on( 
'collection-flagged', function () {
+   // After flagging, 
prevent click from opening flag confirmation again
+   $flag.addClass( 
'disabled' );
+

[MediaWiki-commits] [Gerrit] Use /api/rest_v1/ entry point for VE - change (operations/mediawiki-config)

2015-04-23 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Use /api/rest_v1/ entry point for VE
..

Use /api/rest_v1/ entry point for VE

Bug: T95229
Change-Id: I8b1853f2ddae67c98aa5a91907e2894677ed5b52
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 21c4001..916e72a 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -89,7 +89,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://restbase-beta.wmflabs.org/$wgServerName/v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
};
}
 }
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f29cd01..28743f4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2042,7 +2042,7 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL;
-   $wgVisualEditorRestbaseURL = 
"https://rest.wikimedia.org/$wgServerName/v1/page/html/";;
+   $wgVisualEditorRestbaseURL = 
"https://$wgServerName/api/rest_v1/page/html/";;
};
}
 

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

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

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

[MediaWiki-commits] [Gerrit] test - change (apps...wikipedia)

2015-04-23 Thread Mhurd (Code Review)

Mhurd has uploaded a new change for review.

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

Change subject: test
..

test

Change-Id: Id49d8744b397e55fff5f3233b4d4daac04a52259
---
R Wikipedia/Categories/BITHockeyManager+WMFExtensions.h
R Wikipedia/Categories/BITHockeyManager+WMFExtensions.m
M Wikipedia/eo.lproj/Localizable.strings
D wikipedia/eo.lproj/Localizable.strings
4 files changed, 2 insertions(+), 169 deletions(-)


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

diff --git a/wikipedia/Categories/BITHockeyManager+WMFExtensions.h 
b/Wikipedia/Categories/BITHockeyManager+WMFExtensions.h
similarity index 100%
rename from wikipedia/Categories/BITHockeyManager+WMFExtensions.h
rename to Wikipedia/Categories/BITHockeyManager+WMFExtensions.h
diff --git a/wikipedia/Categories/BITHockeyManager+WMFExtensions.m 
b/Wikipedia/Categories/BITHockeyManager+WMFExtensions.m
similarity index 100%
rename from wikipedia/Categories/BITHockeyManager+WMFExtensions.m
rename to Wikipedia/Categories/BITHockeyManager+WMFExtensions.m
diff --git a/Wikipedia/eo.lproj/Localizable.strings 
b/Wikipedia/eo.lproj/Localizable.strings
index 17b4728..c3363d8 100644
--- a/Wikipedia/eo.lproj/Localizable.strings
+++ b/Wikipedia/eo.lproj/Localizable.strings
@@ -90,6 +90,7 @@
 "navbar-title-mode-edit-wikitext-preview" = "Antaŭrigardi";
 "navbar-title-mode-edit-wikitext-summary" = "Priskribu vian redakton";
 "navbar-title-mode-edit-wikitext-save" = "Konservi";
+// Fuzzy
 "edit-summary-choice-linked-words" = "Aldonis ligilojn";
 "edit-summary-choice-fixed-grammar" = "Ĝustigis gramatikon";
 "edit-summary-choice-fixed-styling" = "Ĝustigis stilon";
@@ -98,6 +99,7 @@
 "edit-summary-choice-added-missing-info" = "Aldonis mankantan informon";
 "edit-summary-choice-added-clarification" = "Aldonis klarigon";
 "edit-summary-choice-other" = "Alia";
+// Fuzzy
 "edit-summary-field-placeholder-text" = "Aliaj manieroj en kiuj vi plibonigis 
la artikolon";
 "edit-summary-title" = "Kiel vi plibonigis la artikolon?";
 "about-title" = "Pri";
diff --git a/wikipedia/eo.lproj/Localizable.strings 
b/wikipedia/eo.lproj/Localizable.strings
deleted file mode 100644
index c3363d8..000
--- a/wikipedia/eo.lproj/Localizable.strings
+++ /dev/null
@@ -1,169 +0,0 @@
-// Messages for Esperanto (Esperanto)
-// Exported from translatewiki.net
-// Author: Fitoschido
-// Author: KuboF
-// Author: Remux
-
-"article-languages-label" = "Elekti lingvon";
-"article-languages-cancel" = "Nuligi";
-"article-languages-downloading" = "Ŝarĝante lingvojn de la artikolo...";
-"article-languages-filter-placeholder" = "Lingva filtrilo";
-"article-read-more-title" = "Legi plu";
-"info-box-title" = "Rapidaj faktoj";
-"info-box-close-text" = "Fermi";
-"language-button-text" = "Vi povas legi ĉi tiun artikolon en %d aliaj lingvoj";
-"history-label" = "Lastaj";
-"history-section-today" = "Hodiaŭ";
-"history-section-yesterday" = "Hieraŭ";
-"history-section-lastweek" = "Lasta semajno";
-"history-section-lastmonth" = "Lasta monato";
-"history-clear-cancel" = "Nuligi";
-"history-clear-delete-all" = "Forigi ĉion";
-"zero-interstitial-title" = "Forlasante Vikipedio Zero";
-"zero-interstitial-continue" = "Foriri";
-"zero-interstitial-cancel" = "Resti ĉi tie";
-"zero-learn-more-learn-more" = "Legi plu";
-"zero-learn-more-no-thanks" = "Elimini";
-"zero-wikipedia-zero-heading" = "Vikipedio Zero";
-"zero-warn-when-leaving" = "Avertu kiam forlasi Vikipedio Zero";
-"account-creation-logging-in" = "Ensalutante...";
-"account-creation-saving" = "Konservante...";
-"account-creation-login" = "Ĉu vi jam havas konton? Ensalutu.";
-"account-creation-username-placeholder-text" = "Uzantnomo";
-"account-creation-password-placeholder-text" = "Pasvorto";
-"account-creation-password-confirm-placeholder-text" = "Konfirmu pasvorton";
-"account-creation-email-placeholder-text" = "Retpoŝto (Malnepra)";
-"account-creation-missing-fields" = "Vi devas enigi uzantnomon, pasvorton, kaj 
konfirmi vian pasvorton por krei konton.";
-"login-name-not-found" = "Uzantnomo nepras por ensaluti.";
-"login-name-illegal" = "Vi enigis ne-akcepteblan uzantnomon.";
-"login-name-does-not-exist" = "La uzantnomo enigita ne ekzistas.";
-"login-password-empty" = "Pasvorto nepras por ensaluti.";
-"login-password-wrong" = "La enigita pasvorto estas malĝusta.";
-"login-username-placeholder-text" = "Uzantnomo";
-"login-password-placeholder-text" = "Pasvorto";
-"wikitext-downloading" = "Ŝarĝante enhavon...";
-"wikitext-download-success" = "Enhavo ŝarĝita.";
-"wikitext-upload-save" = "Konservante...";
-"wikitext-upload-save-sign-in" = "Ensaluti";
-"wikitext-upload-save-anonymously" = "Konservi anonime";
-"wikitext-upload-save-terms-name" = "Uzkondiĉoj";
-"wikitext-upload-save-license-name" = "CC BY-SA 3.0";
-"open-link-title" = "Malfermi ligilon";
-"open-link-cancel" = "Nuligi";
-"search-searching" = "Serĉante...";
-"search-loading-article-loaded" = "Artiko

[MediaWiki-commits] [Gerrit] Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow... - change (mediawiki...Flow)

2015-04-23 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow 
changes
..

Fix ConvertLqtPageOnLocalWiki for recent core (API) and Flow changes

Change-Id: I6c9056f03ae8e2770e19e5b2876a0f6c50fd8b81
---
M container.php
M includes/Import/Importer.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M maintenance/convertToText.php
5 files changed, 37 insertions(+), 43 deletions(-)


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

diff --git a/container.php b/container.php
index ed3bd1a..cb286b4 100644
--- a/container.php
+++ b/container.php
@@ -1189,7 +1189,8 @@
$c['factory.loader.workflow'],
$c['memcache.buffered'],
$c['db.factory'],
-   $c['deferred_queue']
+   $c['deferred_queue'],
+   $c['occupation_controller']
);
 
$importer->addPostprocessor( new 
Flow\Import\Postprocessor\SpecialLogTopic(
diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php
index 20fa46f..740eeb4 100644
--- a/includes/Import/Importer.php
+++ b/includes/Import/Importer.php
@@ -2,6 +2,7 @@
 
 namespace Flow\Import;
 
+use Article;
 use DeferredUpdates;
 use Flow\Data\BufferedCache;
 use Flow\Data\ManagerGroup;
@@ -15,6 +16,7 @@
 use Flow\Model\TopicListEntry;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
+use Flow\OccupationController;
 use Flow\WorkflowLoaderFactory;
 use IP;
 use MWCryptRand;
@@ -48,13 +50,16 @@
protected $postprocessors;
/** @var SplQueue Callbacks for DeferredUpdate that are queue'd up by 
the commit process */
protected $deferredQueue;
+   /** @var OccupationController */
+   protected $occupationController;
 
public function __construct(
ManagerGroup $storage,
WorkflowLoaderFactory $workflowLoaderFactory,
BufferedCache $cache,
DbFactory $dbFactory,
-   SplQueue $deferredQueue
+   SplQueue $deferredQueue,
+   OccupationController $occupationController
) {
$this->storage = $storage;
$this->workflowLoaderFactory = $workflowLoaderFactory;
@@ -62,6 +67,7 @@
$this->dbFactory = $dbFactory;
$this->postprocessors = new ProcessorGroup;
$this->deferredQueue = $deferredQueue;
+   $this->occupationController = $occupationController;
}
 
public function addPostprocessor( Postprocessor $proc ) {
@@ -103,8 +109,8 @@
 * @return bool True When the import completes with no failures
 */
public function import( IImportSource $source, Title $targetPage, 
ImportSourceStore $sourceStore ) {
-   $operation = new TalkpageImportOperation( $source );
-   return $operation->import( new PageImportState(
+   $operation = new TalkpageImportOperation( $source, 
$this->occupationController );
+   $pageImportState = new PageImportState(
$this->workflowLoaderFactory
->createWorkflowLoader( $targetPage )
->getWorkflow(),
@@ -116,7 +122,8 @@
$this->postprocessors,
$this->deferredQueue,
$this->allowUnknownUsernames
-   ) );
+   );
+   return $operation->import( $pageImportState );
}
 }
 
@@ -495,11 +502,15 @@
 */
protected $importSource;
 
+   /** @var OccupationController */
+   protected $occupationController;
+
/**
 * @param IImportSource $source
 */
-   public function __construct( IImportSource $source ) {
+   public function __construct( IImportSource $source, 
OccupationController $occupationController ) {
$this->importSource = $source;
+   $this->occupationController = $occupationController;
}
 
/**
@@ -509,8 +520,17 @@
 * @throws \Exception
 */
public function import( PageImportState $state ) {
-   $state->logger->info( 'Importing to ' . 
$state->boardWorkflow->getArticleTitle()->getPrefixedText() );
+   $destinationTitle = $state->boardWorkflow->getArticleTitle();
+   $state->logger->info( 'Importing to ' . 
$destinationTitle->getPrefixedText() );
if ( $state->boardWorkflow->isNew() ) {
+   $this->occupationController->allowCreation(
+   $destinationTitle,
+   
$this->occupationController->getTalkpageManager()
+   );
+   $this->occupationController->e

[MediaWiki-commits] [Gerrit] Update for changes in OOjs UI (Ib40e3477) - change (mediawiki...MobileFrontend)

2015-04-23 Thread Code Review

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

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

Change subject: Update for changes in OOjs UI (Ib40e3477)
..

Update for changes in OOjs UI (Ib40e3477)

I can't make head or tails of this code. Adding this line seems to
prevent big regressions, but the sizes of things still change very
slightly, inexplicably. Various "reset" styles make this really hard
to debug and this is probably good enough, so I won't bother.

Bug: T91152
Change-Id: I3f61231162f2963cc16cee9d0249dbb56fb84cf0
---
M less/modules/editor/VisualEditorOverlay.less
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/less/modules/editor/VisualEditorOverlay.less 
b/less/modules/editor/VisualEditorOverlay.less
index c4e9e53..2e2e325 100644
--- a/less/modules/editor/VisualEditorOverlay.less
+++ b/less/modules/editor/VisualEditorOverlay.less
@@ -82,6 +82,7 @@
@targetIconSize: 32px;
.overlay-header-container {
.toolbar {
+   font-size: 0.8em;
border-left: 1px solid @grayLight;
// Expand the toolbar as wide as possible to limit the 
size of the
// overlay-action. (Both are displayed as table-cells.)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f61231162f2963cc16cee9d0249dbb56fb84cf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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] Enable Vagrant Gather role - change (mediawiki/vagrant)

2015-04-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Enable Vagrant Gather role
..

Enable Vagrant Gather role

Bug: T90814
Change-Id: Ib0c39a7edc8e735e6298fce897b29f20c2797bb9
---
A puppet/modules/role/manifests/gather.pp
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/11/206311/1

diff --git a/puppet/modules/role/manifests/gather.pp 
b/puppet/modules/role/manifests/gather.pp
new file mode 100644
index 000..918b045
--- /dev/null
+++ b/puppet/modules/role/manifests/gather.pp
@@ -0,0 +1,15 @@
+# == Class: role::gather
+# Configures Gather, the MediaWiki extension which powers
+# Special:Gather
+#
+class role::gather {
+require ::role::mediawiki
+   require ::role::mobilefrontend
+include ::role::pageimages
+include ::role::textextracts
+
+mediawiki::extension { 'Gather':
+settings  => {},
+browser_tests => true,
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0c39a7edc8e735e6298fce897b29f20c2797bb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
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 Use DonationQueue for limbo queuing - change (mediawiki...DonationInterface)

2015-04-23 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: WIP Use DonationQueue for limbo queuing
..

WIP Use DonationQueue for limbo queuing

Does not affect the orphan slayer.

DEPLOYMENT
Requires that the limbo queue be configured.

We stop emitting antimessages and delete the message directly instead.

The migration will be to:
1) Deploy this patch, and stop producing new antimessages.
2) Consume the remaining antimessages with an offline batch process, such
as the previous revision code, running on the staging server.

Bug: T92921
Change-Id: I637bcba899b3616e9f60207931b28fb9af8051af
---
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M tests/includes/test_gateway/TestingGlobalCollectAdapter.php
3 files changed, 53 insertions(+), 59 deletions(-)


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

diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 182e05c..12f3fff 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1853,37 +1853,12 @@
default:
// No action
$this->logger->info( "Not sending queue message 
for status {$status}." );
-
-   /**
-* Function that adds a stomp message to a special 'limbo' queue, for 
data
-* that is either highly likely or completely guaranteed to be 
bifurcated by
-* handing the ball to a third-party process.
-*
-* @param bool $antiMessage If TRUE message will be formatted to 
destroy a message in the limbo
-*  queue when the orphan slayer is run.
-*
-* @return null
-*/
-   protected function doLimboStompTransaction( $antiMessage = false ) {
-   if ( !$this->getGlobal( 'EnableStomp' ) ){
-   return;
-   }
-
-   $this->debugarray[] = "Attempting Limbo Stomp Transaction!";
-
-   $transaction = $this->getStompTransaction( $antiMessage );
-
-   try {
-   WmfFramework::runHooks( 'gwStomp', array( $transaction, 
'limbo' ) );
-   } catch ( Exception $e ) {
-   $this->logger->critical( "STOMP ERROR. Could not add 
message to 'limbo' queue: {$e->getMessage()} " . json_encode( $transaction ) );
}
}
 
/**
 * Formats an array in preparation for dispatch to a STOMP queue
 *
-* @param bool $antiMessage If TRUE, message will be prepared to destroy
 * @param bool $recoverTimestamp If TRUE the timestamp will be set to 
any recoverable timestamp
 *  from the transaction. If it cannot be recovered or this argument is 
false, it will take the
 *  current time.
@@ -1892,7 +1867,7 @@
 *
 * TODO: Stop saying "STOMP".
 */
-   protected function getStompTransaction( $antiMessage = false, 
$recoverTimestamp = false ) {
+   protected function getStompTransaction( $recoverTimestamp = false ) {
$transaction = array(
'gateway_txn_id' => $this->getTransactionGatewayTxnID(),
'payment_method' => $this->getData_Unstaged_Escaped( 
'payment_method' ),
@@ -1903,33 +1878,29 @@
'gateway' => $this->getData_Unstaged_Escaped( 'gateway' 
),
);
 
-   if ( $antiMessage == true ) {
-   // As anti-messages only exist to destroy messages all 
we need is the identifier
-   $transaction['antimessage'] = 'true';
-   } else {
-   // Else we actually need the rest of the data
-   $stomp_data = array_intersect_key(
-   $this->getData_Unstaged_Escaped(),
-   array_flip( 
$this->dataObj->getStompMessageFields() )
-   );
+   // Else we actually need the rest of the data
+   $stomp_data = array_intersect_key(
+   $this->getData_Unstaged_Escaped(),
+   array_flip( $this->dataObj->getStompMessageFields() )
+   );
 
-   // The order here is important, values in $transaction 
are considered more definitive
-   // in case the transaction already had keys with those 
values
-   $transaction = array_merge( $stomp_data, $transaction );
+   // The order here is important, values in $transaction are 
considered more definitive
+   // in case the transaction already had keys with those values
+   $transaction = array_merge( $stomp_data, $transaction );
 
-   // And now determine the d

[MediaWiki-commits] [Gerrit] Automatically set $wgMainWANCache by default using $wgMainCa... - change (mediawiki/core)

2015-04-23 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Automatically set $wgMainWANCache by default using 
$wgMainCacheType
..

Automatically set $wgMainWANCache by default using $wgMainCacheType

Change-Id: If1ad62e4d1f84e01cd4fea04c6dd568c9d290178
---
M includes/DefaultSettings.php
M includes/Setup.php
2 files changed, 14 insertions(+), 2 deletions(-)


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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 25f6206..a16a1f0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2170,15 +2170,15 @@
 $wgWANObjectCaches = array(
CACHE_NONE => array(
'class' => 'WANObjectCache',
-   'pool'  => 'mediawiki-main-none',
'cacheId'   => CACHE_NONE,
+   'pool'  => 'mediawiki-main-none',
'relayerConfig' => array( 'class' => 'EventRelayerNull' )
)
/* Example of a simple single data-center cache:
'memcached-php' => array(
'class' => 'WANObjectCache',
-   'pool'  => 'mediawiki-main-memcached',
'cacheId'   => 'memcached-php',
+   'pool'  => 'mediawiki-main-memcached',
'relayerConfig' => array( 'class' => 'EventRelayerNull' )
)
*/
diff --git a/includes/Setup.php b/includes/Setup.php
index c5c16a0..82cc1a7 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -530,6 +530,18 @@
 // expecting this to exist. Should be removed sometime 1.26 or later.
 $wgDisableCounters = true;
 
+if ( $wgMainWANCache === false ) {
+   // Setup a WAN cache from $wgMainCacheType with no relayer.
+   // Sites using multiple datacenters can configure a releyer.
+   $wgMainWANCache = 'mediawiki-main-default';
+   $wgWANObjectCaches[$wgMainWANCache] = array(
+   'class' => 'WANObjectCache',
+   'cacheId'   => $wgMainCacheType,
+   'pool'  => 'mediawiki-main-default',
+   'relayerConfig' => array( 'class' => 'EventRelayerNull' )
+   );
+}
+
 Profiler::instance()->scopedProfileOut( $ps_default2 );
 
 $ps_misc = Profiler::instance()->scopedProfileIn( $fname . '-misc1' );

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

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

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

[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Bump versionCode
..


Bump versionCode

Change-Id: I12650359ed45817ca383c6a473aa2eb648babbd6
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index e4f0132..a8d1ea6 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -11,7 +11,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 10
 targetSdkVersion 22
-versionCode 100
+versionCode 101
 testApplicationId 'org.wikipedia.test'
 }
 signingConfigs {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12650359ed45817ca383c6a473aa2eb648babbd6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)

2015-04-23 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: I12650359ed45817ca383c6a473aa2eb648babbd6
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index e4f0132..a8d1ea6 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -11,7 +11,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 10
 targetSdkVersion 22
-versionCode 100
+versionCode 101
 testApplicationId 'org.wikipedia.test'
 }
 signingConfigs {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12650359ed45817ca383c6a473aa2eb648babbd6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
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] Undo right-alignment of RTL languages in lists - change (apps...wikipedia)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Undo right-alignment of RTL languages in lists
..


Undo right-alignment of RTL languages in lists

Change-Id: Ie48c94668baf7d9e4904600ee37762a578c1b0f7
Bugs: T95895, T95213
---
M wikipedia/res/layout/item_language_list_entry.xml
M wikipedia/res/layout/simple_list_item_activated_2.xml
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
4 files changed, 5 insertions(+), 15 deletions(-)

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



diff --git a/wikipedia/res/layout/item_language_list_entry.xml 
b/wikipedia/res/layout/item_language_list_entry.xml
index 5102387..dd453dd 100644
--- a/wikipedia/res/layout/item_language_list_entry.xml
+++ b/wikipedia/res/layout/item_language_list_entry.xml
@@ -13,7 +13,7 @@
   >
 
 
 
 
 
 https://gerrit.wikimedia.org/r/206301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Restrict _rtSelser flag to rtTestMode - change (mediawiki...parsoid)

2015-04-23 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Restrict _rtSelser flag to rtTestMode
..

Restrict _rtSelser flag to rtTestMode

Change-Id: I2c54ffb618480b31a535c016b952a70d17006f1f
---
M api/routes.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/api/routes.js b/api/routes.js
index 400369d..a494073 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -271,7 +271,7 @@
// This isn't part of the public API.  Just a convenience to enable
// selser for roundtrip testing.
var useSelser = parsoidConfig.useSelser;
-   if (req.body.hasOwnProperty('_rtSelser')) {
+   if (parsoidConfig.rtTestMode && req.body.hasOwnProperty('_rtSelser')) {
useSelser = !(!req.body._rtSelser || req.body._rtSelser === 
"false");
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Don't clobber the parsoid config when using selser - change (mediawiki...parsoid)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Don't clobber the parsoid config when using selser
..


Don't clobber the parsoid config when using selser

 * But still ensure rtTesting is false for selser.

Change-Id: If219262a2afaad630c0c272a262dd96d05373868
---
M lib/mediawiki.SelectiveSerializer.js
M lib/mediawiki.WikitextSerializer.js
2 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/lib/mediawiki.SelectiveSerializer.js 
b/lib/mediawiki.SelectiveSerializer.js
index fa9dc9a..de3e142 100644
--- a/lib/mediawiki.SelectiveSerializer.js
+++ b/lib/mediawiki.SelectiveSerializer.js
@@ -27,11 +27,16 @@
 var SelectiveSerializer = function(options) {
// Set edit mode
this.env = options.env || { conf: { parsoid: {} } };
-   this.env.conf.parsoid.rtTestMode = false;
+
+   if (!options.hasOwnProperty('rtTesting')) {
+   options.rtTesting = false;
+   }
+
this.wts = options.wts || new WikitextSerializer(options);
 
// Debug options
-   this.trace = this.env.conf.parsoid.traceFlags && 
(this.env.conf.parsoid.traceFlags.indexOf("selser") !== -1);
+   this.trace = this.env.conf.parsoid.traceFlags &&
+   (this.env.conf.parsoid.traceFlags.indexOf("selser") !== 
-1);
 
// Performance Timing option
this.timer = this.env.conf.parsoid.performanceTimer;
diff --git a/lib/mediawiki.WikitextSerializer.js 
b/lib/mediawiki.WikitextSerializer.js
index 60b66ab..855a61a 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -51,7 +51,10 @@
 function WikitextSerializer(options) {
this.options = options;
this.env = options.env;
-   this.options.rtTesting = this.env.conf.parsoid.rtTestMode;
+
+   if (!this.options.hasOwnProperty('rtTesting')) {
+   this.options.rtTesting = this.env.conf.parsoid.rtTestMode;
+   }
 
// WT escaping handlers
this.wteHandlers = new WTEModule.WikitextEscapeHandlers(this.env, this);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If219262a2afaad630c0c272a262dd96d05373868
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Cscott 
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] Make resultswitcher processing slightly less funky - change (mediawiki...DonationInterface)

2015-04-23 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Make resultswitcher processing slightly less funky
..

Make resultswitcher processing slightly less funky

No need for isResponse() - was only called from response pages
Quit overriding processResponse with incompatible signature
Remove one bit of $_GET inspection from Adyen adapter
Introduce a couple constants
Always redirect to fail or TY - don't stall on resultswitcher

Bug: T90504
Change-Id: I1f9f904728a30e65553f4247e49dca4511d34500
---
M adyen_gateway/adyen.adapter.php
M astropay_gateway/astropay.adapter.php
M astropay_gateway/astropay_resultswitcher.body.php
M gateway_common/GatewayPage.php
M gateway_common/gateway.adapter.php
M tests/Adapter/Astropay/AstropayTest.php
6 files changed, 97 insertions(+), 100 deletions(-)


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

diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 7592cf3..988167a 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -237,12 +237,6 @@
return $this->getTransactionAllResults();
}
 
-   function isResponse() {
-   global $wgRequest;
-   $authResult = $wgRequest->getVal( 'authResult' );
-   return !empty( $authResult );
-   }
-
function getResponseStatus( $response ) {
}
 
@@ -478,41 +472,40 @@
return $queryvals;
}
 
-   function processResponse( $response = null, &$retryVars = null ) {
-   if ( $response === NULL ) { // convert GET data
-   $request_vars = $_GET;
-
-   $this->logger->info( "Processing user return data: " . 
print_r( $request_vars, TRUE ) );
-
-   if ( !$this->checkResponseSignature( $request_vars ) ) {
-   $this->logger->info( "Bad signature in 
response" );
-   return 'BAD_SIGNATURE';
-   } else {
-   $this->logger->debug( "Good signature" );
-   }
-
-   $gateway_txn_id = isset( $request_vars[ 'pspReference' 
] ) ? $request_vars[ 'pspReference' ] : '';
-
-   $result_code = isset( $request_vars[ 'authResult' ] ) ? 
$request_vars[ 'authResult' ] : '';
-   if ( $result_code == 'PENDING' || $result_code == 
'AUTHORISED' ) {
-   // Both of these are listed as pending because 
we have to submit a capture
-   // request on 'AUTHORIZATION' ipn message 
receipt.
-   $this->logger->info( "User came back as pending 
or authorised, placing in pending queue" );
-   $this->finalizeInternalStatus( 'pending' );
-   }
-   else {
-   $this->logger->info( "Negative response from 
gateway. Full response: " . print_r( $request_vars, TRUE ) );
-   $this->finalizeInternalStatus( 'failed' );
-   return 'UNKNOWN';
-   }
-   $this->setTransactionResult( $gateway_txn_id, 
'gateway_txn_id' );
-   $this->setTransactionResult( $this->getFinalStatus(), 
'txn_message' );
-   $this->runPostProcessHooks();
-   $this->doLimboStompTransaction( TRUE ); // add 
antimessage
-   return null;
+   function processResponse( $response, &$retryVars = null ) {
+   if ( empty( $response ) || empty ( $response['data'] ) ) {
+   $this->logger->info( "No response from gateway" );
+   return 'NO_RESPONSE';
}
-   $this->logger->info( "No response from gateway" );
-   return 'NO_RESPONSE';
+   $request_vars = $response['data'];
+   $this->logger->info( "Processing user return data: " . print_r( 
$request_vars, TRUE ) );
+
+   if ( !$this->checkResponseSignature( $request_vars ) ) {
+   $this->logger->info( "Bad signature in response" );
+   return self::BAD_SIGNATURE;
+   } else {
+   $this->logger->debug( "Good signature" );
+   }
+
+   $gateway_txn_id = isset( $request_vars[ 'pspReference' ] ) ? 
$request_vars[ 'pspReference' ] : '';
+
+   $result_code = isset( $request_vars[ 'authResult' ] ) ? 
$request_vars[ 'authResult' ] : '';
+   if ( $result_code == 'PENDING' || $result_code == 'AUTHORISED' 
) {
+   // Both of these are listed as pending because we have 
to submit a capture
+

[MediaWiki-commits] [Gerrit] DO NOT MERGE: Add invalid whitespace to test jenkins - change (mediawiki...CirrusSearch)

2015-04-23 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: DO NOT MERGE: Add invalid whitespace to test jenkins
..

DO NOT MERGE: Add invalid whitespace to test jenkins

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


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

diff --git a/includes/Dump.php b/includes/Dump.php
index 58d5b65..39fe3e0 100644
--- a/includes/Dump.php
+++ b/includes/Dump.php
@@ -2,7 +2,7 @@
 
 namespace CirrusSearch;
 
-use \FormlessAction;
+use \FormlessAction; 
 
 /**
  * action=cirrusDump handler.  Dumps contents of Elasticsearch indexes for the

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

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

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

[MediaWiki-commits] [Gerrit] Update for changes in OOjs UI (Ib40e3477) - change (mediawiki...Flow)

2015-04-23 Thread Code Review

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

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

Change subject: Update for changes in OOjs UI (Ib40e3477)
..

Update for changes in OOjs UI (Ib40e3477)

Bug: T91152
Change-Id: Ica9ee104ee04ad58383db5875bc62bbdfca40fd7
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less 
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 0e3dbc5..37d1019 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -6,14 +6,14 @@
.ve-init-target {
.box-sizing(content-box);
border: 1px solid #CCC;
-   // Undo mw-body-content font-size
+   // Undo .mw-body-content font-size (0.875em) and apply 
font-size matching OOUI theme (0.8em)
// TODO: Make this theme specific
-   font-size: 1/0.875em;
+   font-size: 0.8/0.875em;
 
.ve-ce-documentNode {
-   // Apply mw-body-content font-size
+   // Return to .mw-body-content font-size
// TODO: Make this theme specific
-   font-size: 0.875em;
+   font-size: 0.875/0.8em;
}
 
* {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica9ee104ee04ad58383db5875bc62bbdfca40fd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Update to 0b9a0438 - change (mediawiki...deploy)

2015-04-23 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Update to 0b9a0438
..


Update to 0b9a0438

Change-Id: Ie33748c740f6876eb749912dc1385248ed37b445
---
M node_modules/busboy/node_modules/dicer/node_modules/streamsearch/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/aws-sign2/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/forever-agent/package.json
D 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/.npmignore
M 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/mime/package.json
M node_modules/coveralls/node_modules/request/node_modules/hawk/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/stringstream/package.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.editorconfig
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.npmignore
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.travis.yml
M node_modules/coveralls/node_modules/request/node_modules/tough-cookie/LICENSE
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/README.md
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/generate-pubsuffix.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/cookie.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/memstore.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/store.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/package.json
D node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/api_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_jar_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_sorting_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_to_json_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_to_string_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/date_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/domain_and_path_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/examples.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/parser.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/lifetime_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/parsing_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/regression_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/tough-cookie-deps.tsv
M node_modules/heapdump/build/Makefile
M node_modules/heapdump/build/Release/.deps/Release/addon.node.d
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/Release/addon.node
M node_modules/heapdump/build/Release/obj.target/addon.node
M node_modules/heapdump/build/Release/obj.target/addon/src/heapdump.o
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/binding.Makefile
M node_modules/heapdump/build/config.gypi
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/README.md
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/package.json
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/basic.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/foreach.js
A 
node_m

[MediaWiki-commits] [Gerrit] Update to 0b9a0438 - change (mediawiki...deploy)

2015-04-23 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Update to 0b9a0438
..

Update to 0b9a0438

Change-Id: Ie33748c740f6876eb749912dc1385248ed37b445
---
M node_modules/busboy/node_modules/dicer/node_modules/streamsearch/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/aws-sign2/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/forever-agent/package.json
D 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/.npmignore
M 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/mime/package.json
M node_modules/coveralls/node_modules/request/node_modules/hawk/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/stringstream/package.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.editorconfig
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.npmignore
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.travis.yml
M node_modules/coveralls/node_modules/request/node_modules/tough-cookie/LICENSE
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/README.md
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/generate-pubsuffix.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/cookie.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/memstore.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/store.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/package.json
D node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/api_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_jar_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_sorting_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_to_json_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_to_string_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/date_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/domain_and_path_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/examples.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/parser.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/lifetime_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/parsing_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/regression_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/tough-cookie-deps.tsv
M node_modules/heapdump/build/Makefile
M node_modules/heapdump/build/Release/.deps/Release/addon.node.d
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/Release/addon.node
M node_modules/heapdump/build/Release/obj.target/addon.node
M node_modules/heapdump/build/Release/obj.target/addon/src/heapdump.o
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/binding.Makefile
M node_modules/heapdump/build/config.gypi
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/README.md
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/package.json
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/basic.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lr

[MediaWiki-commits] [Gerrit] Fix settings behavior for combination of default + auto - change (mediawiki/vagrant)

2015-04-23 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix settings behavior for combination of default + auto
..

Fix settings behavior for combination of default + auto

Bug: T97074
Change-Id: I74fc68ca3ef448ca5f958a24d9828be35ffc9921
---
M lib/mediawiki-vagrant/setting.rb
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/03/206303/1

diff --git a/lib/mediawiki-vagrant/setting.rb b/lib/mediawiki-vagrant/setting.rb
index 357eb87..b1efde2 100644
--- a/lib/mediawiki-vagrant/setting.rb
+++ b/lib/mediawiki-vagrant/setting.rb
@@ -17,7 +17,8 @@
   #
   class Setting
 attr_reader :name
-attr_accessor :description, :help, :default, :auto, :coercion, :combiner, 
:internal, :allows_empty
+attr_writer :default
+attr_accessor :description, :help, :auto, :coercion, :combiner, :internal, 
:allows_empty
 
 def initialize(name, value = nil)
   @name = name
@@ -40,6 +41,10 @@
   self.value = @combiner.call(self, other)
 end
 
+def default
+@default == :auto && @auto ? @auto.call : @default
+end
+
 def default?
   !@default.nil?
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74fc68ca3ef448ca5f958a24d9828be35ffc9921
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Replace "header" with "description" - change (mediawiki...Flow)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: Replace "header" with "description"
..


Replace "header" with "description"

Bug: T59790
Change-Id: I75e00d05d1b32f49f4eb0694ad4ccf521df12d01
---
M i18n/en.json
1 file changed, 26 insertions(+), 26 deletions(-)

Approvals:
  DannyH (WMF): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 4ac19d7..005d542 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -29,7 +29,7 @@
"logentry-import-lqt-to-flow-topic": "[[$1|$2]] on [[$3]] was imported 
from LiquidThreads to Flow",
"flow-user-moderated": "Moderated user",
"flow-board-header-browse-topics-link": "Browse topics",
-   "flow-edit-header-link": "Edit header",
+   "flow-edit-header-link": "Edit description",
"flow-post-moderated-toggle-hide-show": "Show comment 
{{GENDER:$1|hidden}} by $2",
"flow-post-moderated-toggle-delete-show": "Show comment 
{{GENDER:$1|deleted}} by $2",
"flow-post-moderated-toggle-suppress-show": "Show comment 
{{GENDER:$1|suppressed}} by $2",
@@ -149,7 +149,7 @@
"flow-error-title-too-long": "Topic titles are restricted to $1 
{{PLURAL:$1|byte|bytes}}.",
"flow-error-no-existing-workflow": "This workflow does not yet exist.",
"flow-error-not-a-post": "Topic title cannot be saved as a post.",
-   "flow-error-missing-header-content": "Header has no content. Content is 
required to save a header.",
+   "flow-error-missing-header-content": "Description has no content. Some 
content is required to save a description.",
"flow-error-missing-prev-revision-identifier": "Previous revision 
identifier is missing.",
"flow-error-prev-revision-mismatch": "Another user just edited this 
post a few seconds ago. Are {{GENDER:$3|you}} sure you want to overwrite the 
recent change?",
"flow-error-prev-revision-does-not-exist": "Could not find the previous 
revision.",
@@ -182,8 +182,8 @@
"flow-error-unknown-workflow-id": "The requested topic does not exist.",
"flow-error-search": "We could not complete your search due to a 
temporary problem. Please try again later.",
"flow-edit-header-placeholder": "Describe this discussion board",
-   "flow-edit-header-submit": "Save header",
-   "flow-edit-header-submit-overwrite": "Overwrite header",
+   "flow-edit-header-submit": "Save description",
+   "flow-edit-header-submit-overwrite": "Overwrite description",
"flow-summarize-topic-submit": "Summarize",
"flow-summarize-topic-submit-overwrite": "Overwrite summary",
"flow-lock-topic-submit": "Lock topic",
@@ -211,10 +211,10 @@
"flow-rev-message-new-post-irc": "$2 {{GENDER:$2|created}} the topic 
\"$4\"",
"flow-rev-message-edit-title": "$1 {{GENDER:$2|changed}} the topic 
title from \"$5\" to \"[$3 $4]\"",
"flow-rev-message-edit-title-irc": "$2 {{GENDER:$2|changed}} the topic 
title from \"$5\" to \"$4\"",
-   "flow-rev-message-create-header": "$1 {{GENDER:$2|created}} the header",
-   "flow-rev-message-create-header-irc": "$2 {{GENDER:$2|created}} the 
header",
-   "flow-rev-message-edit-header": "$1 {{GENDER:$2|edited}} the header",
-   "flow-rev-message-edit-header-irc": "$2 {{GENDER:$2|edited}} the 
header",
+   "flow-rev-message-create-header": "$1 {{GENDER:$2|created}} the 
description",
+   "flow-rev-message-create-header-irc": "$2 {{GENDER:$2|created}} the 
description",
+   "flow-rev-message-edit-header": "$1 {{GENDER:$2|edited}} the 
description",
+   "flow-rev-message-edit-header-irc": "$2 {{GENDER:$2|edited}} the 
description",
"flow-rev-message-create-topic-summary": "$1 {{GENDER:$2|created}} 
topic summary on $3",
"flow-rev-message-create-topic-summary-irc": "$2 {{GENDER:$2|created}} 
topic summary on $3",
"flow-rev-message-edit-topic-summary": "$1 {{GENDER:$2|edited}} topic 
summary on $3",
@@ -284,7 +284,7 @@
"flow-link-history": "history",
"flow-link-post-revision": "post revision",
"flow-link-topic-revision": "topic revision",
-   "flow-link-header-revision": "header revision",
+   "flow-link-header-revision": "description revision",
"flow-link-summary-revision": "summary revision",
"flow-moderation-title-suppress-post": "Suppress post?",
"flow-moderation-title-delete-post": "Delete post?",
@@ -344,12 +344,12 @@
"flow-revision-permalink-warning-post-first": "This is a permanent link 
to the first version of this post.\nYou can view later versions on the [$4 post 
history page].",
"flow-revision-permalink-warning-postsummary": "This is a permanent 
link to a single version of the summary for this post. This version is from 
$1.\nYou can see the [$5 differences from the previous version], or view other 
versions on the [$4 post history page]."

[MediaWiki-commits] [Gerrit] monitoring: selector outside a resource - change (operations/puppet)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: monitoring: selector outside a resource
..


monitoring: selector outside a resource

Change-Id: I8e22e4dc4c1c01e0d6a553ca34dd5294ebb82b46
---
M modules/monitoring/manifests/host.pp
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/modules/monitoring/manifests/host.pp 
b/modules/monitoring/manifests/host.pp
index 2e86b56..2c306ec 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -24,6 +24,11 @@
 default => hiera('nagios_group',"${cluster_name}_${::site}")
 }
 
+$is_critical = $critical ? {
+'true'  => 'admins,sms',
+default => $contact_group,
+}
+
 # Export the nagios host instance
 @@nagios_host { $title:
 ensure=> $ensure,
@@ -34,10 +39,7 @@
 check_command => 'check_ping!500,20%!2000,100%',
 check_period  => '24x7',
 max_check_attempts=> 2,
-contact_groups=> $critical ? {
-'true'  => 'admins,sms',
-default => $contact_group,
-},
+contact_groups=> $is_critical,
 notification_interval => 0,
 notification_period   => '24x7',
 notification_options  => 'd,u,r,f',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e22e4dc4c1c01e0d6a553ca34dd5294ebb82b46
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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] Don't clobber the parsoid config when using selser - change (mediawiki...parsoid)

2015-04-23 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Don't clobber the parsoid config when using selser
..

Don't clobber the parsoid config when using selser

 * But still ensure rtTesting is false for selser.

Change-Id: If219262a2afaad630c0c272a262dd96d05373868
---
M lib/mediawiki.SelectiveSerializer.js
M lib/mediawiki.WikitextSerializer.js
2 files changed, 11 insertions(+), 2 deletions(-)


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

diff --git a/lib/mediawiki.SelectiveSerializer.js 
b/lib/mediawiki.SelectiveSerializer.js
index fa9dc9a..d6c21ec 100644
--- a/lib/mediawiki.SelectiveSerializer.js
+++ b/lib/mediawiki.SelectiveSerializer.js
@@ -27,11 +27,17 @@
 var SelectiveSerializer = function(options) {
// Set edit mode
this.env = options.env || { conf: { parsoid: {} } };
+
+   if (!options.hasOwnProperty('rtTesting')) {
+   options.rtTesting = false;
+   }
+
this.env.conf.parsoid.rtTestMode = false;
this.wts = options.wts || new WikitextSerializer(options);
 
// Debug options
-   this.trace = this.env.conf.parsoid.traceFlags && 
(this.env.conf.parsoid.traceFlags.indexOf("selser") !== -1);
+   this.trace = this.env.conf.parsoid.traceFlags &&
+   (this.env.conf.parsoid.traceFlags.indexOf("selser") !== 
-1);
 
// Performance Timing option
this.timer = this.env.conf.parsoid.performanceTimer;
diff --git a/lib/mediawiki.WikitextSerializer.js 
b/lib/mediawiki.WikitextSerializer.js
index 60b66ab..855a61a 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -51,7 +51,10 @@
 function WikitextSerializer(options) {
this.options = options;
this.env = options.env;
-   this.options.rtTesting = this.env.conf.parsoid.rtTestMode;
+
+   if (!this.options.hasOwnProperty('rtTesting')) {
+   this.options.rtTesting = this.env.conf.parsoid.rtTestMode;
+   }
 
// WT escaping handlers
this.wteHandlers = new WTEModule.WikitextEscapeHandlers(this.env, this);

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

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

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

[MediaWiki-commits] [Gerrit] Undo right-alignment of RTL languages in lists - change (apps...wikipedia)

2015-04-23 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review.

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

Change subject: Undo right-alignment of RTL languages in lists
..

Undo right-alignment of RTL languages in lists

Change-Id: Ie48c94668baf7d9e4904600ee37762a578c1b0f7
Bugs: T95895, T95213
---
M wikipedia/res/layout/item_language_list_entry.xml
M wikipedia/res/layout/simple_list_item_activated_2.xml
M wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
3 files changed, 4 insertions(+), 12 deletions(-)


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

diff --git a/wikipedia/res/layout/item_language_list_entry.xml 
b/wikipedia/res/layout/item_language_list_entry.xml
index 5102387..dd453dd 100644
--- a/wikipedia/res/layout/item_language_list_entry.xml
+++ b/wikipedia/res/layout/item_language_list_entry.xml
@@ -13,7 +13,7 @@
   >
 
 
 
 
 
 https://gerrit.wikimedia.org/r/206301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] set logo for gom.wikipedia - change (operations/mediawiki-config)

2015-04-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: set logo for gom.wikipedia
..

set logo for gom.wikipedia

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2ee84a1..b74039a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -515,6 +515,7 @@
'glwiki' => '//upload.wikimedia.org/wikipedia/gl/b/bc/Wiki.png',
'glkwiki' => 
'//upload.wikimedia.org/wikipedia/commons/6/6a/Wikipedia-logo-v2-glk.png', // 
Bug T50397
'gnwiki' => 
'//upload.wikimedia.org/wikipedia/commons/6/6d/Wikipedia-logo-v2-gn.png', // 
Bug T51125
+'gomwiki' => 
'//upload.wikimedia.org/wikipedia/commons/b/b6/Wikipedia-logo-v2-hi.svg', // 
Bug T96468
'gotwiki' => '$stdlogo',
'guwiki' => '$stdlogo',
'gvwiki' => 
'//upload.wikimedia.org/wikipedia/commons/c/ca/Wikipedia-logo-v2-gv.png', // 
Bug T48589

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e4f348f03f8644eca6998313ab92c94a093cc33
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] logstash: Convert $::realm switches to hiera - change (operations/puppet)

2015-04-23 Thread Gage (Code Review)

Gage has submitted this change and it was merged.

Change subject: logstash: Convert $::realm switches to hiera
..


logstash: Convert $::realm switches to hiera

Change-Id: I934a321d3394afbbd99cbf05cfc72630e2d16e3e
---
A hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
M hieradata/role/common/logstash.yaml
M manifests/role/logstash.pp
3 files changed, 34 insertions(+), 27 deletions(-)

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



diff --git a/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml 
b/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
new file mode 100644
index 000..d27da83
--- /dev/null
+++ b/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
@@ -0,0 +1,14 @@
+# ES-specific
+elasticsearch::auto_create_index: true
+elasticsearch::cluster_name: labs-logstash-eqiad
+elasticsearch::expected_nodes: 1
+elasticsearch::heap_memory: '5G'
+elasticsearch::minimum_master_nodes: 1
+elasticsearch::multicast_group: 224.2.2.6
+elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins
+elasticsearch::recover_after_nodes: 1
+elasticsearch::recover_after_time: '1m'
+
+# Logstash specific
+logstash::filter_workers: 1
+logstash::heap_memory_mb: 128
diff --git a/hieradata/role/common/logstash.yaml 
b/hieradata/role/common/logstash.yaml
index 26f0222..e6d932e 100644
--- a/hieradata/role/common/logstash.yaml
+++ b/hieradata/role/common/logstash.yaml
@@ -1,3 +1,21 @@
 cluster: logstash
 admin::groups:
   - logstash-roots
+
+# ES-specific
+elasticsearch::auto_create_index: true
+elasticsearch::cluster_name: production-logstash-eqiad
+elasticsearch::expected_nodes: 3
+elasticsearch::heap_memory: '5G'
+elasticsearch::minimum_master_nodes: 2
+elasticsearch::multicast_group: 224.2.2.6
+elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins
+elasticsearch::recover_after_nodes: 2
+elasticsearch::recover_after_time: '1m'
+
+# Logstash specific
+# TODO: the multiline filter that is used in several places in the
+# current configuration isn't thread safe and can cause crashes or
+# garbled output when used with more than one thread worker.
+logstash::filter_workers: 1
+logstash::heap_memory_mb: 128
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 22432a9..75c1696 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -9,39 +9,14 @@
 include standard
 include ::elasticsearch::ganglia
 include ::elasticsearch::nagios::check
+include ::logstash
 
 package { 'elasticsearch/plugins':
 provider => 'trebuchet',
 }
 
-$minimum_master_nodes = $::realm ? {
-'production' => 2,
-'labs'   => 1,
-}
-$expected_nodes = $::realm ? {
-'production' => 2,
-'labs'   => 1,
-}
-
 class { '::elasticsearch':
-multicast_group  => '224.2.2.5',
-master_eligible  => true,
-minimum_master_nodes => $minimum_master_nodes,
-cluster_name => "${::realm}-logstash-${::site}",
-heap_memory  => '5G',
-plugins_dir  => '/srv/deployment/elasticsearch/plugins',
-auto_create_index=> true,
-expected_nodes   => $expected_nodes,
-recover_after_nodes  => $minimum_master_nodes,
-recover_after_time   => '1m',
-}
-
-class { '::logstash':
-heap_memory_mb => 128,
-# TODO: the multiline filter that is used in several places in the
-# current configuration isn't thread safe and can cause crashes or
-# garbled output when used with more than one thread worker.
-filter_workers => 1,
+require => Package['elasticsearch/plugins'],
 }
 
 logstash::input::udp2log { 'mediawiki':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I934a321d3394afbbd99cbf05cfc72630e2d16e3e
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Gage 
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] logstash: Fix log level detection - change (operations/mediawiki-config)

2015-04-23 Thread jenkins-bot (Code Review)

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

Change subject: logstash: Fix log level detection
..


logstash: Fix log level detection

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

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



diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index c42cad3..27e218f 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -167,7 +167,7 @@
$opts['logstash'] &&
$wmgLogstashServers
) {
-   $level = $opts['logstash']['level'];
+   $level = $opts['logstash'];
$logstashHandler = "logstash-{$level}";
if ( !isset( $wmgMonologConfig['handlers'][$logstashHandler] ) 
) {
// Register handler that will only pass events of the 
given

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

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

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

[MediaWiki-commits] [Gerrit] logstash: Fix log level detection - change (operations/mediawiki-config)

2015-04-23 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: logstash: Fix log level detection
..

logstash: Fix log level detection

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


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

diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index c42cad3..27e218f 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -167,7 +167,7 @@
$opts['logstash'] &&
$wmgLogstashServers
) {
-   $level = $opts['logstash']['level'];
+   $level = $opts['logstash'];
$logstashHandler = "logstash-{$level}";
if ( !isset( $wmgMonologConfig['handlers'][$logstashHandler] ) 
) {
// Register handler that will only pass events of the 
given

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

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

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

[MediaWiki-commits] [Gerrit] Run the whitespace checker for CirrusSearch - change (integration/config)

2015-04-23 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Run the whitespace checker for CirrusSearch
..

Run the whitespace checker for CirrusSearch

Bug: T97086
Change-Id: Ib4f9baeffa9b478942ae19c7629d56312945a964
---
M jjb/mediawiki-extensions.yaml
1 file changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/98/206298/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b6ad09d..aaf7860 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -164,6 +164,20 @@
  - mw-teardown-mysql
  - archive-log-dir
 
+- job-template:
+name: 'mwext-{name}-whitespaces'
+node: hasSlaveScripts && UbuntuPrecise
+defaults: use-remote-zuul
+concurrent: true
+logrotate:
+daysToKeep: 15
+scm:
+ - git-mwcore
+triggers:
+ - zuul
+builder:
+ - lint-whitespaces
+
 # Run extension tests via Zuul cloner
 #
 - job-template:
@@ -1006,6 +1020,11 @@
  - python-jobs
 
 - project:
+name: 'mwext-CirrusSearch'
+jobs:
+ - 'mwext-CirrusSearch-whitespaces':
+
+- project:
 name: 'mwext-ConfirmEdit'
 jobs:
  - python-jobs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4f9baeffa9b478942ae19c7629d56312945a964
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Update to current master - change (mediawiki...deploy)

2015-04-23 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Update to current master
..

Update to current master

Change-Id: I65299667871c79268e3eaf8261380082ef04f0a2
---
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.editorconfig
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.npmignore
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/.travis.yml
M node_modules/coveralls/node_modules/request/node_modules/tough-cookie/LICENSE
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/README.md
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/generate-pubsuffix.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/cookie.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/memstore.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/lib/store.js
M 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/package.json
D node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/api_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_jar_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_sorting_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_to_json_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/cookie_to_string_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/date_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/domain_and_path_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/examples.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_data/parser.json
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/ietf_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/lifetime_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/parsing_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/test/regression_test.js
A 
node_modules/coveralls/node_modules/request/node_modules/tough-cookie/tough-cookie-deps.tsv
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/README.md
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/package.json
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/basic.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/foreach.js
A 
node_modules/istanbul/node_modules/fileset/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/timeout.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/minimatch/node_modules/lru-cache/README.md
M 
node_modules/istanbul/node_modules/fileset/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/minimatch/node_modules/lru-cache/package.json
M 
node_modules/istanbul/node_modules/fileset/node_modules/minimatch/node_modules/lru-cache/test/basic.js
M 
node_modules/istanbul/node_modules/fileset/node_modules/minimatch/node_modules/lru-cache/test/foreach.js
A 
node_modules/istanbul/node_modules/fileset/node_modules/minimatch/node_modules/lru-cache/test/timeout.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/README.md
M 
node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array/intersection.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array/pullAt.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array/remove.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array/slice.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array/uniq.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array/unzip.js
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/chain/lodash.js
M 
node_modules/js-yaml/node_modules/argparse/node_modules/lodash/collection/at.js
M 
node_modules/js-yaml/node_modules/argparse/node_modules/lodash/collection/every.js
M 
node_m

1 2 3 4 >

1 - 100 of 348 matches

Mail list logo