date:20150625

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-5 - change (mediawiki/core)

2015-06-25 Thread Chiefwei (Code Review)

Chiefwei has uploaded a new change for review.

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

Change subject: Chinese Conversion Table Update 2015-5
..

Chinese Conversion Table Update 2015-5

Update the Chinese conversion table routinely to fix bugs reported from
https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82.

It is only data changes and only works for Chinese WikiProjects.

Change-Id: I0933141b0f06c5b7d7f1fb8153f6433276dc872f
---
M includes/ZhConversion.php
M maintenance/language/zhtable/simpphrases.manual
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
5 files changed, 52 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/221058/1

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index b59be8c..46aeda0 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -3186,6 +3186,7 @@
 '下签' => '下籤',
 '下课钟' => '下課鐘',
 '不干不净' => '不乾不淨',
+'不干胶' => '不乾膠',
 '不克自制' => '不克自制',
 '不加自制' => '不加自制',
 '不占凶吉' => '不占凶吉',
@@ -3372,7 +3373,6 @@
 '干擦' => '乾擦',
 '干支剌' => '乾支剌',
 '干支支' => '乾支支',
-'干敲梆子不卖油' => '乾敲梆子不賣油',
 '干料' => '乾料',
 '干旱' => '乾旱',
 '干暖' => '乾暖',
@@ -3480,8 +3480,7 @@
 '乱发生' => '亂發生',
 '乱发脾气' => '亂發脾氣',
 '乱发' => '亂髮',
-'乱哄' => '亂鬨',
-'乱哄不过来' => '亂鬨不過來',
+'乱哄哄' => '亂鬨鬨',
 '了然后' => '了然後',
 '事有斗巧' => '事有鬥巧',
 '事里' => '事裡',
@@ -3726,6 +3725,7 @@
 '亮钟' => '亮鐘',
 '人云' => '人云',
 '人如风后入江云' => '人如風後入江雲',
+'人干的' => '人幹的',
 '人欲' => '人慾',
 '人数只' => '人數只',
 '人数里' => '人數裡',
@@ -3734,6 +3734,7 @@
 '什锦面' => '什錦麵',
 '仇仇' => '仇讎',
 '介胄' => '介冑',
+'他干的' => '他幹的',
 '他钟' => '他鐘',
 '付托' => '付託',
 '仙后' => '仙后',
@@ -3846,6 +3847,7 @@
 '个里' => '個裡',
 '个钟' => '個鐘',
 '个钟表' => '個鐘錶',
+'们干的' => '們幹的',
 '幸免' => '倖免',
 '幸存' => '倖存',
 '幸幸' => '倖幸',
@@ -4109,7 +4111,6 @@
 '利于' => '利於',
 '刮来刮去' => '刮來刮去',
 '刮起来' => '刮起來',
-'刮风下雪倒便宜' => '刮風下雪倒便宜',
 '刮胡' => '刮鬍',
 '到山里' => '到山裡',
 '制冷机' => '制冷機',
@@ -4235,7 +4236,6 @@
 '博尔术' => '博爾朮',
 '卜云吉' => '卜云吉',
 '占了卜' => '占了卜',
-'占便宜的是呆' => '占便宜的是獃',
 '印累绶若' => '印纍綬若',
 '印制' => '印製',
 '印鉴' => '印鑑',
@@ -4702,7 +4702,6 @@
 '太后' => '太后',
 '太丑' => '太醜',
 '太阁' => '太閤',
-'夯干' => '夯幹',
 '夸克' => '夸克',
 '夸父' => '夸父',
 '夸特' => '夸特',
@@ -4934,7 +4933,6 @@
 '工作台' => '工作檯',
 '工致' => '工緻',
 '左冲右突' => '左衝右突',
-'巧妇做不得无面馎饦' => '巧婦做不得無麵餺飥',
 '巧干' => '巧幹',
 '巧历' => '巧曆',
 '巧历史' => '巧歷史',
@@ -4996,6 +4994,7 @@
 '干吗' => '幹嗎',
 '干嘛' => '幹嘛',
 '干坏事' => '幹壞事',
+'干大事' => '幹大事',
 '干完' => '幹完',
 '干家' => '幹家',
 '干得' => '幹得',
@@ -5013,7 +5012,8 @@
 '干甚么' => '幹甚麼',
 '干略' => '幹略',
 '干当' => '幹當',
-'干的停当' => '幹的停當',
+'干的事' => '幹的事',
+'干的好事' => '幹的好事',
 '干细胞' => '幹細胞',
 '干线' => '幹線',
 '干练' => '幹練',
@@ -5141,6 +5141,7 @@
 '很凶' => '很兇',
 '很准' => '很準',
 '很丑' => '很醜',
+'很松' => '很鬆',
 '律历志' => '律曆志',
 '后印' => '後印',
 '后台老板' => '後台老板',
@@ -5356,7 +5357,9 @@
 '怪里怪气' => '怪裡怪氣',
 '怫郁' => '怫鬱',
 '恂栗' => '恂慄',
+'恒基' => '恒基',
 '恒生' => '恒生',
+'恒隆' => '恒隆',
 '恕乏价催' => '恕乏价催',
 '息交绝游' => '息交絕遊',
 '息谷' => '息穀',
@@ -6547,6 +6550,7 @@
 '滃郁' => '滃鬱',
 '滑借' => '滑藉',
 '汇丰' => '滙豐',
+'渗漓' => '滲灕',
 '卤了' => '滷了',
 '卤五花' => '滷五花',
 '卤味' => '滷味',
@@ -6590,7 +6594,6 @@
 '澄江县' => '澂江縣',
 '澄澹精致' => '澄澹精致',
 '澒蒙' => '澒濛',
-'泽渗漓而下降' => '澤滲灕而下降',
 '淀乃不耕之地' => '澱乃不耕之地',
 '淀北片' => '澱北片',
 '淀山' => '澱山',
@@ -6659,6 +6662,7 @@
 '烘制' => '烘製',
 '烤干' => '烤乾',
 '烤卤' => '烤滷',
+'烹制' => '烹製',
 '焙干' => '焙乾',
 '无征不信' => '無徵不信',
 '无业游民' => '無業游民',
@@ -6730,7 +6734,6 @@
 '犹如表' => '猶如錶',
 '犹如钟' => '猶如鐘',
 '犹如钟表' => '猶如鐘錶',
-'呆串了皮' => '獃串了皮',
 '狱里' => '獄裡',
 '奖杯' => '獎盃',
 '独裁制' => '獨裁制',
@@ -6743,6 +6746,7 @@
 '玉米面' => '玉米面',
 '王侯后' => '王侯后',
 '王后' => '王后',
+'王添灯' => '王添灯',
 '王田里' => '王田里',
 '王鉴' => '王鑑',
 '王余鱼' => '王餘魚',
@@ -7462,6 +7466,7 @@
 '卧游' => '臥遊',
 '臧谷亡羊' => '臧穀亡羊',
 '临潼斗宝' => '臨潼鬥寶',
+'自干五' => '自乾五',
 '自制一下' => '自制一下',
 '自制下来' => '自制下來',
 '自制不' => '自制不',
@@ -8396,7 +8401,6 @@
 '鄭凱云' => '鄭凱云',
 '配制饲料' => '配制飼料',
 '配图里' => '配圖裡',
-'配水干管' => '配水幹管',
 '配制' => '配製',
 '酒帘' => '酒帘',
 '酒气冲天' => '酒氣衝天',
@@ -8893,6 +8897,7 @@
 '飘荡' => '飄蕩',
 '飘游' => '飄遊',
 '飘飘荡荡' => '飄飄蕩蕩',
+'飘发自由女神' => '飄髮自由女神',
 '飞扎' => '飛紮',
 '飞刍挽粟' => '飛芻輓粟',
 '飞行钟' => '飛行鐘',
@@ -9181,6 +9186,7 @@
 '斗合' => '鬥合',
 '斗嘴' => '鬥嘴',
 '斗地主' => '鬥地主',
+'斗垮' => '鬥垮',
 '斗士' => '鬥士',
 '斗富' => '鬥富',
 '斗巧' => '鬥巧',
@@ -9196,6 +9202,7 @@
 '斗打' => '鬥打',
 '斗批改' => '鬥批改',
 '斗技' => '鬥技',
+'斗败' => '鬥敗',
 '斗文' => '鬥文',
 '斗智' => '鬥智',
 '斗暴' => '鬥暴',
@@ -9211,6 +9218,7 @@
 '斗牛' => '鬥牛',
 '斗犀台' => '鬥犀臺',
 '斗犬' => '鬥犬',
+'斗狗' => '鬥狗',
 '斗狠' => '鬥狠',
 '斗兽' => '鬥獸',
 '斗叠' => '鬥疊',
@@ -9225,6 +9233,7 @@
 '斗草' => '鬥草',
 '斗叶儿' => '鬥葉兒',
 '斗叶子' => '鬥葉子',
+'斗蛐' => '鬥蛐',
 '斗蟋蟀' => '鬥蟋蟀',
 '斗话' => '鬥話',
 '斗艳' => '鬥豔',
@@ -9358,7 +9367,6 @@
 '曲霉' => '麴黴',
 '麹霉' => '麴黴',
 '面人儿' => '麵人兒',
-'面价' => '麵價',
 '面包' => '麵包',
 '面坊' => '麵坊',
 '面坯儿' => '麵坯兒',
@@ -9370,7 +9378,6 @@
 '面条' => '麵條',
 '面汤' => '麵湯',
 '面浆' => '麵漿',
-'面灰' => '麵灰',

[MediaWiki-commits] [Gerrit] Made User::loadFromId() use READ_NORMAL by default - change (mediawiki/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Made User::loadFromId() use READ_NORMAL by default
..


Made User::loadFromId() use READ_NORMAL by default

* This covers CentralAuthHooks::onUserLoadFromSession()
  among other cases (OAuth user loading, ect).

Bug: T92357
Change-Id: I9c90027d8852ff8c1d626c03b5dbd765b95b0ce1
---
M includes/User.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/User.php b/includes/User.php
index 1ee8173..21c09cc 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -378,7 +378,7 @@
 * @param integer $flags User::READ_* constant bitfield
 * @return bool False if the ID does not exist, true otherwise
 */
-   public function loadFromId( $flags = self::READ_LATEST ) {
+   public function loadFromId( $flags = self::READ_NORMAL ) {
if ( $this->mId == 0 ) {
$this->loadDefaults();
return false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c90027d8852ff8c1d626c03b5dbd765b95b0ce1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Parse older format of Geo cookies - change (mediawiki...CentralNotice)

2015-06-25 Thread Ori.livneh (Code Review)

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

Change subject: Parse older format of Geo cookies
..


Parse older format of Geo cookies

As they are likely to stay cached in people's sessions for a while

Bug: T103720
Change-Id: I6ffdc977e87176b55ecdf8bf87992805184a29ad
(cherry picked from commit 8fa8caa1272fe924b7e6547a151984855b8fb408)
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index c2b7ee0..6a5fadf 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -55,7 +55,7 @@
$.cookie( 'GeoIP', parts.join( ':' ), { path: '/' } );
}
 
-   window.Geo = ( function ( match, country, region, city, lat, lon, af ) {
+   function sanitizeGeoCookie( match, country, region, city, lat, lon, af 
) {
if ( typeof country !== 'string' || ( country.length !== 0 && 
country.length !== 2 ) ) {
// 'country' is neither empty nor a country code (string of
// length 2), so something is wrong with the cookie, and we
@@ -68,6 +68,7 @@
lon = '';
af = 'vx';
}
+
return {
country: country,
region: region,
@@ -76,7 +77,24 @@
lon: lon && parseFloat( lon ),
af: af
};
-   } ).apply( null, ( $.cookie( 'GeoIP' ) || '' ).match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || [] );
+   }
+
+   function parseGeoCookie() {
+   var geoCookie = $.cookie( 'GeoIP' ) || '',
+   geoCookieMatches = geoCookie.match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ )
+   || geoCookie.match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ )
+   || [];
+
+   // When encountering the old cookie format, convert it to the 
new one with an empty region
+   if ( geoCookieMatches.length === 6 ) {
+   // Region field is missing, insert an empty one
+   geoCookieMatches = geoCookieMatches.slice( 0, 2 
).concat( [ '' ] ).concat( geoCookieMatches.slice( 2 ) );
+   }
+
+   return sanitizeGeoCookie.apply( null, geoCookieMatches );
+   }
+
+   window.Geo = parseGeoCookie();
 
// FIXME Following the switch to client-side banner selection, it would
// make more sense for this to be defined in bannerController.lib. 
Before

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ffdc977e87176b55ecdf8bf87992805184a29ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Parse older format of Geo cookies - change (mediawiki...CentralNotice)

2015-06-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Parse older format of Geo cookies
..

Parse older format of Geo cookies

As they are likely to stay cached in people's sessions for a while

Bug: T103720
Change-Id: I6ffdc977e87176b55ecdf8bf87992805184a29ad
(cherry picked from commit 8fa8caa1272fe924b7e6547a151984855b8fb408)
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 20 insertions(+), 2 deletions(-)


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

diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index c2b7ee0..6a5fadf 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -55,7 +55,7 @@
$.cookie( 'GeoIP', parts.join( ':' ), { path: '/' } );
}
 
-   window.Geo = ( function ( match, country, region, city, lat, lon, af ) {
+   function sanitizeGeoCookie( match, country, region, city, lat, lon, af 
) {
if ( typeof country !== 'string' || ( country.length !== 0 && 
country.length !== 2 ) ) {
// 'country' is neither empty nor a country code (string of
// length 2), so something is wrong with the cookie, and we
@@ -68,6 +68,7 @@
lon = '';
af = 'vx';
}
+
return {
country: country,
region: region,
@@ -76,7 +77,24 @@
lon: lon && parseFloat( lon ),
af: af
};
-   } ).apply( null, ( $.cookie( 'GeoIP' ) || '' ).match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || [] );
+   }
+
+   function parseGeoCookie() {
+   var geoCookie = $.cookie( 'GeoIP' ) || '',
+   geoCookieMatches = geoCookie.match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ )
+   || geoCookie.match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ )
+   || [];
+
+   // When encountering the old cookie format, convert it to the 
new one with an empty region
+   if ( geoCookieMatches.length === 6 ) {
+   // Region field is missing, insert an empty one
+   geoCookieMatches = geoCookieMatches.slice( 0, 2 
).concat( [ '' ] ).concat( geoCookieMatches.slice( 2 ) );
+   }
+
+   return sanitizeGeoCookie.apply( null, geoCookieMatches );
+   }
+
+   window.Geo = parseGeoCookie();
 
// FIXME Following the switch to client-side banner selection, it would
// make more sense for this to be defined in bannerController.lib. 
Before

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ffdc977e87176b55ecdf8bf87992805184a29ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Gilles 

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

[MediaWiki-commits] [Gerrit] Made LoadBalancer avoid yeilding DB objects that hopelessly ... - change (mediawiki/core)

2015-06-25 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Made LoadBalancer avoid yeilding DB objects that hopelessly 
lost the connection
..

Made LoadBalancer avoid yeilding DB objects that hopelessly lost the connection

* This is useful if the first slave picked went down and others
  can be used, especially in longer running scripts.
* A possible improvement to this would be to eventually allow
  retries by removing the bad handles from the load balancer,
  since isOpen() will never change from false. This would only
  be useful for very very long running CLI scripts and is
  probably an edge case for now.

Change-Id: Iecfc4004b4b2289907a4645b431de19198790d6c
---
M includes/db/DatabaseMysqlBase.php
M includes/db/LoadBalancer.php
2 files changed, 13 insertions(+), 4 deletions(-)


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

diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 86ade07..c468ce1 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -586,9 +586,12 @@
function ping() {
$ping = $this->mysqlPing();
if ( $ping ) {
+   // Connection was good or lost but reconnected...
+   // @note: mysqlnd (php 5.6+) does not support this (PHP 
bug 52561)
return true;
}
 
+   // Try a full disconnect/reconnect cycle if ping() failed
$this->closeConnection();
$this->mOpened = false;
$this->mConn = false;
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 069185b..1281187 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -650,10 +650,7 @@
public function openConnection( $i, $wiki = false ) {
if ( $wiki !== false ) {
$conn = $this->openForeignConnection( $i, $wiki );
-
-   return $conn;
-   }
-   if ( isset( $this->mConns['local'][$i][0] ) ) {
+   } elseif ( isset( $this->mConns['local'][$i][0] ) ) {
$conn = $this->mConns['local'][$i][0];
} else {
$server = $this->mServers[$i];
@@ -670,6 +667,15 @@
}
}
 
+   if ( $conn && !$conn->isOpen() ) {
+   // Connection was made but later unrecoverably lost for 
some reason.
+   // Do not return a handle that will just throw 
exceptions on use,
+   // but let the calling code (e.g. getReaderIndex) try 
another server.
+   // See DatabaseMyslBase::ping() for how this can happen.
+   $this->mErrorConnection = $conn;
+   $conn = false;
+   }
+
return $conn;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecfc4004b4b2289907a4645b431de19198790d6c
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] Throw exceptions when dead mysql DB handles are used instead... - change (mediawiki/core)

2015-06-25 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Throw exceptions when dead mysql DB handles are used instead of 
fatals
..

Throw exceptions when dead mysql DB handles are used instead of fatals

Bug: Bug: T103435
Change-Id: I75c4f3a950b3b333a289d0a6a41eb4f00c292121
---
M includes/db/DatabaseMysql.php
M includes/db/DatabaseMysqlBase.php
M includes/db/DatabaseMysqli.php
3 files changed, 56 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/221055/1

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 823d9b6..793e94f 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -33,6 +33,8 @@
 * @return resource False on error
 */
protected function doQuery( $sql ) {
+   $this->assertHandleIsValid();
+
if ( $this->bufferResults() ) {
$ret = mysql_query( $sql, $this->mConn );
} else {
@@ -48,8 +50,7 @@
 * @throws DBConnectionError
 */
protected function mysqlConnect( $realServer ) {
-   # Fail now
-   # Otherwise we get a suppressed fatal error, which is very hard 
to track down
+   # Avoid a suppressed fatal error, which is very hard to track 
down
if ( !extension_loaded( 'mysql' ) ) {
throw new DBConnectionError(
$this,
@@ -93,6 +94,8 @@
 * @return bool
 */
protected function mysqlSetCharset( $charset ) {
+   $this->assertHandleIsValid();
+
if ( function_exists( 'mysql_set_charset' ) ) {
return mysql_set_charset( $charset, $this->mConn );
} else {
@@ -104,6 +107,8 @@
 * @return bool
 */
protected function closeConnection() {
+   $this->assertHandleIsValid();
+
return mysql_close( $this->mConn );
}
 
@@ -111,6 +116,8 @@
 * @return int
 */
function insertId() {
+   $this->assertHandleIsValid();
+
return mysql_insert_id( $this->mConn );
}
 
@@ -118,6 +125,8 @@
 * @return int
 */
function lastErrno() {
+   $this->assertHandleIsValid();
+
if ( $this->mConn ) {
return mysql_errno( $this->mConn );
} else {
@@ -129,6 +138,8 @@
 * @return int
 */
function affectedRows() {
+   $this->assertHandleIsValid();
+
return mysql_affected_rows( $this->mConn );
}
 
@@ -137,6 +148,8 @@
 * @return bool
 */
function selectDB( $db ) {
+   $this->assertHandleIsValid();
+
$this->mDBname = $db;
 
return mysql_select_db( $db, $this->mConn );
@@ -183,10 +196,14 @@
}
 
protected function mysqlRealEscapeString( $s ) {
+   $this->assertHandleIsValid();
+
return mysql_real_escape_string( $s, $this->mConn );
}
 
protected function mysqlPing() {
+   $this->assertHandleIsValid();
+
return mysql_ping( $this->mConn );
}
 }
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index a189648..86ade07 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1059,6 +1059,23 @@
}
 
/**
+* Make sure that mConn is set (disconnects and ping() failure can 
unset it)
+*
+* This catches broken callers than catch and ignore disconnection 
exceptions.
+* Unlike checking isOpen(), this is safe to call inside of open().
+*
+* @throws DBUnexpectedError
+*/
+   protected function assertHandleIsValid() {
+   if ( !$this->mConn ) {
+   throw new DBUnexpectedError(
+   $this,
+   'DB connection was already closed or the 
connection dropped.'
+   );
+   }
+   }
+
+   /**
 * @param string $oldName
 * @param string $newName
 * @param bool $temporary
diff --git a/includes/db/DatabaseMysqli.php b/includes/db/DatabaseMysqli.php
index d2b5ecb..4fdda96 100644
--- a/includes/db/DatabaseMysqli.php
+++ b/includes/db/DatabaseMysqli.php
@@ -34,6 +34,8 @@
 * @return resource
 */
protected function doQuery( $sql ) {
+   $this->assertHandleIsValid();
+
if ( $this->bufferResults() ) {
$ret = $this->mConn->query( $sql );
} else {
@@ -50,8 +52,8 @@
 */
protected function mysqlConnect( $realServer ) {
globa

[MediaWiki-commits] [Gerrit] Improve appearance of libraries on Special:Version - change (mediawiki/core)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Improve appearance of libraries on Special:Version
..

Improve appearance of libraries on Special:Version

* Added licenses
* Added description (will always be in English)
* Added authors
* Bold library name, like we do with extensions and skins

Change-Id: I880756b489fb5a3f81d398d32162a186a1b919d8
---
M includes/libs/composer/ComposerLock.php
M includes/specials/SpecialVersion.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/src/mediawiki.special/mediawiki.special.version.css
5 files changed, 34 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/221054/1

diff --git a/includes/libs/composer/ComposerLock.php 
b/includes/libs/composer/ComposerLock.php
index 9c7bf2f..22c3319 100644
--- a/includes/libs/composer/ComposerLock.php
+++ b/includes/libs/composer/ComposerLock.php
@@ -30,6 +30,9 @@
$deps[$installed['name']] = array(
'version' => ComposerJson::normalizeVersion( 
$installed['version'] ),
'type' => $installed['type'],
+   'licenses' => isset( $installed['license'] ) ? 
$installed['license'] : array(),
+   'authors' => isset( $installed['authors'] ) ? 
$installed['authors'] : array(),
+   'description' => isset( 
$installed['description'] ) ? $installed['description']: '',
);
}
 
diff --git a/includes/specials/SpecialVersion.php 
b/includes/specials/SpecialVersion.php
index 4442d81..4d5ef0b 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -522,6 +522,9 @@
$out .= Html::openElement( 'tr' )
. Html::element( 'th', array(), $this->msg( 
'version-libraries-library' )->text() )
. Html::element( 'th', array(), $this->msg( 
'version-libraries-version' )->text() )
+   . Html::element( 'th', array(), $this->msg( 
'version-libraries-license' )->text() )
+   . Html::element( 'th', array(), $this->msg( 
'version-libraries-description' )->text() )
+   . Html::element( 'th', array(), $this->msg( 
'version-libraries-authors' )->text() )
. Html::closeElement( 'tr' );
 
foreach ( $lock->getInstalledDependencies() as $name => $info ) 
{
@@ -530,13 +533,28 @@
// in their proper section
continue;
}
+   $authors = array_map( function( $arr ) {
+   // If a homepage is set, link to it
+   if ( isset( $arr['homepage'] ) ) {
+   return "[{$arr['homepage']} 
{$arr['name']}]";
+   }
+   return $arr['name'];
+   }, $info['authors'] );
+   $authors = $this->listAuthors( $authors, false, 
"$IP/vendor/$name" );
$out .= Html::openElement( 'tr' )
. Html::rawElement(
'td',
array(),
-   Linker::makeExternalLink( 
"https://packagist.org/packages/$name";, $name )
+   Linker::makeExternalLink(
+   
"https://packagist.org/packages/$name";, $name,
+   true, '',
+   array( 'class' => 
'mw-version-library-name' )
+   )
)
. Html::element( 'td', array(), 
$info['version'] )
+   . Html::element( 'td', array(), 
$this->listToText( $info['licenses'] ) )
+   . Html::element( 'td', array(), 
$info['description'] )
+   . Html::rawElement( 'td', array(), $authors )
. Html::closeElement( 'tr' );
}
$out .= Html::closeElement( 'table' );
@@ -959,7 +977,8 @@
 *   'and others' will be added to the end of the credits.
 *
 * @param string|array $authors
-* @param string $extName Name of the extension for link creation
+* @param string|bool $extName Name of the extension for link creation, 
false
+* if no links should be created
 * @param string $extDir Path to the extension root directory
 *
 * @return string HTML fragment
@@ -972,7 +991,7

[MediaWiki-commits] [Gerrit] Add support for RPED - change (translatewiki)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Add support for RPED
..


Add support for RPED

Change-Id: I91d99f1701f4bb51a3a564208d50a00978f01761
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index b224b25..d948231 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1837,6 +1837,9 @@
 Right Functions
 optional = rightfunctions-rest1, rightfunctions-rest2, rightfunctions-rest3, 
rightfunctions-sep
 
+RPED
+ignored = rped-wikipedia-url
+
 RSS
 ignored = rss-item
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91d99f1701f4bb51a3a564208d50a00978f01761
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update tags - change (translatewiki)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Update tags
..


Update tags

Bug: T103923
Change-Id: Ie5f60362d32195b962a663985fa2e0798c31feb5
---
M groups/MediaWiki/MediaWiki.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 37411ea..eb4f855 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -575,10 +575,10 @@
   sourcePattern: "%GROUPROOT%/mediawiki/master/includes/api/i18n/%CODE%.json"
 
 TAGS:
-  optional:
-- api-help-flags
-- api-help-help-urls
   ignored:
+- api-help-help-urls
 - api-help-fallback-description
 - api-help-fallback-parameter
 - api-help-fallback-example
+- api-help-flags
+- api-help-param-type-password

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5f60362d32195b962a663985fa2e0798c31feb5
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update tags - change (translatewiki)

2015-06-25 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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

Change subject: Update tags
..

Update tags

Bug: T103923
Change-Id: Ie5f60362d32195b962a663985fa2e0798c31feb5
---
M groups/MediaWiki/MediaWiki.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/53/221053/1

diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 37411ea..eb4f855 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -575,10 +575,10 @@
   sourcePattern: "%GROUPROOT%/mediawiki/master/includes/api/i18n/%CODE%.json"
 
 TAGS:
-  optional:
-- api-help-flags
-- api-help-help-urls
   ignored:
+- api-help-help-urls
 - api-help-fallback-description
 - api-help-fallback-parameter
 - api-help-fallback-example
+- api-help-flags
+- api-help-param-type-password

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5f60362d32195b962a663985fa2e0798c31feb5
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] resourceloader: Add timing metrics for key operations - change (mediawiki/core)

2015-06-25 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: resourceloader: Add timing metrics for key operations
..

resourceloader: Add timing metrics for key operations

* Minification of css and js (resourceloader_filter).
* Total generation of module content
  - Fetching/generating of content (files, wikipage, dynamic).
  - Pre/post processing (concat, less>css, cssjanus, ..)

Change-Id: Id60e665dfb6280aa254116f0867b909afc6f878a
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/221052/1

diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index 92b0156..19083f9 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -216,10 +216,16 @@
$result = '';
try {
wfIncrStats( 
"resourceloader_cache.$filter.miss" );
+   $startTime = microtime( true );
+
$result = $this->applyFilter( $filter, $data );
if ( $options['cacheReport'] ) {
$result .= "\n/* cache key: $key */";
}
+
+   $stats = RequestContext::getMain()->getStats();
+   $stats->timing( 
"resourceloader_filter.$filter", microtime( true ) - $startTime );
+
$cache->set( $key, $result );
} catch ( Exception $e ) {
MWExceptionHandler::logException( $e );
@@ -984,12 +990,22 @@
$states[$name] = 'missing';
}
 
+   $stats = RequestContext::getMain()->getStats();
+
// Generate output
$isRaw = false;
foreach ( $modules as $name => $module ) {
try {
+   $startTime = microtime( true );
+
$content = $module->getModuleContent( $context 
);
 
+   $timing = microtime( true ) - $startTime;
+   $stats->increment( "resourceloader_build.all" );
+   $stats->increment( "resourceloader_build.$name" 
);
+   $stats->timing( "resourceloader_build.all", 
$timing );
+   $stats->timing( "resourceloader_build.$name", 
$timing );
+
// Append output
switch ( $context->getOnly() ) {
case 'scripts':

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

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

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

[MediaWiki-commits] [Gerrit] Fix some PHPCS issues - change (mediawiki/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix some PHPCS issues
..


Fix some PHPCS issues

Change-Id: I6289ce362f8dfde7baf2b665f082820898844973
---
M includes/actions/InfoAction.php
M includes/api/ApiFeedWatchlist.php
M includes/api/ApiFormatPhp.php
M includes/cache/MessageCache.php
M includes/htmlform/HTMLTextAreaField.php
M includes/htmlform/HTMLTextField.php
M includes/libs/BufferingStatsdDataFactory.php
M includes/libs/normal/UtfNormalUtil.php
M includes/media/FormatMetadata.php
M includes/parser/ParserCache.php
M includes/poolcounter/PoolCounter.php
M includes/profiler/output/ProfilerOutputDump.php
M includes/title/MalformedTitleException.php
13 files changed, 28 insertions(+), 17 deletions(-)

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



diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 203c687..bf86b51 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -448,7 +448,8 @@
}
}
$expiry = $title->getRestrictionExpiry( 
$restrictionType );
-   $formattedexpiry = $this->msg( 'parentheses', 
$this->getLanguage()->formatExpiry( $expiry ) )->escaped();
+   $formattedexpiry = $this->msg( 'parentheses',
+   $this->getLanguage()->formatExpiry( $expiry ) 
)->escaped();
$message .= $this->msg( 'word-separator' )->escaped() . 
$formattedexpiry;
 
// Messages: restriction-edit, restriction-move, 
restriction-create,
diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index d1beef8..853b138 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -126,7 +126,8 @@
 
$msg = wfMessage( 'watchlist' 
)->inContentLanguage()->text();
 
-   $feedTitle = $this->getConfig()->get( 'Sitename' ) . ' 
- ' . $msg . ' [' . $this->getConfig()->get( 'LanguageCode' ) . ']';
+   $feedTitle = $this->getConfig()->get( 'Sitename' ) . ' 
- ' . $msg .
+   ' [' . $this->getConfig()->get( 'LanguageCode' 
) . ']';
$feedUrl = SpecialPage::getTitleFor( 'Watchlist' 
)->getFullURL();
 
$feed = new $feedClasses[$params['feedformat']] (
diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php
index d88dd40..6420a5b 100644
--- a/includes/api/ApiFormatPhp.php
+++ b/includes/api/ApiFormatPhp.php
@@ -68,7 +68,8 @@
preg_match( '/\<\s*cross-domain-policy\s*\>/i', $text )
) {
$this->dieUsage(
-   'This response cannot be represented using 
format=php. See https://bugzilla.wikimedia.org/show_bug.cgi?id=66776',
+   'This response cannot be represented using 
format=php. ' .
+   'See 
https://bugzilla.wikimedia.org/show_bug.cgi?id=66776',
'internalerror'
);
}
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 79f4d6c..585fcd3 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -1113,7 +1113,8 @@
 
if ( !$title || !$title instanceof Title ) {
global $wgTitle;
-   wfDebugLog( 'GlobalTitleFail', __METHOD__ . ' called by 
' . wfGetAllCallers( 5 ) . ' with no title set.' );
+   wfDebugLog( 'GlobalTitleFail', __METHOD__ . ' called by 
' .
+   wfGetAllCallers( 5 ) . ' with no title set.' );
$title = $wgTitle;
}
// Sometimes $wgTitle isn't set either...
diff --git a/includes/htmlform/HTMLTextAreaField.php 
b/includes/htmlform/HTMLTextAreaField.php
index a4ed95f..e4f78b2 100644
--- a/includes/htmlform/HTMLTextAreaField.php
+++ b/includes/htmlform/HTMLTextAreaField.php
@@ -14,7 +14,7 @@
 
function getSpellCheck() {
$val = isset( $this->mParams['spellcheck'] ) ? 
$this->mParams['spellcheck'] : null;
-   if( is_bool( $val ) ) {
+   if ( is_bool( $val ) ) {
// "spellcheck" attribute literally requires "true" or 
"false" to work.
return $val === true ? 'true' : 'false';
}
diff --git a/includes/htmlform/HTMLTextField.php 
b/includes/htmlform/HTMLTextField.php
index 06b397f..9c5b868 100644
--- a/includes/htmlform/HTMLTextField.php
+++ b/includes/htmlform/HTMLTextField.php
@@ -7,7 +7,7 @@
 
function getSpellCheck() {
$val = isset( $this->mParams['spellcheck'] ) ? 
$this->mParams['spellch

[MediaWiki-commits] [Gerrit] mediawiki.ui: Add a new 'highlightColor' argument to .button... - change (mediawiki/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: mediawiki.ui: Add a new 'highlightColor' argument to 
.button-colors() instead of using mix()
..


mediawiki.ui: Add a new 'highlightColor' argument to .button-colors() instead 
of using mix()

Results from mix() aren't the same as the ones in the specification.
Added the correct colors as variables

Change-Id: I43e9413fc8d195f897426eeadce44f9ece294706
---
M resources/src/mediawiki.less/mediawiki.ui/mixins.less
M resources/src/mediawiki.less/mediawiki.ui/variables.less
M resources/src/mediawiki.ui/components/buttons.less
3 files changed, 19 insertions(+), 20 deletions(-)

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



diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less 
b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index 2d68457..db983a7 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -33,13 +33,13 @@
 // Button styling
 // 
 
-.button-colors(@bgColor) {
+.button-colors(@bgColor, @highlightColor) {
background: @bgColor;
 
&:hover {
// The inner bottom bevel should match the active background 
color.
box-shadow: 0 1px rgba(0, 0, 0, 10%), inset 0 -3px rgba(0, 0, 
0, 20%);
-   border-bottom-color: mix(#000, @bgColor, 20%);
+   border-bottom-color: @highlightColor;
}
 
&:focus {
@@ -55,15 +55,12 @@
 
&:active,
&.mw-ui-checked {
-   // lessphp doesn't implement shade 
(https://github.com/leafo/lessphp/issues/528);
-   // it passes it through, then ResourceLoader drops it.
-   // background: shade(@bgColor, 20%);
-   background: mix(#000, @bgColor, 20%);
+   background: @highlightColor;
box-shadow: none;
}
 }
 
-.button-colors(@bgColor) when (lightness(@bgColor) >= 70%) {
+.button-colors(@bgColor, @highlightColor) when (lightness(@bgColor) >= 70%) {
color: @colorButtonText;
border: 1px solid @colorGray12;
 
@@ -86,7 +83,7 @@
}
 }
 
-.button-colors(@bgColor) when (lightness(@bgColor) < 70%) {
+.button-colors(@bgColor, @highlightColor) when (lightness(@bgColor) < 70%) {
color: #fff;
// border of the same color as background so that light background and
// dark background buttons are the same height and width
@@ -106,7 +103,7 @@
}
 }
 
-.button-colors-quiet(@textColor) {
+.button-colors-quiet(@textColor, @highlightColor) {
// Quiet buttons all start gray, and reveal
// constructive/progressive/destructive color on hover and active.
color: @colorButtonText;
@@ -118,9 +115,7 @@
 
&:active,
&.mw-ui-checked {
-   // lessphp doesn't implement shade, see above
-   // color: shade(@textColor, 20%);
-   color: mix(#000, @textColor, 20%);
+   color: @highlightColor;
}
 
&:disabled {
diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less 
b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index f6bf382..8ffc6ed 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -21,12 +21,15 @@
 // Semantic background colors
 // Blue; for contextual use of a continuing action
 @colorProgressive: #347bff;
+@colorProgressiveHighlight: #2962CC;
 // Green; for contextual use of a positive finalizing action
 @colorConstructive: #00af89;
+@colorConstructiveHighlight: #008C6D;
 // Orange; for contextual use of returning to a past action
 @colorRegressive: #FF5D00;
 // Red; for contextual use of a negative action of high severity
 @colorDestructive: #d11d13;
+@colorDestructiveHighlight: #A7170F;
 // Orange; for contextual use of a potentially negative action of medium 
severity
 @colorMediumSevere: #FF5D00;
 // Yellow; for contextual use of a potentially negative action of low severity
@@ -41,6 +44,7 @@
 @colorText: @colorGray2;
 @colorTextLight: @colorGray6;
 @colorButtonText: @colorGray5;
+@colorButtonTextHighlight: @colorGray7;
 @colorDisabledText: @colorGray12;
 @colorErrorText: #CC;
 
diff --git a/resources/src/mediawiki.ui/components/buttons.less 
b/resources/src/mediawiki.ui/components/buttons.less
index f88f3ee..53e13b7 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -47,7 +47,7 @@
zoom: 1;
 
// Container styling
-   .button-colors(#FFF);
+   .button-colors(#FFF, #CCC);
border-radius: @borderRadius;
min-width: 4em;
 
@@ -135,10 +135,10 @@
// Styleguide 2.1.1.
&.mw-ui-progressive,
&.mw-ui-primary {
-

[MediaWiki-commits] [Gerrit] Fix some PHPCS issues - change (mediawiki/core)

2015-06-25 Thread Jackmcbarn (Code Review)

Jackmcbarn has uploaded a new change for review.

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

Change subject: Fix some PHPCS issues
..

Fix some PHPCS issues

Change-Id: I6289ce362f8dfde7baf2b665f082820898844973
---
M includes/actions/InfoAction.php
M includes/api/ApiFeedWatchlist.php
M includes/api/ApiFormatPhp.php
M includes/cache/MessageCache.php
M includes/htmlform/HTMLTextAreaField.php
M includes/htmlform/HTMLTextField.php
M includes/libs/BufferingStatsdDataFactory.php
M includes/libs/normal/UtfNormalUtil.php
M includes/media/FormatMetadata.php
M includes/parser/ParserCache.php
M includes/poolcounter/PoolCounter.php
M includes/profiler/output/ProfilerOutputDump.php
M includes/title/MalformedTitleException.php
13 files changed, 28 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/221051/1

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 203c687..bf86b51 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -448,7 +448,8 @@
}
}
$expiry = $title->getRestrictionExpiry( 
$restrictionType );
-   $formattedexpiry = $this->msg( 'parentheses', 
$this->getLanguage()->formatExpiry( $expiry ) )->escaped();
+   $formattedexpiry = $this->msg( 'parentheses',
+   $this->getLanguage()->formatExpiry( $expiry ) 
)->escaped();
$message .= $this->msg( 'word-separator' )->escaped() . 
$formattedexpiry;
 
// Messages: restriction-edit, restriction-move, 
restriction-create,
diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index d1beef8..853b138 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -126,7 +126,8 @@
 
$msg = wfMessage( 'watchlist' 
)->inContentLanguage()->text();
 
-   $feedTitle = $this->getConfig()->get( 'Sitename' ) . ' 
- ' . $msg . ' [' . $this->getConfig()->get( 'LanguageCode' ) . ']';
+   $feedTitle = $this->getConfig()->get( 'Sitename' ) . ' 
- ' . $msg .
+   ' [' . $this->getConfig()->get( 'LanguageCode' 
) . ']';
$feedUrl = SpecialPage::getTitleFor( 'Watchlist' 
)->getFullURL();
 
$feed = new $feedClasses[$params['feedformat']] (
diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php
index d88dd40..6420a5b 100644
--- a/includes/api/ApiFormatPhp.php
+++ b/includes/api/ApiFormatPhp.php
@@ -68,7 +68,8 @@
preg_match( '/\<\s*cross-domain-policy\s*\>/i', $text )
) {
$this->dieUsage(
-   'This response cannot be represented using 
format=php. See https://bugzilla.wikimedia.org/show_bug.cgi?id=66776',
+   'This response cannot be represented using 
format=php. ' .
+   'See 
https://bugzilla.wikimedia.org/show_bug.cgi?id=66776',
'internalerror'
);
}
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 79f4d6c..585fcd3 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -1113,7 +1113,8 @@
 
if ( !$title || !$title instanceof Title ) {
global $wgTitle;
-   wfDebugLog( 'GlobalTitleFail', __METHOD__ . ' called by 
' . wfGetAllCallers( 5 ) . ' with no title set.' );
+   wfDebugLog( 'GlobalTitleFail', __METHOD__ . ' called by 
' .
+   wfGetAllCallers( 5 ) . ' with no title set.' );
$title = $wgTitle;
}
// Sometimes $wgTitle isn't set either...
diff --git a/includes/htmlform/HTMLTextAreaField.php 
b/includes/htmlform/HTMLTextAreaField.php
index a4ed95f..e4f78b2 100644
--- a/includes/htmlform/HTMLTextAreaField.php
+++ b/includes/htmlform/HTMLTextAreaField.php
@@ -14,7 +14,7 @@
 
function getSpellCheck() {
$val = isset( $this->mParams['spellcheck'] ) ? 
$this->mParams['spellcheck'] : null;
-   if( is_bool( $val ) ) {
+   if ( is_bool( $val ) ) {
// "spellcheck" attribute literally requires "true" or 
"false" to work.
return $val === true ? 'true' : 'false';
}
diff --git a/includes/htmlform/HTMLTextField.php 
b/includes/htmlform/HTMLTextField.php
index 06b397f..9c5b868 100644
--- a/includes/htmlform/HTMLTextField.php
+++ b/includes/htmlform/HTMLTextField.php
@@ -7,7 +7,7 @@
 
function getSpellCheck() {
$val = isset( $this->mParams['spe

[MediaWiki-commits] [Gerrit] Code cleanup in ext.cx.tools.categories.js - change (mediawiki...ContentTranslation)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Code cleanup in ext.cx.tools.categories.js
..


Code cleanup in ext.cx.tools.categories.js

Change-Id: I212d274480cfe49735811a1cce66cc912cc9eb39
---
M modules/tools/ext.cx.tools.categories.js
1 file changed, 50 insertions(+), 34 deletions(-)

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



diff --git a/modules/tools/ext.cx.tools.categories.js 
b/modules/tools/ext.cx.tools.categories.js
index 49fd950..de6f869 100644
--- a/modules/tools/ext.cx.tools.categories.js
+++ b/modules/tools/ext.cx.tools.categories.js
@@ -12,7 +12,7 @@
'use strict';
 
/**
-* Handles the jump between category counter and listing
+* Handles the jump between category counter and listing.
 *
 * @param {Event} e The click event
 * @return {boolean} false
@@ -48,12 +48,13 @@
}
 
/**
-* Initializes the category counter
+* Initializes the category counter.
 */
CXCategoryCounter.prototype.init = function () {
var count = 0;
 
this.$view = this.getView();
+
if ( this.language === mw.cx.sourceLanguage &&
this.categoryTool.categories.source !== null
) {
@@ -68,7 +69,7 @@
};
 
/**
-* Retrieves the view for the category counter
+* Retrieves the view for the category counter.
 *
 * @return {jQuery}
 */
@@ -76,7 +77,9 @@
var $view, $button, $icon, $count;
 
$view = $( '' )
-   .prop( languageProps( $( 'html' ).prop( 'lang' ) ) )
+   // The container is in a content column, but it has UI 
strings,
+   // so the container is in the user language.
+   .prop( languageProps( mw.config.get( 'wgUserLanguage' ) 
) )
.addClass( 'cx-category-widget cx-category-counter' );
 
$button = $( '' )
@@ -107,7 +110,7 @@
};
 
/**
-* Updates the count shown in the category counter
+* Updates the count shown in the category counter.
 *
 * @param {integer} count The category count
 */
@@ -133,7 +136,7 @@
}
 
/**
-* Initializes the category listing
+* Initializes the category listing.
 */
CXCategoryListing.prototype.init = function () {
this.$view = this.getView();
@@ -184,7 +187,7 @@
};
 
/**
-* Handles click events on source list items
+* Handles click events on source list items.
 *
 * @param {Event} e The click event
 */
@@ -219,7 +222,7 @@
}
 
/**
-* Handles click events on the remove span inside target list items
+* Handles click events on the remove span inside target list items.
 *
 * @param {Event} e The click event
 */
@@ -252,7 +255,7 @@
}
 
/**
-* Highlights the category and connected category list items
+* Highlights the category and connected category list items.
 */
function highlightCategory() {
/*jshint validthis:true */
@@ -270,7 +273,7 @@
}
 
/**
-* Remove the highlight on the category and connected category list 
items
+* Remove the highlight on the category and connected category list 
items.
 */
function removeCategoryHighlight() {
/*jshint validthis:true */
@@ -288,17 +291,19 @@
}
 
/**
-* Gets the view for the category listing
+* Gets the view for the category listing.
 *
 * @return {jQuery}
 */
CXCategoryListing.prototype.getView = function () {
-   var categoryTool, $view, $anchor, $icon, $categoryList, 
$noCategories;
+   var categoryTool, $view, $icon, $categoryList, $anchor, 
$noCategories;
 
categoryTool = this.categoryTool;
 
$view = $( '' )
-   .prop( languageProps( $( 'html' ).prop( 'lang' ) ) )
+   // The container may show UI messages, so it's in the 
user language.
+   // The categories names are in the language of the 
column's content.
+   .prop( languageProps( mw.config.get( 'wgUserLanguage' ) 
) )
.addClass( 'cx-category-widget cx-category-listing' );
$icon = $( '' ).addClass( 'cx-category-icon' );
$categoryList = $( '' )
@@ -335,13 +340,13 @@
};
 
/**
-* Adds categories to the category listing
+* Adds categories to the category listing.
 *
 * @param {object} categories A key value object with ids and titles
 * @pa

[MediaWiki-commits] [Gerrit] planet: remove broken feeds - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: remove broken feeds
..

planet: remove broken feeds

Change-Id: I2b8ecaedc5185620c7b934d59c0f43b4947600a3
---
M modules/planet/templates/feeds/en_config.erb
M modules/planet/templates/feeds/fr_config.erb
M modules/planet/templates/feeds/ru_config.erb
M modules/planet/templates/feeds/zh_config.erb
4 files changed, 1 insertion(+), 16 deletions(-)


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

diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index 6dd7856..938253a 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -209,9 +209,6 @@
 [http://www.greenman.co.za/blog/?tag=wikimedia&feed=rss2]
 name=Ian Gilfillan (greenman)
 
-[http://www.wikipediasignpost.com/blog/?feed=rss2]
-name=Wikipedia Signpost
-
 [https://zikoblog.wordpress.com/category/wiki/feed/atom/]
 name=User:Ziko
 
@@ -347,9 +344,6 @@
 [https://greensmw.wordpress.com/feed/]
 name=Nischayn22
 
-[http://mw-watchlist.tumblr.com/rss]
-name=Blackjack48
-
 [https://bitterscotch.wordpress.com/tag/wikimedia/feed/]
 name=PlaneMad
 
@@ -421,9 +415,6 @@
 
 [https://kothariharsh.wordpress.com/tag/wikimedia/feed/]
 name=Kothari Harsh
-
-[http://blog.pragunbhutani.in/feed.xml]
-name=Pragun Bhutani
 
 [https://wikistaycation.wordpress.com/feed/]
 name=Wikistaycation
diff --git a/modules/planet/templates/feeds/fr_config.erb 
b/modules/planet/templates/feeds/fr_config.erb
index 1c72331..8c3d457 100644
--- a/modules/planet/templates/feeds/fr_config.erb
+++ b/modules/planet/templates/feeds/fr_config.erb
@@ -119,7 +119,7 @@
 [https://daindwarf.wordpress.com/category/wikipedia/feed/atom/]
 name=DainDwarf
 
-[http://alphos.fr/wordpress/cat/wikimedia/feed/]
+[http://wordpress.alphos.fr/wordpress/cat/wikimedia/feed/]
 name=Alphos
 
 [https://alphakilobit.wordpress.com/category/wikimedia/feed/atom/]
diff --git a/modules/planet/templates/feeds/ru_config.erb 
b/modules/planet/templates/feeds/ru_config.erb
index e009e99..07cec4f 100644
--- a/modules/planet/templates/feeds/ru_config.erb
+++ b/modules/planet/templates/feeds/ru_config.erb
@@ -38,9 +38,6 @@
 [http://altes.livejournal.com/data/rss?tag=wp]
 name = Altes
 
-[http://deevrod.livejournal.com/data/rss?tag=%D0%92%D0%B8%D0%BA%D0%B8%D0%BF%D0%B5%D0%B4%D0%B8%D1%8F]
-name = Deevrod
-
 [http://kv75.livejournal.com/data/rss?tag=wikipedia]
 name = Kv75
 
diff --git a/modules/planet/templates/feeds/zh_config.erb 
b/modules/planet/templates/feeds/zh_config.erb
index dc34dd9..42271f2 100644
--- a/modules/planet/templates/feeds/zh_config.erb
+++ b/modules/planet/templates/feeds/zh_config.erb
@@ -61,9 +61,6 @@
 [http://blog.sina.com.cn/rss/yongxinge.xml]
 name = 用心阁
 
-[http://feed.feedsky.com/wikizine]
-name = 维基观察
-
 [http://tw.myblog.yahoo.com/winertai/rss]
 name = winertai
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b8ecaedc5185620c7b934d59c0f43b4947600a3
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] Fix-up for I2ac604d3c042d - change (mediawiki/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix-up for I2ac604d3c042d
..


Fix-up for I2ac604d3c042d

Log time until picked up.

Change-Id: I67310aa2fdbfcb8b1fd394f490ef4885cf596b0c
---
M includes/jobqueue/JobRunner.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 77c4238..3dfffae 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -203,8 +203,8 @@
if ( $queuedTs ) {
// Record time to run for the job type
$pickupDelay = $popTime - $queuedTs;
-   $stats->timing( 
'jobqueue.pickup_delay.all', $queuedTs );
-   $stats->timing( 
"jobqueue.pickup_delay.$jType", $queuedTs );
+   $stats->timing( 
'jobqueue.pickup_delay.all', $pickupDelay );
+   $stats->timing( 
"jobqueue.pickup_delay.$jType", $pickupDelay );
}
 
// Mark the job as done on success or when the 
job cannot be retried

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67310aa2fdbfcb8b1fd394f490ef4885cf596b0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Compress png images - change (mediawiki...ContentTranslation)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Compress png images
..


Compress png images

find . -iname "*.png" | xargs -n1 -P4 optipng -o7

 modules/dashboard/images/cx-discuss.png | Bin 2867 -> 2864 bytes
 modules/dashboard/images/cx-information.png | Bin 3082 -> 3073 bytes
 modules/dashboard/images/trash_lightgray.png| Bin 1379 -> 1334 bytes
 modules/header/images/W_gray.png| Bin 1156 -> 1059 bytes
 modules/tools/images/dropdown.png   | Bin 413 -> 361 bytes
 modules/tools/images/link_flagged_lightgray.png | Bin 16955 -> 14881 bytes
 modules/tools/images/question-mark.png  | Bin 7613 -> 6254 bytes
 modules/tools/images/tag.png| Bin 1541 -> 1121 bytes
 modules/widgets/feedback/images/horn.png| Bin 669 -> 630 bytes

Change-Id: Ia6bfb0d4b7d00aef7a749a71fc87bde188ce8c58
---
M modules/dashboard/images/cx-discuss.png
M modules/dashboard/images/cx-information.png
M modules/dashboard/images/trash_lightgray.png
M modules/header/images/W_gray.png
M modules/tools/images/dropdown.png
M modules/tools/images/link_flagged_lightgray.png
M modules/tools/images/question-mark.png
M modules/tools/images/tag.png
M modules/widgets/feedback/images/horn.png
9 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/modules/dashboard/images/cx-discuss.png 
b/modules/dashboard/images/cx-discuss.png
index 2239660..c1a6528 100644
--- a/modules/dashboard/images/cx-discuss.png
+++ b/modules/dashboard/images/cx-discuss.png
Binary files differ
diff --git a/modules/dashboard/images/cx-information.png 
b/modules/dashboard/images/cx-information.png
index 00cae1e..09845fb 100644
--- a/modules/dashboard/images/cx-information.png
+++ b/modules/dashboard/images/cx-information.png
Binary files differ
diff --git a/modules/dashboard/images/trash_lightgray.png 
b/modules/dashboard/images/trash_lightgray.png
index da46045..35e7e40 100644
--- a/modules/dashboard/images/trash_lightgray.png
+++ b/modules/dashboard/images/trash_lightgray.png
Binary files differ
diff --git a/modules/header/images/W_gray.png b/modules/header/images/W_gray.png
index a33dc7d..c78438d 100644
--- a/modules/header/images/W_gray.png
+++ b/modules/header/images/W_gray.png
Binary files differ
diff --git a/modules/tools/images/dropdown.png 
b/modules/tools/images/dropdown.png
index 5d41847..419060c 100644
--- a/modules/tools/images/dropdown.png
+++ b/modules/tools/images/dropdown.png
Binary files differ
diff --git a/modules/tools/images/link_flagged_lightgray.png 
b/modules/tools/images/link_flagged_lightgray.png
index db8853c..53808fb 100644
--- a/modules/tools/images/link_flagged_lightgray.png
+++ b/modules/tools/images/link_flagged_lightgray.png
Binary files differ
diff --git a/modules/tools/images/question-mark.png 
b/modules/tools/images/question-mark.png
index a5ace76..e5ae025 100644
--- a/modules/tools/images/question-mark.png
+++ b/modules/tools/images/question-mark.png
Binary files differ
diff --git a/modules/tools/images/tag.png b/modules/tools/images/tag.png
index 882d493..20899d0 100644
--- a/modules/tools/images/tag.png
+++ b/modules/tools/images/tag.png
Binary files differ
diff --git a/modules/widgets/feedback/images/horn.png 
b/modules/widgets/feedback/images/horn.png
index 686e295..e153e7b 100644
--- a/modules/widgets/feedback/images/horn.png
+++ b/modules/widgets/feedback/images/horn.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6bfb0d4b7d00aef7a749a71fc87bde188ce8c58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Pginer 
Gerrit-Reviewer: Santhosh 
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-up for I2ac604d3c042d - change (mediawiki/core)

2015-06-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Fix-up for I2ac604d3c042d
..

Fix-up for I2ac604d3c042d

Log time until picked up.

Change-Id: I67310aa2fdbfcb8b1fd394f490ef4885cf596b0c
---
M includes/jobqueue/JobRunner.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/221049/1

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 77c4238..3dfffae 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -203,8 +203,8 @@
if ( $queuedTs ) {
// Record time to run for the job type
$pickupDelay = $popTime - $queuedTs;
-   $stats->timing( 
'jobqueue.pickup_delay.all', $queuedTs );
-   $stats->timing( 
"jobqueue.pickup_delay.$jType", $queuedTs );
+   $stats->timing( 
'jobqueue.pickup_delay.all', $pickupDelay );
+   $stats->timing( 
"jobqueue.pickup_delay.$jType", $pickupDelay );
}
 
// Mark the job as done on success or when the 
job cannot be retried

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67310aa2fdbfcb8b1fd394f490ef4885cf596b0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Merge branch 'master' into campaign_mixins - change (mediawiki...CentralNotice)

2015-06-25 Thread AndyRussG (Code Review)

AndyRussG has uploaded a new change for review.

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

Change subject: Merge branch 'master' into campaign_mixins
..

Merge branch 'master' into campaign_mixins

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62209266735270fae1ce0c4c7fec13f19d4f0ba3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: campaign_mixins
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] CX: Add eswiki-recommender campaign - change (operations/mediawiki-config)

2015-06-25 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: CX: Add eswiki-recommender campaign
..

CX: Add eswiki-recommender campaign

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7cf1076..88287cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14725,6 +14725,7 @@
'dewiki' => array( 'cxstats', 'staff-recommender' ),
'emlwiki' => array( 'cxstats', 'staff-recommender' ),
'fawiki' => array( 'cxstats', 'staff-recommender' ),
+   'eswiki' => array( 'newarticle', 'cxstats', 'staff-recommender', 
'eswiki-recommender' ),
'frwiki' => array( 'newarticle', 'cxstats', 'staff-recommender', 
'frwiki-recommender' ),
'furwiki' => array( 'cxstats', 'staff-recommender' ),
'hewiki' => array( 'cxstats', 'staff-recommender' ),

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

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

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

[MediaWiki-commits] [Gerrit] mw.loader: Omit private modules from the request queue - change (mediawiki/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: mw.loader: Omit private modules from the request queue
..


mw.loader: Omit private modules from the request queue

The server will just deny these modules with an error. We can
save that roundtrip by just assuming that state directly.

A fair number of these requests hit the server logs primarily from
two sources:

* Third parties that cache screen-scraped pages from before 2013.
  The private module wouldn't have existed in the HTML yet. Some scripts
  aren't cached by them and as such they get a really stretched hybrid.
  These sometimes end up making requests for modules that no longer exist
  or indeed modules that have since become private.

* Web browsers and proxies that add or modify code on the page which can
  cause some inline scripts to break. There is no recovery from that in
  the current system. But falling back to the server is no solution for
  private modules. (Per T36907; bug 34907)

Bug: T101806
Change-Id: If8780db1410dd9ca31b3c1c19a6381a58663edab
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index ec3c0c3..a815c99 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1357,7 +1357,16 @@
 
$.each( dependencies, function ( idx, module ) {
var state = mw.loader.getState( module 
);
+   // Only queue modules that are still in 
the initial 'registered' state
+   // (not ones already loading, ready or 
error).
if ( state === 'registered' && 
$.inArray( module, queue ) === -1 ) {
+   // Private modules must be 
embedded in the page. Don't bother queuing
+   // these as the server will 
deny them anyway (T101806).
+   if ( registry[module].group === 
'private' ) {
+   registry[module].state 
= 'error';
+   handlePending( module );
+   return;
+   }
queue.push( module );
if ( async ) {
registry[module].async 
= true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8780db1410dd9ca31b3c1c19a6381a58663edab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
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] Add a delete-stale-branch script. - change (mediawiki...release)

2015-06-25 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged.

Change subject: Add a delete-stale-branch script.
..


Add a delete-stale-branch script.

Change-Id: Ib385817506322ca2f439efcb9ae132648d587656
---
A bin/delete-stale-branch
1 file changed, 59 insertions(+), 0 deletions(-)

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



diff --git a/bin/delete-stale-branch b/bin/delete-stale-branch
new file mode 100755
index 000..41c9fbc
--- /dev/null
+++ b/bin/delete-stale-branch
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Copyright © 2015 Mukunda Modell
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# http://www.gnu.org/copyleft/gpl.html
+#
+
+# Delete a stale deployment branch, either by specifying the version number
+# or "auto" to automatically pick a branch older than 5 weeks.
+# This will stage symlink changes and run dsh to delete the branch remotely.
+
+export STALE_VERSION=$1
+DOLOGMSGNOLOG=1
+cd /srv/mediawiki-staging
+if [ "$1" == "" ]; then
+   echo "Usage: $0 [version|auto]"
+   echo "To delete a specific version:"
+echo "delete-stale 1.25wmf22"
+   echo "To automatically pick a stale version, use:"
+echo "delete-stale auto"
+   exit 1;
+fi
+
+if [ "$STALE_VERSION" == "auto" ]; then
+   STALE_VERSION=`find php-* -maxdepth 0 -type d -mtime +35 | head -1`
+fi
+
+if [ "${STALE_VERSION:0:4}" == "php-" ]; then
+   export STALE_VERSION="${STALE_VERSION:4}"
+fi
+
+if [ "$STALE_VERSION" == "" ]; then
+   echo "Unable to determine a stale version to delete"
+   exit 1
+fi
+
+read -p "About to delete php-$STALE_VERSION. Continue? "
+
+multiversion/deleteMediaWiki php-$STALE_VERSION
+sudo -u l10nupdate rm -rf php-$STALE_VERSION/cache/l10n/*
+rm -rf php-$STALE_VERSION
+
+git add -u docroot/bits/static/
+git add -u w/static/
+git commit -m "Remove $STALE_VERSION symlinks"
+dsh -g mediawiki-installation -M -F 40 -- "sudo -u mwdeploy -- rm -rf 
/srv/mediawiki/php-$STALE_VERSION"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib385817506322ca2f439efcb9ae132648d587656
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Thcipriani 
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 deploy-promote script - change (mediawiki...release)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: add deploy-promote script
..


add deploy-promote script

This script promotes a branch to a given group of wikis,
it automates many fiddly steps and performs some sanity
checks on the user input as well as validating the state of 
/srv/mediawiki-staging

Change-Id: I3d5582cfce3e2fd0544161f7a9491f51fabc11e8
---
A bin/deploy-promote
1 file changed, 89 insertions(+), 0 deletions(-)

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



diff --git a/bin/deploy-promote b/bin/deploy-promote
new file mode 100755
index 000..bfea897
--- /dev/null
+++ b/bin/deploy-promote
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Copyright © 2015 Mukunda Modell
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# http://www.gnu.org/copyleft/gpl.html
+#
+
+# deploy-promote promotes a specified group of wikis to the specified
+# wmf deployment branch (or the latest branch if none is specified)
+#
+# Example usage:
+#
+# bin/deploy-promote group0 1.26wmf10
+#
+# The above command promotes all group0 wikis (testwiki and mediawiki.org)
+# to version 1.26wmf10.
+
+set -e
+
+cd /srv/mediawiki-staging/
+export OLDVERSION=`/srv/mediawiki-staging/multiversion/activeMWVersions|cut -d 
" " -f1`
+NEWVERSION=`/srv/mediawiki-staging/multiversion/activeMWVersions|cut -d " " 
-f2`
+GRP=${1:-group1}
+export VERSION=${2:-$NEWVERSION}
+read -p "Promote $GRP from ${OLDVERSION} to ${VERSION}? Enter to continue, 
ctl-c cancel: "
+/srv/mediawiki-staging/multiversion/updateWikiversions $GRP php-${VERSION}
+
+git add wikiversions.json
+git add docroot/bits/static-current/
+git add w/static/current
+git add php
+
+MSG="$GRP wikis to ${VERSION}"
+NOLOGMSG=1 git commit -m "$MSG" -e
+
+git push gerrit HEAD:refs/for/master/${VERSION}
+
+git reset --hard HEAD^
+
+read -p "Now merge the patch and press enter to continue with git pull && 
sync-wikiversions"
+
+echo "Running git pull"
+
+git pull
+
+HEADMSG=`git log --pretty=oneline -1 | cut -f 2- -d " "`
+
+if [ "$HEADMSG" != "$MSG" ]; then
+echo "ERR: Pulled revision didn't match."
+echo "Expected: $MSG"
+echo "Actual: $HEADMSG"
+exit 1
+fi
+
+echo "Running sync-wikiversions"
+
+sync-wikiversions "$MSG"
+
+set +e
+[[ "$GRP" == "all" ]] && CHECK="wikipedia" || CHECK="wikinews"
+URLTOCHECK="https://en.$CHECK.org/wiki/Special:Version";
+echo "-"
+echo "Checking version on $URLTOCHECK"
+echo "Expect: $VERSION"
+echo -n "Response: "
+curl --silent --show-error $URLTOCHECK | grep --only-matching "$VERSION"
+echo
+echo "-"
+
+if [ $? -eq 0 ]; then
+echo "SUCCESS: version matched ${VERSION}"
+else
+echo "ERROR: did not match ${VERSION}"
+exit 1
+fi
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d5582cfce3e2fd0544161f7a9491f51fabc11e8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: fix feed URLs - non-wordpress redirects - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: fix feed URLs - non-wordpress redirects
..


planet: fix feed URLs - non-wordpress redirects

Some more redirected URLs, non-wordpress protocol redirects
and other changes.

Change-Id: Ic8a53723a71d4d0d551de41daf70835d1d0cd544
---
M modules/planet/templates/feeds/en_config.erb
M modules/planet/templates/feeds/es_config.erb
M modules/planet/templates/feeds/gmq_config.erb
3 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index f60242a..6dd7856 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -80,10 +80,10 @@
 [http://blog.anubite.co.uk/index.php/category/mediawiki/feed/]
 name=Rob Church
 
-[http://www.astick.net/blog/feed/?cat=4]
+[http://moononastick.com/blog/feed/?cat=4]
 name=User:The wub
 
-[http://mako.cc/copyrighteous/tags/planetwikimedia?flav=atom]
+[http://mako.cc/copyrighteous/tags/planetwikimedia/feed/atom]
 name=Benjamin Mako Hill
 
 [http://dialogicality.blogspot.com/feeds/posts/default/-/wiki]
@@ -188,7 +188,7 @@
 [http://tstarling.com/blog/category/wikimedia/feed/]
 name=Tim Starling
 
-[http://www.wikisym.org/category/wikimedia/feed]
+[http://www.wikisym.org/category/wikimedia/feed/]
 name=WikiSym
 
 [http://cometstyles.blogspot.com/feeds/posts/default/-/wikipedia]
@@ -266,7 +266,7 @@
 [http://suegardner.org/feed/atom/]
 name=Sue Gardner
 
-[http://gnuband.org/?feed=rss2]
+[http://feeds.feedburner.com/paolognuband]
 name=Paolo Massa (phauly@WP) Gnuband.org
 
 
[http://semantic-mediawiki.org/wiki/Special:Ask/-5B-5BNews-20date::%2B-5D-5D-20-5B-5Blanguage-20code::en-5D-5D/format%3Dfeed/sort%3Dnews-20date/order%3Ddesc/searchlabel%3DAtom/type%3Datom/title%3DSemantic-20MediaWiki-20%E2%80%93-20news/description%3DLatest-20news-20from-20semantic-2Dmediawiki.org/page%3Dfull/offset%3D0]
@@ -374,7 +374,7 @@
 [http://blog.wikimedia.de/tag/Wikidata+English/feed/]
 name=Wikidata (WMDE - English)
 
-[http://blogs.gnome.org/aklapper/category/computer/wikimedia/feed/]
+[https://blogs.gnome.org/aklapper/category/computer/wikimedia/feed/]
 name=Andre Klapper
 
 [http://wikimedia.fi/category/in-english/feed/]
@@ -452,7 +452,7 @@
 [http://terrychay.com/category/work/wikimedia/feed]
 name=Terry Chay
 
-[http://timotijhof.net/category/tools/feed/]
+[https://timotijhof.net/category/tools/feed/]
 name=User:Krinkle
 
 [https://tttwrites.wordpress.com/category/wikimedia/feed/]
diff --git a/modules/planet/templates/feeds/es_config.erb 
b/modules/planet/templates/feeds/es_config.erb
index f426a57..05d5f9b 100644
--- a/modules/planet/templates/feeds/es_config.erb
+++ b/modules/planet/templates/feeds/es_config.erb
@@ -78,6 +78,6 @@
 [http://lenguasyredes.blogspot.com/rss.xml]
 name=lenguasyredes
 
-[http://blog.wikimedia.org.es/rss.xml]
+[http://blog.wikimedia.es/rss.xml]
 name=Wikimedia España
 
diff --git a/modules/planet/templates/feeds/gmq_config.erb 
b/modules/planet/templates/feeds/gmq_config.erb
index cbf09c0..3d9c8a4 100644
--- a/modules/planet/templates/feeds/gmq_config.erb
+++ b/modules/planet/templates/feeds/gmq_config.erb
@@ -68,7 +68,7 @@
 name=StefanB
 language=sv
 
-[http://blog.wegge.dk/tag/wikipedia/feed/]
+[https://blog.wegge.dk/tag/wikipedia/feed/]
 name=Wegge
 language=da
 

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

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

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

[MediaWiki-commits] [Gerrit] planet: fix feed URLs - non-wordpress redirects - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: fix feed URLs - non-wordpress redirects
..

planet: fix feed URLs - non-wordpress redirects

Some more redirected URLs, non-wordpress protocol redirects
and other changes.

Change-Id: Ic8a53723a71d4d0d551de41daf70835d1d0cd544
---
M modules/planet/templates/feeds/en_config.erb
M modules/planet/templates/feeds/es_config.erb
M modules/planet/templates/feeds/gmq_config.erb
3 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index f60242a..6dd7856 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -80,10 +80,10 @@
 [http://blog.anubite.co.uk/index.php/category/mediawiki/feed/]
 name=Rob Church
 
-[http://www.astick.net/blog/feed/?cat=4]
+[http://moononastick.com/blog/feed/?cat=4]
 name=User:The wub
 
-[http://mako.cc/copyrighteous/tags/planetwikimedia?flav=atom]
+[http://mako.cc/copyrighteous/tags/planetwikimedia/feed/atom]
 name=Benjamin Mako Hill
 
 [http://dialogicality.blogspot.com/feeds/posts/default/-/wiki]
@@ -188,7 +188,7 @@
 [http://tstarling.com/blog/category/wikimedia/feed/]
 name=Tim Starling
 
-[http://www.wikisym.org/category/wikimedia/feed]
+[http://www.wikisym.org/category/wikimedia/feed/]
 name=WikiSym
 
 [http://cometstyles.blogspot.com/feeds/posts/default/-/wikipedia]
@@ -266,7 +266,7 @@
 [http://suegardner.org/feed/atom/]
 name=Sue Gardner
 
-[http://gnuband.org/?feed=rss2]
+[http://feeds.feedburner.com/paolognuband]
 name=Paolo Massa (phauly@WP) Gnuband.org
 
 
[http://semantic-mediawiki.org/wiki/Special:Ask/-5B-5BNews-20date::%2B-5D-5D-20-5B-5Blanguage-20code::en-5D-5D/format%3Dfeed/sort%3Dnews-20date/order%3Ddesc/searchlabel%3DAtom/type%3Datom/title%3DSemantic-20MediaWiki-20%E2%80%93-20news/description%3DLatest-20news-20from-20semantic-2Dmediawiki.org/page%3Dfull/offset%3D0]
@@ -374,7 +374,7 @@
 [http://blog.wikimedia.de/tag/Wikidata+English/feed/]
 name=Wikidata (WMDE - English)
 
-[http://blogs.gnome.org/aklapper/category/computer/wikimedia/feed/]
+[https://blogs.gnome.org/aklapper/category/computer/wikimedia/feed/]
 name=Andre Klapper
 
 [http://wikimedia.fi/category/in-english/feed/]
@@ -452,7 +452,7 @@
 [http://terrychay.com/category/work/wikimedia/feed]
 name=Terry Chay
 
-[http://timotijhof.net/category/tools/feed/]
+[https://timotijhof.net/category/tools/feed/]
 name=User:Krinkle
 
 [https://tttwrites.wordpress.com/category/wikimedia/feed/]
diff --git a/modules/planet/templates/feeds/es_config.erb 
b/modules/planet/templates/feeds/es_config.erb
index f426a57..05d5f9b 100644
--- a/modules/planet/templates/feeds/es_config.erb
+++ b/modules/planet/templates/feeds/es_config.erb
@@ -78,6 +78,6 @@
 [http://lenguasyredes.blogspot.com/rss.xml]
 name=lenguasyredes
 
-[http://blog.wikimedia.org.es/rss.xml]
+[http://blog.wikimedia.es/rss.xml]
 name=Wikimedia España
 
diff --git a/modules/planet/templates/feeds/gmq_config.erb 
b/modules/planet/templates/feeds/gmq_config.erb
index cbf09c0..3d9c8a4 100644
--- a/modules/planet/templates/feeds/gmq_config.erb
+++ b/modules/planet/templates/feeds/gmq_config.erb
@@ -68,7 +68,7 @@
 name=StefanB
 language=sv
 
-[http://blog.wegge.dk/tag/wikipedia/feed/]
+[https://blog.wegge.dk/tag/wikipedia/feed/]
 name=Wegge
 language=da
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8a53723a71d4d0d551de41daf70835d1d0cd544
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] toollabs: Add gomwiki and lrcwiki db hosts file entries - change (operations/puppet)

2015-06-25 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: toollabs: Add gomwiki and lrcwiki db hosts file entries
..


toollabs: Add gomwiki and lrcwiki db hosts file entries

Bug: T102647
Change-Id: I50a66b19d27fe0ea49dc97a8a2e18531db77d523
---
M modules/toollabs/templates/hosts.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/toollabs/templates/hosts.erb 
b/modules/toollabs/templates/hosts.erb
index c27db7e..5c11037 100644
--- a/modules/toollabs/templates/hosts.erb
+++ b/modules/toollabs/templates/hosts.erb
@@ -236,6 +236,7 @@
 10.64.37.5 suwikiquote.labsdb quwikiquote.labsdb kywiktionary.labsdb 
rowikisource.labsdb
 10.64.37.5 guwikiquote.labsdb lvwikibooks.labsdb map_bmswiki.labsdb 
thwikisource.labsdb
 10.64.37.5 hrwikiquote.labsdb wikimania2016wiki.labsdb cnwikimedia.labsdb
+10.64.37.5 lrcwiki.labsdb gomwiki.labsdb
 
 10.64.37.4 cswiki.labsdb svwiki.labsdb commonswiki.labsdb nowiki.labsdb
 10.64.37.4 zhwiki.labsdb bgwiktionary.labsdb idwiki.labsdb eowiki.labsdb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50a66b19d27fe0ea49dc97a8a2e18531db77d523
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] toollabs: Add gomwiki and lrcwiki db hosts file entries - change (operations/puppet)

2015-06-25 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: toollabs: Add gomwiki and lrcwiki db hosts file entries
..

toollabs: Add gomwiki and lrcwiki db hosts file entries

Bug: T102647
Change-Id: I50a66b19d27fe0ea49dc97a8a2e18531db77d523
---
M modules/toollabs/templates/hosts.erb
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/toollabs/templates/hosts.erb 
b/modules/toollabs/templates/hosts.erb
index c27db7e..5c11037 100644
--- a/modules/toollabs/templates/hosts.erb
+++ b/modules/toollabs/templates/hosts.erb
@@ -236,6 +236,7 @@
 10.64.37.5 suwikiquote.labsdb quwikiquote.labsdb kywiktionary.labsdb 
rowikisource.labsdb
 10.64.37.5 guwikiquote.labsdb lvwikibooks.labsdb map_bmswiki.labsdb 
thwikisource.labsdb
 10.64.37.5 hrwikiquote.labsdb wikimania2016wiki.labsdb cnwikimedia.labsdb
+10.64.37.5 lrcwiki.labsdb gomwiki.labsdb
 
 10.64.37.4 cswiki.labsdb svwiki.labsdb commonswiki.labsdb nowiki.labsdb
 10.64.37.4 zhwiki.labsdb bgwiktionary.labsdb idwiki.labsdb eowiki.labsdb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50a66b19d27fe0ea49dc97a8a2e18531db77d523
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] conf: Declare and document wgStatsdServer and wgStatsdMetric... - change (mediawiki/core)

2015-06-25 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: conf: Declare and document wgStatsdServer and 
wgStatsdMetricPrefix
..

conf: Declare and document wgStatsdServer and wgStatsdMetricPrefix

Follows-up 87dfc20.

Change-Id: Ie1b799a8f2a73b974ba8c930cfabc00e377d6eee
---
M includes/DefaultSettings.php
1 file changed, 23 insertions(+), 0 deletions(-)


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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0e6ff16..6856a57 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5693,6 +5693,29 @@
 $wgStatsFormatString = "stats/%s - %s 1 1 1 1 %s\n";
 
 /**
+ * Destination of statsd metrics.
+ *
+ * A hostname or IP with optional port. (Defaults to 8125).
+ *
+ * If not set, statsd metrics will not be collected.
+ *
+ * @see wfLogProfilingData
+ * @since 1.25
+ */
+$wgStatsdServer = false;
+
+/**
+ * Prefix for metric names sent to wgStatsdServer.
+ *
+ * Defaults to "MediaWiki".
+ *
+ * @see RequestContext::getStats
+ * @see BufferingStatsdDataFactory
+ * @since 1.25
+ */
+$wgStatsdMetricPrefix = false;
+
+/**
  * InfoAction retrieves a list of transclusion links (both to and from).
  * This number puts a limit on that query in the case of highly transcluded
  * templates.

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

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

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

[MediaWiki-commits] [Gerrit] planet: fix feed URLS - use https for wordpress - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: fix feed URLS - use https for wordpress
..

planet: fix feed URLS - use https for wordpress

In planet logs all redirected feed URLs appears as WARNINGS, like:

WARNING:planet.runner:Feed has moved from <..> to <..>.

One reason that created a lot of them is that apparentely wordpress.com
has switched to http->https redirects for all their blogs.

So instead of getting redirected we use the https URLs directly now.

Change-Id: Iedb1abb8878051064aec435b5450ec71787d3ec0
---
M modules/planet/templates/feeds/ar_config.erb
M modules/planet/templates/feeds/de_config.erb
M modules/planet/templates/feeds/en_config.erb
M modules/planet/templates/feeds/es_config.erb
M modules/planet/templates/feeds/fr_config.erb
M modules/planet/templates/feeds/gmq_config.erb
M modules/planet/templates/feeds/id_config.erb
M modules/planet/templates/feeds/it_config.erb
M modules/planet/templates/feeds/pl_config.erb
M modules/planet/templates/feeds/pt_config.erb
M modules/planet/templates/feeds/ro_config.erb
M modules/planet/templates/feeds/uk_config.erb
M modules/planet/templates/feeds/zh_config.erb
13 files changed, 75 insertions(+), 75 deletions(-)


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

diff --git a/modules/planet/templates/feeds/ar_config.erb 
b/modules/planet/templates/feeds/ar_config.erb
index 849b023..c49362b 100644
--- a/modules/planet/templates/feeds/ar_config.erb
+++ b/modules/planet/templates/feeds/ar_config.erb
@@ -23,10 +23,10 @@
 
 # Subscription configuration
 
-[http://khalidyousif.wordpress.com/tag/wiki/feed/atom/]
+[https://khalidyousif.wordpress.com/tag/wiki/feed/atom/]
 name=Khalid Yousif
 
-[http://osamak.wordpress.com/category/wikipedia/feed/atom/]
+[https://osamak.wordpress.com/category/wikipedia/feed/atom/]
 name=أسامة خالد
 
 
[http://teqnia01.blogspot.com/feeds/posts/default/-/%D9%88%D9%8A%D9%83%D9%8A%D8%A8%D9%8A%D8%AF%D9%8A%D8%A7]
diff --git a/modules/planet/templates/feeds/de_config.erb 
b/modules/planet/templates/feeds/de_config.erb
index bd1c570..31016e1 100644
--- a/modules/planet/templates/feeds/de_config.erb
+++ b/modules/planet/templates/feeds/de_config.erb
@@ -23,7 +23,7 @@
 
 # Subscription configuration
 
-[http://arnomane.wordpress.com/category/wiki-de/feed/atom/]
+[https://arnomane.wordpress.com/category/wiki-de/feed/atom/]
 name=Daniel Arnold
 
 #[http://wikimedia.ch/archives/category/de/feed]
@@ -69,7 +69,7 @@
 
[http://www.google.com/notebook/feeds/15241387604284059985/notebooks/BDRkjSwoQj5rvytgh]
 name=Thoken
 
-[http://piratenblog.wordpress.com/category/wiki/feed/atom/]
+[https://piratenblog.wordpress.com/category/wiki/feed/atom/]
 name=Elvis untot
 
 [http://blog.wikimedia.de/feed/]
@@ -87,7 +87,7 @@
 [http://feeds.feedburner.com/blogspot/PxHpw?format=xml]
 name=Iberty
 
-[http://lieselsartikel.wordpress.com/category/wikipedia/feed/atom/]
+[https://lieselsartikel.wordpress.com/category/wikipedia/feed/atom/]
 name=Liesel
 
 [http://achimraschka.blogspot.com/feeds/posts/default/-/Freies%20Wissen]
@@ -96,7 +96,7 @@
 [http://schmalenstroer.net/blog/tag/wikipedia/feed/]
 name=Michael Schmalenstroer
 
-[http://steproe.wordpress.com/category/wikimedia/feed/atom/]
+[https://steproe.wordpress.com/category/wikimedia/feed/atom/]
 name=Stepro
 
 [http://lyzzy.de/blog/category/wikimedia/feed/]
@@ -118,7 +118,7 @@
 [http://archiv.twoday.net/topics/Wikis/index.rdf]
 name=Archivalia (Benutzer:Historiograf)
 
-[http://wikiversitynews.wordpress.com/feed/]
+[https://wikiversitynews.wordpress.com/feed/]
 name=Wikiversity News
 
 [http://blog.sebmol.me/category/wikimedia-de/feed/]
diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index 22553e1..f60242a 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -1,4 +1,4 @@
-# ! This file is managed by puppet ! en.planet.wm - Planet Venus 
+# ! This file is managed by puppet ! en.planet.wm - Planet Venus
 # configuration file
 
 # Documentation: 
@@ -29,7 +29,7 @@
 [http://leuksman.com/log/category/wiki/feed/]
 name=Brion Vibber
 
-[http://arnomane.wordpress.com/category/wiki-en/feed/atom/]
+[https://arnomane.wordpress.com/category/wiki-en/feed/atom/]
 name=Daniel Arnold
 
 [http://davidgerard.co.uk/notes/category/wiki/feed/]
@@ -59,7 +59,7 @@
 [http://bookcraft.blogspot.com/feeds/posts/default]
 name=Robert Horning
 
-[http://gpollard.wordpress.com/category/wiki/feed/atom/]
+[https://gpollard.wordpress.com/category/wiki/feed/atom/]
 name=Gabriel Pollard
 
 [http://sleepyhead.org/tagged/wikipedia/rss]
@@ -95,7 +95,7 @@
 [http://ultimategerardm.blogspot.com/feeds/posts/default/]
 name=Gerard Meijssen
 
-[http://millosh.wordpress.com/tag/wikimedia/feed/atom/]
+[https://millosh.wordpress.com/tag/wikimedia/feed/atom/]
 name=Milos Ran

[MediaWiki-commits] [Gerrit] Iterate offline keying template - change (wikimedia...crm)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Iterate offline keying template
..


Iterate offline keying template

Change-Id: Ia39e8e5d044563a9369982f607e17ce8e009bc99
---
M sites/all/modules/offline2civicrm/templates/Individual - Hand Key Import 
Template.xlsx
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/templates/Individual - Hand Key 
Import Template.xlsx b/sites/all/modules/offline2civicrm/templates/Individual - 
Hand Key Import Template.xlsx
index 51e97de..200512c 100644
--- a/sites/all/modules/offline2civicrm/templates/Individual - Hand Key Import 
Template.xlsx
+++ b/sites/all/modules/offline2civicrm/templates/Individual - Hand Key Import 
Template.xlsx
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia39e8e5d044563a9369982f607e17ce8e009bc99
Gerrit-PatchSet: 6
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove fictitious letter_code field - change (wikimedia...crm)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Remove fictitious letter_code field
..


Remove fictitious letter_code field

Sounds like this has never actually worked nor been a thing.

Change-Id: I1371ea948955b5ed31fc513f71f7f93812b6a2a2
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 90b8cec..10b4103 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -313,7 +313,6 @@
 'source' => $msg['original_currency'] . ' ' . $msg['original_gross'],
 'contribution_recur_id' => $msg['contribution_recur_id'],
 'check_number' => $msg['check_number'],
-'letter_code' => $msg['letter_code'],
 'soft_credit_to' => $msg['soft_credit_to_id'],
 
 // API required fields
@@ -333,7 +332,6 @@
 */
 $custom_field_defaults = array(
 'Contribution_Comments' => '',
-'Gift_Data' => NULL,
 'gateway_account' => '',
 );
 
@@ -342,7 +340,6 @@
 'comment' => 'Contribution_Comments',
 'direct_mail_appeal' => 'Appeal',
 'gift_source' => 'Campaign',
-'letter_code' => 'Gift_Data',
 'postmark_date' => 'Postmark_Date',
 'restrictions' => 'Fund',
 'stock_description' => 'Description_of_Stock',
@@ -1237,7 +1234,6 @@
 'postal_code' => '',
 'postmark_date' => null,
 'check_number' => null,
-'letter_code' => null,
 'thankyou_date' => null,
 'recurring' => null,
 'utm_campaign' => null,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1371ea948955b5ed31fc513f71f7f93812b6a2a2
Gerrit-PatchSet: 6
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] maintain-replicas: Do not record centralauth in meta_p.wiki - change (operations/software)

2015-06-25 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: maintain-replicas: Do not record centralauth in meta_p.wiki
..

maintain-replicas: Do not record centralauth in meta_p.wiki

It is not a wiki.

Bug: T101750
Change-Id: I6c03f0fe8d30f4fcaa76ab969725b961c3a4495b
---
M maintain-replicas/maintain-replicas.pl
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/42/221042/1

diff --git a/maintain-replicas/maintain-replicas.pl 
b/maintain-replicas/maintain-replicas.pl
index 965bffa..aba6b78 100755
--- a/maintain-replicas/maintain-replicas.pl
+++ b/maintain-replicas/maintain-replicas.pl
@@ -382,11 +382,6 @@
 dbprop $family, "family", "$family";
 }
 
-$db{'centralauth'} = {
-'family' => 'centralauth',
-'slice' => 's7',
-};
-
 # Sadly, case sensitivity of titles isn't in a .dblist, nor is it
 # exposed through the API so we have to hardcode it here to match
 # what is in InitialiseSettings.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c03f0fe8d30f4fcaa76ab969725b961c3a4495b
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Add and fix migrations for legacy custom fields - change (wikimedia...crm)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Add and fix migrations for legacy custom fields
..


Add and fix migrations for legacy custom fields

Some older migrations were broken, but this would only have affected
dev and testing instances, not production.

Change-Id: Icb5d6137a815fc98a96637ff7f4db90eab49b1c4
---
M sites/all/modules/offline2civicrm/offline2civicrm.install
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
3 files changed, 79 insertions(+), 24 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.install 
b/sites/all/modules/offline2civicrm/offline2civicrm.install
index bd6f70c..bf0476a 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.install
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.install
@@ -49,8 +49,7 @@
 $success = $api->CustomGroup->get(array(
 'name' => 'Gift_Information',
 ));
-$result = $api->values();
-if (empty($result)) {
+if ( !$success || !count( $api->values ) ) {
 $success = $api->CustomGroup->create(array(
 'extends' => 'Contribution',
 'name' => 'Gift_Information',
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index ee4c707..416f967 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -35,6 +35,7 @@
 wmf_civicrm_update_7028();
 wmf_civicrm_update_7029();
 wmf_civicrm_update_7030();
+wmf_civicrm_update_7031();
 }
 
 /**
@@ -881,28 +882,24 @@
  */
 function wmf_civicrm_update_7022() {
 $api = wmf_civicrm_bootstrap_civi();
-$api->CustomGroup->get(array(
+$success = $api->CustomGroup->get(array(
 'name' => 'Gift_Data',
 ));
-$result = $api->values();
-if ($result) {
-return;
+if ( !$success || !count( $api->values ) ) {
+$success = $api->CustomGroup->create(array(
+'extends' => 'Contribution',
+'name' => 'Gift_Data',
+'title' => ts('Gift Data'),
+'is_active' => 1,
+));
+if (!$success) {
+throw new Exception( $api->errorMsg() );
+}
 }
-
-$success = $api->CustomGroup->create(array(
-'extends' => 'Contribution',
-'name' => 'Gift_Data',
-'title' => ts('Gift Data'),
-'is_active' => 1,
-));
-if (!$success) {
-throw new Exception('Could not create custom group');
-}
-$values = $api->values();
-$custom_group = array_pop($values);
+$custom_group_id = $api->values[0]->id;
 
 $success = $api->CustomField->create(array(
-'custom_group_id' => $custom_group->id,
+'custom_group_id' => $custom_group_id,
 'name' => 'Fund',
 'column_name' => 'fund',
 'label' => ts('Restrictions'),
@@ -914,11 +911,11 @@
 'is_searchable' => 1,
 ));
 if (!$success) {
-throw new Exception('Failed to create custom field.');
+throw new Exception( $api->errorMsg() );
 }
 
 $success = $api->CustomField->create(array(
-'custom_group_id' => $custom_group->id,
+'custom_group_id' => $custom_group_id,
 'name' => 'Campaign',
 'column_name' => 'campaign',
 'label' => ts('Gift Source'),
@@ -930,11 +927,11 @@
 'is_searchable' => 1,
 ));
 if (!$success) {
-throw new Exception('Failed to create custom field.');
+throw new Exception( $api->errorMsg() );
 }
 
 $success = $api->CustomField->create(array(
-'custom_group_id' => $custom_group->id,
+'custom_group_id' => $custom_group_id,
 'name' => 'Appeal',
 'column_name' => 'appeal',
 'label' => ts('Direct Mail Appeal'),
@@ -946,7 +943,7 @@
 'is_searchable' => 1,
 ));
 if (!$success) {
-throw new Exception('Failed to create custom field.');
+throw new Exception( $api->errorMsg() );
 }
 
 // TODO: define option groups in another migration if necessary
@@ -1255,3 +1252,61 @@
 
return implode( "\n", $warnings );
 }
+
+/**
+ * Add more custom fields that already exist on production
+ */
+function wmf_civicrm_update_7031() {
+$warnings = array();
+
+$api = wmf_civicrm_bootstrap_civi();
+
+// No API available yet.
+$existingTypes = array_flip( 
CRM_Contribute_PseudoConstant::contributionType() );
+if ( array_key_exists( 'Stock', $existingTypes ) ) {
+$stockContributionTypeId = $existingTypes['Stock'];
+} else {
+$params = array(
+'accounting_code' => 'STOCK',
+'is_active' => 1,
+'is_deductible' => 1,
+'name' => 'Stock',
+);
+$ids = array();
+

[MediaWiki-commits] [Gerrit] Add cnwikimedia to the list of wikis on labs - change (operations/puppet)

2015-06-25 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Add cnwikimedia to the list of wikis on labs
..


Add cnwikimedia to the list of wikis on labs

cnwikimedia has been recently added: T98676
I have sanitized cnwikimedia on T100441

Change-Id: I7cfc6c4d6928575b71643bf50b597cd44961d20a
---
M modules/toollabs/templates/hosts.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/templates/hosts.erb 
b/modules/toollabs/templates/hosts.erb
index 6402422..c27db7e 100644
--- a/modules/toollabs/templates/hosts.erb
+++ b/modules/toollabs/templates/hosts.erb
@@ -235,7 +235,7 @@
 10.64.37.5 bswiki.labsdb glwiki.labsdb glwikiquote.labsdb thwikinews.labsdb
 10.64.37.5 suwikiquote.labsdb quwikiquote.labsdb kywiktionary.labsdb 
rowikisource.labsdb
 10.64.37.5 guwikiquote.labsdb lvwikibooks.labsdb map_bmswiki.labsdb 
thwikisource.labsdb
-10.64.37.5 hrwikiquote.labsdb wikimania2016wiki.labsdb
+10.64.37.5 hrwikiquote.labsdb wikimania2016wiki.labsdb cnwikimedia.labsdb
 
 10.64.37.4 cswiki.labsdb svwiki.labsdb commonswiki.labsdb nowiki.labsdb
 10.64.37.4 zhwiki.labsdb bgwiktionary.labsdb idwiki.labsdb eowiki.labsdb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cfc6c4d6928575b71643bf50b597cd44961d20a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Implement 'Receiving notifications from subscribed newslette... - change (mediawiki...Newsletter)

2015-06-25 Thread Tinaj1234 (Code Review)

Tinaj1234 has uploaded a new change for review.

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

Change subject: Implement 'Receiving notifications from subscribed newsletters' 
feature for Newsletter extension
..

Implement 'Receiving notifications from subscribed newsletters' feature for 
Newsletter extension

Creates Echo notifications for subscribers of a newsletter whenever it 
announces a
new issue. Also adds a 'Newsletter' entry under 'echosubsciptions' section in
Notificatons tab of Special:Preferences.

Bug: T101546
Change-Id: Ie8d84c20c7b8cd8b2ba22c471044dc49fc500fb2
---
M Newsletter.hooks.php
M Newsletter.php
M i18n/en.json
A includes/EchoNewsletterFormatter.php
M includes/SpecialNewsletterManage.php
5 files changed, 98 insertions(+), 1 deletion(-)


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

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 7ea0d25..64891eb 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -4,6 +4,59 @@
  */
 class NewsletterHooks {
/**
+*Function to be called before EchoEvent
+*
+* @param array $notifications Echo notifications
+* @param array $notificationCategories Echo notification categories
+* @return bool
+*/
+   public static function onBeforeCreateEchoEvent( &$notifications, 
&$notificationCategories  ) {
+   $notificationCategories['newsletter'] = array(
+   'priority' => 3,
+   'tooltip' => 'echo-pref-tooltip-newsletter',
+   );
+   $notifications['subscribe-newsletter'] = array(
+   'formatter-class' => 'EchoNewsletterFormatter',
+   'title-message' => 'notification-newsletter-title',
+   'title-params' => array( 'newsletter' ),
+   'flyout-message' => 'notification-newsletter-flyout',
+   'flyout-params' => array( 'newsletter' ),
+
+   );
+   return true;
+   }
+
+   /**
+* Add user to be notified on echo event
+*
+* @param EchoEvent $event
+* @param User[] $users
+* @return bool
+*/
+   public static function onEchoGetDefaultNotifiedUsers( $event, &$users ) 
{
+   $extra = $event->getExtra();
+   $eventType = $event->getType();
+   if ( $eventType === 'subscribe-newsletter' ) {
+   $dbr = wfGetDB( DB_SLAVE );
+   $res = $dbr->select(
+   'nl_subscriptions',
+   array( 'subscriber_id' ),
+   array( 'newsletter_id' => 
$extra['newsletterId'] ),
+   __METHOD__,
+   array()
+   );
+   foreach( $res as $row ) {
+   $recipient = User::newFromId( 
$row->subscriber_id );
+   $id = $row->subscriber_id;
+   $users[$id] = $recipient;
+   }
+
+   }
+
+   return true;
+   }
+
+   /**
 * Add tables to Database
 *
 * @param DatabaseUpdater $updater
diff --git a/Newsletter.php b/Newsletter.php
index a3afa1b..87b260b 100755
--- a/Newsletter.php
+++ b/Newsletter.php
@@ -29,6 +29,7 @@
 $wgAutoloadClasses['SpecialNewsletterCreate'] = __DIR__ . 
'/includes/SpecialNewsletterCreate.php';
 $wgAutoloadClasses['SpecialNewsletterManage'] = __DIR__ . 
'/includes/SpecialNewsletterManage.php';
 $wgAutoloadClasses['SpecialNewsletters'] = __DIR__ . 
'/includes/SpecialNewsletters.php';
+$wgAutoloadClasses['EchoNewsletterFormatter'] = __DIR__ . 
'/includes/EchoNewsletterFormatter.php';
 
 $wgSpecialPages['NewsletterCreate'] = 'SpecialNewsletterCreate';
 $wgSpecialPages['NewsletterManage'] = 'SpecialNewsletterManage';
@@ -36,3 +37,5 @@
 
 //Register Hooks
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'NewsletterHooks::onLoadExtensionSchemaUpdates';
+$wgHooks['BeforeCreateEchoEvent'][] = 
'NewsletterHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'NewsletterHooks::onEchoGetDefaultNotifiedUsers';
diff --git a/i18n/en.json b/i18n/en.json
index 6d8d73c..3476cd0 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,5 +20,9 @@
"subscribe-button-label": "Subscribe",
"unsubscribe-button-label": "Unsubscribe",
"available-newsletters-field-label": "Available newsletters",
-   "subscribed-newsletters-field-label": "Subscribed newsletters"
+   "subscribed-newsletters-field-label": "Subscribed newsletters",
+   "echo-category-title-newsletter": "Newsletters",
+   "echo-pref-tooltip-newsletter": "Notify me when any of the newsletters 
to which I have subscribed to announces a ne

[MediaWiki-commits] [Gerrit] Tools: Add database alias for wikimania2016wiki - change (operations/puppet)

2015-06-25 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Tools: Add database alias for wikimania2016wiki
..


Tools: Add database alias for wikimania2016wiki

Bug: T96638
Change-Id: I7a5d779b8e674b69139e8192a2effad003a4f884
---
M modules/toollabs/templates/hosts.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/templates/hosts.erb 
b/modules/toollabs/templates/hosts.erb
index 466eebd..6402422 100644
--- a/modules/toollabs/templates/hosts.erb
+++ b/modules/toollabs/templates/hosts.erb
@@ -235,7 +235,7 @@
 10.64.37.5 bswiki.labsdb glwiki.labsdb glwikiquote.labsdb thwikinews.labsdb
 10.64.37.5 suwikiquote.labsdb quwikiquote.labsdb kywiktionary.labsdb 
rowikisource.labsdb
 10.64.37.5 guwikiquote.labsdb lvwikibooks.labsdb map_bmswiki.labsdb 
thwikisource.labsdb
-10.64.37.5 hrwikiquote.labsdb
+10.64.37.5 hrwikiquote.labsdb wikimania2016wiki.labsdb
 
 10.64.37.4 cswiki.labsdb svwiki.labsdb commonswiki.labsdb nowiki.labsdb
 10.64.37.4 zhwiki.labsdb bgwiktionary.labsdb idwiki.labsdb eowiki.labsdb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a5d779b8e674b69139e8192a2effad003a4f884
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Parse older format of Geo cookies - change (mediawiki...CentralNotice)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Parse older format of Geo cookies
..


Parse older format of Geo cookies

As they are likely to stay cached in people's sessions for a while

Bug: T103720
Change-Id: I6ffdc977e87176b55ecdf8bf87992805184a29ad
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index 99e6367..1df9163 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -55,7 +55,7 @@
$.cookie( 'GeoIP', parts.join( ':' ), { path: '/' } );
}
 
-   window.Geo = ( function ( match, country, region, city, lat, lon, af ) {
+   function sanitizeGeoCookie( match, country, region, city, lat, lon, af 
) {
if ( typeof country !== 'string' || ( country.length !== 0 && 
country.length !== 2 ) ) {
// 'country' is neither empty nor a country code (string of
// length 2), so something is wrong with the cookie, and we
@@ -68,6 +68,7 @@
lon = '';
af = 'vx';
}
+
return {
country: country,
region: region,
@@ -76,7 +77,24 @@
lon: lon && parseFloat( lon ),
af: af
};
-   } ).apply( null, ( $.cookie( 'GeoIP' ) || '' ).match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || [] );
+   }
+
+   function parseGeoCookie() {
+   var geoCookie = $.cookie( 'GeoIP' ) || '',
+   geoCookieMatches = geoCookie.match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ )
+   || geoCookie.match( 
/([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ )
+   || [];
+
+   // When encountering the old cookie format, convert it to the 
new one with an empty region
+   if ( geoCookieMatches.length === 6 ) {
+   // Region field is missing, insert an empty one
+   geoCookieMatches = geoCookieMatches.slice( 0, 2 
).concat( [ '' ] ).concat( geoCookieMatches.slice( 2 ) );
+   }
+
+   return sanitizeGeoCookie.apply( null, geoCookieMatches );
+   }
+
+   window.Geo = parseGeoCookie();
 
// FIXME Following the switch to client-side banner selection, it would
// make more sense for this to be defined in bannerController.lib. 
Before

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ffdc977e87176b55ecdf8bf87992805184a29ad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Jeremyb 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Puppetize toolserver.org legacy server - change (operations/puppet)

2015-06-25 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Puppetize toolserver.org legacy server
..


Puppetize toolserver.org legacy server

This handles the web redirect part

Bug: T85165
Change-Id: I491492e7dda198336a93a2d57129a3822ddc8699
---
A files/misc/relic/index.html
A files/misc/relic/notfound.html
A files/ssl/toolserver.org.crt
A manifests/role/relic.pp
A templates/apache/sites/www.toolserver.org.erb
5 files changed, 442 insertions(+), 0 deletions(-)

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



diff --git a/files/misc/relic/index.html b/files/misc/relic/index.html
new file mode 100644
index 000..9b41f7b
--- /dev/null
+++ b/files/misc/relic/index.html
@@ -0,0 +1,27 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml";>
+  
+Goodbye, Toolserver!
+  
+  
+We've moved!
+  
+https://upload.wikimedia.org/wikipedia/commons/b/be/Wikimedia_Community_Logo-Toolserver.svg";
+ HEIGHT="200" WIDTH="200" STYLE="margins: 2em;"/>
+https://upload.wikimedia.org/wikipedia/commons/1/13/Go-next-grey.svg";
+ HEIGHT="200" WIDTH="200" STYLE="margins: 2em;"/>
+https://upload.wikimedia.org/wikipedia/commons/a/a4/Tool_labs_logo.svg";
+ HEIGHT="200" WIDTH="200" STYLE="margins: 2em;"/>
+  
+
+
+  The Wikimedia Toolserver was a collaborative platform providing Unix 
hosting
+  for various software tools written and used by Wikimedia editors and 
operated by
+  http://www.wikimedia.de/";>Wikimedia Deutschland e.V.
+  It has been replaced by the Wikimedia Labs,
+  with the services that used to be provided by the Toolserver available 
through the
+  Tool 
Labs project.
+
+  
+
+
diff --git a/files/misc/relic/notfound.html b/files/misc/relic/notfound.html
new file mode 100644
index 000..e0352fe
--- /dev/null
+++ b/files/misc/relic/notfound.html
@@ -0,0 +1,33 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml";>
+  
+No redirect found
+  
+  
+We've moved!
+  
+https://upload.wikimedia.org/wikipedia/commons/b/be/Wikimedia_Community_Logo-Toolserver.svg";
+ HEIGHT="200" WIDTH="200" STYLE="margins: 2em;"/>
+https://upload.wikimedia.org/wikipedia/commons/1/13/Go-next-grey.svg";
+ HEIGHT="200" WIDTH="200" STYLE="margins: 2em;"/>
+https://upload.wikimedia.org/wikipedia/commons/a/a4/Tool_labs_logo.svg";
+ HEIGHT="200" WIDTH="200" STYLE="margins: 2em;"/>
+  
+
+
+  We're sorry, but the user-supported tool you have attempted to 
reach
+  did not leave a forwarding URL where we could automatically redirect 
you.
+  
+  You may find the tool you are looking for, or another similar tool, by
+  consulting the Tool Lab's index of 
tools.
+  
+  The Wikimedia Toolserver was a collaborative platform providing Unix 
hosting
+  for various software tools written and used by Wikimedia editors and 
operated by
+  http://www.wikimedia.de/";>Wikimedia Deutschland e.V.
+  It has been replaced by the Wikimedia Labs,
+  with the services that used to be provided by the Toolserver available 
through the
+  Tool 
Labs project.
+
+  
+
+
diff --git a/files/ssl/toolserver.org.crt b/files/ssl/toolserver.org.crt
new file mode 100644
index 000..18ea161
--- /dev/null
+++ b/files/ssl/toolserver.org.crt
@@ -0,0 +1,74 @@
+-BEGIN CERTIFICATE-
+MIIFNjCCBB6gAwIBAgIDEnGyMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTQwNDI2MTkzMDI2WhcNMTUwNjI5MDExMjMyWjCBvzEpMCcGA1UEBRMga05n
+RG1MRVRmZ292RUlNLUFvWFpoTUQzbFBJYzJKbmcxEzARBgNVBAsTCkdUNjgzMDg3
+OTkxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMRkwFwYDVQQDDBAqLnRvb2xzZXJ2ZXIub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAvaQZtVLxNRE9bhkjvpVsKFhb2xSpsGm19Hpm9/gO
+6jilhybT2MGIm4fz34THR17KcqWAIJmmJDDdQ6bfohBZiQxl03VV16YjMLc0fVJl
+WzIxNAIEkVpE1dUREZZjZJSFPYjnkYb8c/Ym855pwFIl4Xl96KN8KYb0xWMn0RiI
+u0tlFgolawaiSWzRWMGUmxXTJdNWjdwRrZuxn9EJtpJvo02DBs4lBSWEJ4Lgjpmk
+TVi4od+ulFau20Dvmvs/XS38MjeBkO0FHvMor36I7ya4/BpttxbtW9RUrlPm9V30
+cnTSLwKwEkRTY2KQsY1187sfLAcwfDmalwnyO/xT9W5R1QIDAQABo4IBuzCCAbcw
+HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLnRv
+b2xzZXJ2ZXIub3Jngg50b29sc2VydmVyLm9yZzBDBgNVHR8EPDA6MDigNqA0hjJo
+dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
+bDAdBgNVHQ4EFgQU0MhaiShFfZxvXNN9X0JK1eRGkvQwDAYDVR0TAQH/BAIwADB4
+BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
+Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
+ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
+NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lm

[MediaWiki-commits] [Gerrit] Make WmfImportFile the default offline import format - change (wikimedia...crm)

2015-06-25 Thread Cdentinger (Code Review)

Cdentinger has submitted this change and it was merged.

Change subject: Make WmfImportFile the default offline import format
..


Make WmfImportFile the default offline import format

Provide a new fallback gateway to catch any imports where the gateway
can't be determined from contribution type and payment instrument.

Bug: T88836
Change-Id: I4ae1b956c865d0086682f7cb8403729d8b6ca0ee
---
M sites/all/modules/offline2civicrm/ChecksFile.php
M sites/all/modules/offline2civicrm/import_checks.drush.inc
M sites/all/modules/offline2civicrm/offline2civicrm.module
M 
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
4 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php 
b/sites/all/modules/offline2civicrm/ChecksFile.php
index 62ef250..53c8b9a 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ChecksFile.php
@@ -237,6 +237,10 @@
 $msg['soft_credit_to'] = 
$nickname_mapping[$msg['soft_credit_to']];
 }
 }
+
+if ( empty( $msg['gateway'] ) ) {
+$msg['gateway'] = 'generic_import';
+}
 }
 
 /**
diff --git a/sites/all/modules/offline2civicrm/import_checks.drush.inc 
b/sites/all/modules/offline2civicrm/import_checks.drush.inc
index 4672e8d..e6eada9 100644
--- a/sites/all/modules/offline2civicrm/import_checks.drush.inc
+++ b/sites/all/modules/offline2civicrm/import_checks.drush.inc
@@ -46,7 +46,7 @@
 function drush_import_checks() {
$args = drush_get_arguments();
$filename = $args[1];
-   $type = drush_get_option( 'type', 'ChecksFile' );
+   $type = drush_get_option( 'type', 'WmfImportFile' );
 
try {
civicrm_initialize();
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 9a741e1..e325f4a 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -97,11 +97,12 @@
   $form['import_upload_format'] = array(
 '#title' => t( 'File format' ),
 '#type' => 'radios',
-'#default_value' => 'engage',
+'#default_value' => 'generic',
 '#options' => array(
 'engage' => t( 'Engage' ),
 'coinbase' => t( 'Coinbase Merchant Orders' ),
 'foreign_checks' => t( 'Foreign Checks' ),
+'generic' => t( 'Generic' ),
 'jpmorgan' => t( 'JP Morgan' ),
 'paypal' => t( 'PayPal EFT' ),
 ),
diff --git 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index f4bffb6..09372cb 100644
--- 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++ 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -13,6 +13,7 @@
 'ASTROPAY' => 'Astropay',
 'COINBASE' => 'Coinbase',
 'ENGAGE' => 'Engage',
+'GENERIC_IMPORT' => 'Generic Import',
 'GLOBALCOLLECT' => 'GlobalCollect',
 'JPMORGAN' => 'JP Morgan',
 'PAYPAL' => 'PayPal',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ae1b956c865d0086682f7cb8403729d8b6ca0ee
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: besides http_proxy need https_proxy too - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: besides http_proxy need https_proxy too
..


planet: besides http_proxy need https_proxy too

Some feed URLs are https, not http. We need to also set
https_proxy for those to be proxied.

Bug:T101730
Change-Id: Iea104b5711c853c3ebb12626ad4a3cb3e43b0ca5
---
M modules/planet/manifests/cronjob.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index 59120bc..c1a125c 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "http_proxy=\"${planet::planet_http_proxy}\" ${planet_bin} 
-v ${planet_config} > ${planet_logfile} 2>&1",
+command => "http_proxy=\"${planet::planet_http_proxy}\" 
https_proxy=\$http_proxy ${planet_bin} -v ${planet_config} > ${planet_logfile} 
2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea104b5711c853c3ebb12626ad4a3cb3e43b0ca5
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] planet: fix feed URLs (part 1) - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: fix feed URLs (part 1)
..


planet: fix feed URLs (part 1)

Fixing moved feed URLs, reported as "Feed has moved.." in logs.
and some protocol redirects.

Change-Id: If2c77dbfda4c1198c6e622bf829d6e7d0e2d4ec0
---
M modules/planet/templates/feeds/fr_config.erb
M modules/planet/templates/feeds/uk_config.erb
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/modules/planet/templates/feeds/fr_config.erb 
b/modules/planet/templates/feeds/fr_config.erb
index 6b42a15..4bb6a94 100644
--- a/modules/planet/templates/feeds/fr_config.erb
+++ b/modules/planet/templates/feeds/fr_config.erb
@@ -47,7 +47,7 @@
 [http://david.monniaux.free.fr/dotclear/index.php/feed/category/Wikipedia/atom]
 name=David Monniaux
 
-[http://compteurdedit.over-blog.com/rss2.php]
+[http://compteurdedit.over-blog.com/rss]
 name=Serein
 
 [http://poulpy.blogspot.com/feeds/posts/default]
@@ -80,13 +80,13 @@
 [http://pymouss.blogspot.com/feeds/posts/default/-/Wikip%C3%A9dia]
 name=Pymouss
 
-[http://ludopourquoipas.wordpress.com/category/wikipedia/feed/atom/]
+[https://ludopourquoipas.wordpress.com/category/wikipedia/feed/atom/]
 name=Ludo
 
 [http://garfieldairlines.net/wordpress/?feed=rss2&tag=wikipedia-2]
 name=Garfieldairlines
 
-[http://feed.wikimedia.fr]
+[http://feeds2.feedburner.com/WikimediaFrance]
 name=Wikimédia France
 
 [http://styeb.blogspot.com/feeds/posts/default/-/wikimedia]
@@ -104,7 +104,7 @@
 [http://blog.kiwix.org/feed/tag/Wikim%C3%A9dia%20France/atom]
 name=Kiwix
 
-[http://litlok.over-blog.com/rss-articles.xml]
+[http://litlok.over-blog.com/rss]
 name=Litlok
 
 [http://www.framablog.org/index.php/feed/tag/Wikipedia/atom]
@@ -137,7 +137,7 @@
 [http://littletony87.unblog.fr/feed/]
 name=littletony87
 
-[http://canardwp.wordpress.com/category/wikipedia/feed/atom/]
+[https://canardwp.wordpress.com/category/wikipedia/feed/atom/]
 name=CanardWP
 
 [http://lama-fache.blogspot.com/feeds/posts/default/-/Wikip%C3%A9dia]
diff --git a/modules/planet/templates/feeds/uk_config.erb 
b/modules/planet/templates/feeds/uk_config.erb
index 604d83c..ffa828a 100644
--- a/modules/planet/templates/feeds/uk_config.erb
+++ b/modules/planet/templates/feeds/uk_config.erb
@@ -26,6 +26,6 @@
 [http://wikimediaukraine.wordpress.com/feed/]
 name=Вікімедіа Україна
 
-[http://wle.org.ua/feed/]
+[http://wikilovesearth.org.ua/feed/]
 name=Вікі любить Землю
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2c77dbfda4c1198c6e622bf829d6e7d0e2d4ec0
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] planet: besides http_proxy need https_proxy too - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: besides http_proxy need https_proxy too
..

planet: besides http_proxy need https_proxy too

Some feed URLs are https, not http. We need to also set
https_proxy for those to be proxied.

Bug:T101730
Change-Id: Iea104b5711c853c3ebb12626ad4a3cb3e43b0ca5
---
M modules/planet/manifests/cronjob.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index 59120bc..c1a125c 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "http_proxy=\"${planet::planet_http_proxy}\" ${planet_bin} 
-v ${planet_config} > ${planet_logfile} 2>&1",
+command => "http_proxy=\"${planet::planet_http_proxy}\" 
https_proxy=\$http_proxy ${planet_bin} -v ${planet_config} > ${planet_logfile} 
2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea104b5711c853c3ebb12626ad4a3cb3e43b0ca5
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] Import organization contact name and title - change (wikimedia...crm)

2015-06-25 Thread Cdentinger (Code Review)

Cdentinger has submitted this change and it was merged.

Change subject: Import organization contact name and title
..


Import organization contact name and title

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae0988607a3efce0c37bda2063575979a0a939b6
Gerrit-PatchSet: 14
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: fix feed URLs (part 1) - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: fix feed URLs (part 1)
..

planet: fix feed URLs (part 1)

Fixing moved feed URLs, reported as "Feed has moved.." in logs.
and some protocol redirects.

Change-Id: If2c77dbfda4c1198c6e622bf829d6e7d0e2d4ec0
---
M modules/planet/templates/feeds/fr_config.erb
M modules/planet/templates/feeds/uk_config.erb
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/221039/1

diff --git a/modules/planet/templates/feeds/fr_config.erb 
b/modules/planet/templates/feeds/fr_config.erb
index 6b42a15..4bb6a94 100644
--- a/modules/planet/templates/feeds/fr_config.erb
+++ b/modules/planet/templates/feeds/fr_config.erb
@@ -47,7 +47,7 @@
 [http://david.monniaux.free.fr/dotclear/index.php/feed/category/Wikipedia/atom]
 name=David Monniaux
 
-[http://compteurdedit.over-blog.com/rss2.php]
+[http://compteurdedit.over-blog.com/rss]
 name=Serein
 
 [http://poulpy.blogspot.com/feeds/posts/default]
@@ -80,13 +80,13 @@
 [http://pymouss.blogspot.com/feeds/posts/default/-/Wikip%C3%A9dia]
 name=Pymouss
 
-[http://ludopourquoipas.wordpress.com/category/wikipedia/feed/atom/]
+[https://ludopourquoipas.wordpress.com/category/wikipedia/feed/atom/]
 name=Ludo
 
 [http://garfieldairlines.net/wordpress/?feed=rss2&tag=wikipedia-2]
 name=Garfieldairlines
 
-[http://feed.wikimedia.fr]
+[http://feeds2.feedburner.com/WikimediaFrance]
 name=Wikimédia France
 
 [http://styeb.blogspot.com/feeds/posts/default/-/wikimedia]
@@ -104,7 +104,7 @@
 [http://blog.kiwix.org/feed/tag/Wikim%C3%A9dia%20France/atom]
 name=Kiwix
 
-[http://litlok.over-blog.com/rss-articles.xml]
+[http://litlok.over-blog.com/rss]
 name=Litlok
 
 [http://www.framablog.org/index.php/feed/tag/Wikipedia/atom]
@@ -137,7 +137,7 @@
 [http://littletony87.unblog.fr/feed/]
 name=littletony87
 
-[http://canardwp.wordpress.com/category/wikipedia/feed/atom/]
+[https://canardwp.wordpress.com/category/wikipedia/feed/atom/]
 name=CanardWP
 
 [http://lama-fache.blogspot.com/feeds/posts/default/-/Wikip%C3%A9dia]
diff --git a/modules/planet/templates/feeds/uk_config.erb 
b/modules/planet/templates/feeds/uk_config.erb
index 604d83c..ffa828a 100644
--- a/modules/planet/templates/feeds/uk_config.erb
+++ b/modules/planet/templates/feeds/uk_config.erb
@@ -26,6 +26,6 @@
 [http://wikimediaukraine.wordpress.com/feed/]
 name=Вікімедіа Україна
 
-[http://wle.org.ua/feed/]
+[http://wikilovesearth.org.ua/feed/]
 name=Вікі любить Землю
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2c77dbfda4c1198c6e622bf829d6e7d0e2d4ec0
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] Remove paragraph tags around the page content to make W3C Va... - change (mediawiki...WPtouch)

2015-06-25 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged.

Change subject: Remove paragraph tags around the page content to make W3C 
Validator happy
..


Remove paragraph tags around the page content to make W3C Validator happy

Change-Id: Id8fcbccd9f59909b102a0b8256c39161ec18a1d2
---
M WPtouch.skin.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/WPtouch.skin.php b/WPtouch.skin.php
index ab2b257..951cf48 100644
--- a/WPtouch.skin.php
+++ b/WPtouch.skin.php
@@ -200,7 +200,7 @@
 
 
 
-   msg( 'search' ) 
?>
+   msg( 'search' ) 
?>
 
 
 
@@ -209,7 +209,7 @@



-   html( 'bodytext' ) ?>
+   html( 'bodytext' ) ?>
data['dataAfterContent'] ) { 
$this->html( 'dataAfterContent' ); } ?>



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8fcbccd9f59909b102a0b8256c39161ec18a1d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/WPtouch
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] Remove paragraph tags around the page content to make W3C Va... - change (mediawiki...WPtouch)

2015-06-25 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review.

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

Change subject: Remove paragraph tags around the page content to make W3C 
Validator happy
..

Remove paragraph tags around the page content to make W3C Validator happy

Change-Id: Id8fcbccd9f59909b102a0b8256c39161ec18a1d2
---
M WPtouch.skin.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/WPtouch 
refs/changes/38/221038/1

diff --git a/WPtouch.skin.php b/WPtouch.skin.php
index ab2b257..951cf48 100644
--- a/WPtouch.skin.php
+++ b/WPtouch.skin.php
@@ -200,7 +200,7 @@
 
 
 
-   msg( 'search' ) 
?>
+   msg( 'search' ) 
?>
 
 
 
@@ -209,7 +209,7 @@



-   html( 'bodytext' ) ?>
+   html( 'bodytext' ) ?>
data['dataAfterContent'] ) { 
$this->html( 'dataAfterContent' ); } ?>



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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8fcbccd9f59909b102a0b8256c39161ec18a1d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/WPtouch
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] planet: fix to variable name for proxy - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: fix to variable name for proxy
..


planet: fix to variable name for proxy

Change-Id: I874f9658333e4338268206900f4129857dc86689
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index c51bf11..0106a6c 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -192,7 +192,7 @@
 $planet_meta_link = "meta.wikimedia.org/wiki/Planet_Wikimedia"
 
 # since we are on Ganeti now we need to proxy to fetch external URLs
-$planet_http_proxy="http://url-downloader.wikimedia.org:8080";
+$planet_http_proxy = "http://url-downloader.wikimedia.org:8080";
 
 # the 'planet' class from modules/planet/init.pp does the setup
 class {'::planet':
diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index c4c14fc..59120bc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "http_proxy=\"${planet_http_proxy}\" ${planet_bin} -v 
${planet_config} > ${planet_logfile} 2>&1",
+command => "http_proxy=\"${planet::planet_http_proxy}\" ${planet_bin} 
-v ${planet_config} > ${planet_logfile} 2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I874f9658333e4338268206900f4129857dc86689
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] planet: fix to variable name for proxy - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: fix to variable name for proxy
..

planet: fix to variable name for proxy

Change-Id: I874f9658333e4338268206900f4129857dc86689
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index c51bf11..0106a6c 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -192,7 +192,7 @@
 $planet_meta_link = "meta.wikimedia.org/wiki/Planet_Wikimedia"
 
 # since we are on Ganeti now we need to proxy to fetch external URLs
-$planet_http_proxy="http://url-downloader.wikimedia.org:8080";
+$planet_http_proxy = "http://url-downloader.wikimedia.org:8080";
 
 # the 'planet' class from modules/planet/init.pp does the setup
 class {'::planet':
diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index c4c14fc..59120bc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "http_proxy=\"${planet_http_proxy}\" ${planet_bin} -v 
${planet_config} > ${planet_logfile} 2>&1",
+command => "http_proxy=\"${planet::planet_http_proxy}\" ${planet_bin} 
-v ${planet_config} > ${planet_logfile} 2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I874f9658333e4338268206900f4129857dc86689
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] planet: proxy through url-downloader to fetch URLs - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: proxy through url-downloader to fetch URLs
..


planet: proxy through url-downloader to fetch URLs

Now that planet is on a ganeti VM we can't directly fetch
the external feed URLs but have to proxy via url-downloader.wm.org
instead.

Bug:T101730
Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
M modules/planet/manifests/init.pp
3 files changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index e20af3d..c51bf11 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -191,11 +191,15 @@
 # protocol-relative link to a meta or index page for all planets
 $planet_meta_link = "meta.wikimedia.org/wiki/Planet_Wikimedia"
 
+# since we are on Ganeti now we need to proxy to fetch external URLs
+$planet_http_proxy="http://url-downloader.wikimedia.org:8080";
+
 # the 'planet' class from modules/planet/init.pp does the setup
 class {'::planet':
 planet_domain_name => $planet_domain_name,
 planet_languages   => $planet_languages,
-planet_meta_link   => $planet_meta_link
+planet_meta_link   => $planet_meta_link,
+planet_http_proxy  => $planet_http_proxy
 }
 
 ferm::service { 'planet-http':
diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index 423a8a9..c4c14fc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "${planet_bin} -v ${planet_config} > ${planet_logfile} 
2>&1",
+command => "http_proxy=\"${planet_http_proxy}\" ${planet_bin} -v 
${planet_config} > ${planet_logfile} 2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 44a89bb..2673fb5 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -16,7 +16,8 @@
 class planet (
 $planet_domain_name,
 $planet_languages,
-$planet_meta_link
+$planet_meta_link,
+$planet_http_proxy,
 ) {
 
 # locales are essential for planet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
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] planet: proxy through url-downloader to fetch URLs - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: proxy through url-downloader to fetch URLs
..

planet: proxy through url-downloader to fetch URLs

Now that planet is on a ganeti VM we can't directly fetch
the external feed URLs but have to proxy via url-downloader.wm.org
instead.

Bug:T101730
Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
M modules/planet/manifests/init.pp
3 files changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index e20af3d..c51bf11 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -191,11 +191,15 @@
 # protocol-relative link to a meta or index page for all planets
 $planet_meta_link = "meta.wikimedia.org/wiki/Planet_Wikimedia"
 
+# since we are on Ganeti now we need to proxy to fetch external URLs
+$planet_http_proxy="http://url-downloader.wikimedia.org:8080";
+
 # the 'planet' class from modules/planet/init.pp does the setup
 class {'::planet':
 planet_domain_name => $planet_domain_name,
 planet_languages   => $planet_languages,
-planet_meta_link   => $planet_meta_link
+planet_meta_link   => $planet_meta_link,
+planet_http_proxy  => $planet_http_proxy
 }
 
 ferm::service { 'planet-http':
diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index 423a8a9..c4c14fc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "${planet_bin} -v ${planet_config} > ${planet_logfile} 
2>&1",
+command => "http_proxy=\"${planet_http_proxy}\" ${planet_bin} -v 
${planet_config} > ${planet_logfile} 2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 44a89bb..2673fb5 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -16,7 +16,8 @@
 class planet (
 $planet_domain_name,
 $planet_languages,
-$planet_meta_link
+$planet_meta_link,
+$planet_http_proxy,
 ) {
 
 # locales are essential for planet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
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] Set CORS headers on etherpad static files - change (operations/puppet)

2015-06-25 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Set CORS headers on etherpad static files
..

Set CORS headers on etherpad static files

Bug: T103940
Change-Id: Ic7321e5f5f5aac844f3973a3239ac10f7d6b26f6
---
M templates/misc/etherpad.wikimedia.org.erb
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/templates/misc/etherpad.wikimedia.org.erb 
b/templates/misc/etherpad.wikimedia.org.erb
index 8a5b2f8..856472c 100644
--- a/templates/misc/etherpad.wikimedia.org.erb
+++ b/templates/misc/etherpad.wikimedia.org.erb
@@ -37,6 +37,10 @@
 RewriteCond %{HTTP_HOST} !<%= @etherpad_host %>
 RewriteRule ^/+(.+)$ https://<%= @etherpad_host %>/$1 [R=301,L]
 
+
+Header set Access-Control-Allow-Origin "*"
+
+
 
 Options FollowSymLinks MultiViews
 AllowOverride All

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7321e5f5f5aac844f3973a3239ac10f7d6b26f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] [FEAT] page_tests: Page repr encoding test - change (pywikibot/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: [FEAT] page_tests: Page repr encoding test
..


[FEAT] page_tests: Page repr encoding test

The repr should be decodable using the ASCII codec but the Page instance isn't
actually.

Bug: T66958
Change-Id: Ic2a7db2dac6793faf2521d2717662f3ee1b14eca
---
M tests/page_tests.py
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/tests/page_tests.py b/tests/page_tests.py
index 7460b2c..6504b45 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -15,6 +15,8 @@
 from pywikibot import InvalidTitle
 import pywikibot.page
 
+from pywikibot.tools import PY2
+
 from tests.aspects import (
 unittest, TestCase, DefaultSiteTestCase, SiteAttributeTestCase,
 DeprecationTestCase,
@@ -563,6 +565,14 @@
 self.assertEqual(u'%r' % page, "Page(b'\\xc5\\x8c')")
 self.assertEqual(u'{0!r}'.format(page), "Page(b'\\xc5\\x8c')")
 
+@unittest.skipIf(not PY2, 'Python 2 specific test')
+@unittest.expectedFailure
+def test_ASCII_comatible(self):
+"""Test that repr returns ASCII compatible bytes in Python 2."""
+page = pywikibot.Page(self.site, 'ä')
+# Bug T95809, the repr in Python 2 should be decodable as ASCII
+repr(page).decode('ascii')
+
 
 class TestPageBotMayEdit(TestCase):
 

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

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

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

[MediaWiki-commits] [Gerrit] Use spdx license identifier - change (mediawiki...FilterListUsers)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Use spdx license identifier
..


Use spdx license identifier

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

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



diff --git a/extension.json b/extension.json
index 9dbfcc2..7a8f513 100644
--- a/extension.json
+++ b/extension.json
@@ -4,7 +4,7 @@
"author": [
"Jack Phoenix"
],
-   "license-name": "GPLv2+",
+   "license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:FilterListUsers";,
"descriptionmsg": "filterlistusers-desc",
"type": "other",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie76ffe846782708a665d10e31f49d054a64c361d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FilterListUsers
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: install xslt-proc - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: install xslt-proc
..


planet: install xslt-proc

Description-en: XSLT 1.0 command line processor

This is needed by planet to transform XML to HTML but it did not install it
via package dependencies.

INFO:planet.runner:Loading cached data
sh: 1: xsltproc: not found
sh: 1: xsltproc: not found
sh: 1: xsltproc: not found
..

Bug:T101730
Change-Id: Ib9ca87db66e920cb255d2df1cb17c3d339774b50
---
M modules/planet/manifests/packages.pp
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/planet/manifests/packages.pp 
b/modules/planet/manifests/packages.pp
index 9e4622e..d61c824 100644
--- a/modules/planet/manifests/packages.pp
+++ b/modules/planet/manifests/packages.pp
@@ -7,4 +7,9 @@
 ensure => 'present',
 }
 
+# XSLT 1.0 command line processor
+package { 'xsltproc':
+ensure => 'present',
+}
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9ca87db66e920cb255d2df1cb17c3d339774b50
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] Lots and lots of cleanup; requires at least MW 1.24 (in theo... - change (mediawiki...BlueSky)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Lots and lots of cleanup; requires at least MW 1.24 (in 
theory), but in practise tested only against MW 1.25
..


Lots and lots of cleanup; requires at least MW 1.24 (in theory), but in 
practise tested only against MW 1.25

Some of the changes include:
* fixed logging in via the skin's integrated login box
* removed legacy PHP i18n file/wrapper
* added skin.json file for MW 1.25+
* removed legacy external links CSS files in favor of the core RL module
* got rid of the BeforePageDisplay hook in favor of defining the things in 
SkinBlueSky::initPage()
* removed some wikiHow-specific bits 'n' pieces

Change-Id: Iedbcf359cc7d0a88a6e142901b59ac94caa3ddd5
---
M BlueSky.hooks.php
D BlueSky.i18n.php
M BlueSky.php
M BlueSky.skin.php
M i18n/fi.json
D resources/css/externallinks-123.css
D resources/css/externallinks-124.css
A skin.json
M templates/userloginbox.tmpl.php
9 files changed, 331 insertions(+), 413 deletions(-)

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



diff --git a/BlueSky.hooks.php b/BlueSky.hooks.php
index 4ab5557..dc4e78f 100644
--- a/BlueSky.hooks.php
+++ b/BlueSky.hooks.php
@@ -5,74 +5,13 @@
  */
 class SkinBlueSkyHooks {
/**
-   * TOC processing
-   * Shamelessly stolen from brickimedia's refreshed skin
-   * Currently: 
https://github.com/Brickimedia/Refreshed/blob/master/Refreshed.skin.php#L72
-   */
-
-   public static function wfTOCCrap( OutputPage &$out, ParserOutput 
$parseroutput ) {
-   global $blueSkyTOC;
-   $blueSkyTOC = $parseroutput->mSections;
-
-   return true;
-   }
-
-   public static function onBeforePageDisplayCrap( OutputPage &$out, 
&$skin ) {
-   //global $wgRequest, $wgUser;
-
-   // Hooks are global, but we want these things *only* for this 
skin.
-   if ( get_class( $skin ) !== 'SkinBlueSky' ) {
-   return true;
-   }
-
-   /*
-   $action = $wgRequest->getVal( 'action', 'view' );
-   $isMainPage = $out->getTitle()->isMainPage();
-   $isArticlePage = $out->getTitle() &&
-   !$isMainPage &&
-   $out->getTitle()->getNamespace() == NS_MAIN &&
-   $action == 'view';
-   */
-
-   $out->addMeta( 'http:content-type', 'text/html; charset=UTF-8' 
);
-
-   /*
-   if ( $isArticlePage || $isMainPage ) {
-   global $wgLanguageCode;
-
-   if ( $wgLanguageCode != 'en' ) {
-   $mobileLang = $wgLanguageCode . '.';
-   } else {
-   $mobileLang = '';
-   }
-
-   $out->addLink( array(
-   'rel' => 'alternate',
-   'media' => 'only screen and (max-width: 640px)',
-   'href' => 'http://' . $mobileLang . 
'm.wikihow.com/' . $out->getTitle()->getPartialURL()
-   ) );
-   }
-
-   $out->setCanonicalUrl( $out->getTitle()->getFullURL() );
-   $out->addLink( array(
-   'href' => 
'https://plus.google.com/102818024478962731382',
-   'rel' => 'publisher'
-   ) );
-
-   $out->addLink( array(
-   'rel' => 'alternate',
-   'type' => 'application/rss+xml',
-   'title' => 'wikiHow: How-to of the Day',
-   'href' => 'http://www.wikihow.com/feed.rss'
-   ) );
-
-   $out->addLink( array(
-   'rel' => 'apple-touch-icon',
-   'href' => $wgStylePath . 
'/BlueSky/images/safari-large-icon.png'
-   ) );
-
-   echo $out->getHeadItems();
-   */
+* TOC processing
+* Shamelessly stolen from brickimedia's refreshed skin
+* Currently: 
https://github.com/Brickimedia/Refreshed/blob/master/Refreshed.skin.php#L72
+*/
+   public static function wfTOCCrap( OutputPage &$out, ParserOutput 
$parserOutput ) {
+   global $wgBlueSkyTOC;
+   $wgBlueSkyTOC = $parserOutput->mSections;
 
return true;
}
diff --git a/BlueSky.i18n.php b/BlueSky.i18n.php
deleted file mode 100644
index 42233bf..000
--- a/BlueSky.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. Fo

[MediaWiki-commits] [Gerrit] Lots and lots of cleanup; requires at least MW 1.24 (in theo... - change (mediawiki...BlueSky)

2015-06-25 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review.

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

Change subject: Lots and lots of cleanup; requires at least MW 1.24 (in 
theory), but in practise tested only against MW 1.25
..

Lots and lots of cleanup; requires at least MW 1.24 (in theory), but in 
practise tested only against MW 1.25

Some of the changes include:
* fixed logging in via the skin's integrated login box
* removed legacy PHP i18n file/wrapper
* added skin.json file for MW 1.25+
* removed legacy external links CSS files in favor of the core RL module
* got rid of the BeforePageDisplay hook in favor of defining the things in 
SkinBlueSky::initPage()
* removed some wikiHow-specific bits 'n' pieces

Change-Id: Iedbcf359cc7d0a88a6e142901b59ac94caa3ddd5
---
M BlueSky.hooks.php
D BlueSky.i18n.php
M BlueSky.php
M BlueSky.skin.php
M i18n/fi.json
D resources/css/externallinks-123.css
D resources/css/externallinks-124.css
A skin.json
M templates/userloginbox.tmpl.php
9 files changed, 331 insertions(+), 413 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky 
refs/changes/34/221034/1

diff --git a/BlueSky.hooks.php b/BlueSky.hooks.php
index 4ab5557..dc4e78f 100644
--- a/BlueSky.hooks.php
+++ b/BlueSky.hooks.php
@@ -5,74 +5,13 @@
  */
 class SkinBlueSkyHooks {
/**
-   * TOC processing
-   * Shamelessly stolen from brickimedia's refreshed skin
-   * Currently: 
https://github.com/Brickimedia/Refreshed/blob/master/Refreshed.skin.php#L72
-   */
-
-   public static function wfTOCCrap( OutputPage &$out, ParserOutput 
$parseroutput ) {
-   global $blueSkyTOC;
-   $blueSkyTOC = $parseroutput->mSections;
-
-   return true;
-   }
-
-   public static function onBeforePageDisplayCrap( OutputPage &$out, 
&$skin ) {
-   //global $wgRequest, $wgUser;
-
-   // Hooks are global, but we want these things *only* for this 
skin.
-   if ( get_class( $skin ) !== 'SkinBlueSky' ) {
-   return true;
-   }
-
-   /*
-   $action = $wgRequest->getVal( 'action', 'view' );
-   $isMainPage = $out->getTitle()->isMainPage();
-   $isArticlePage = $out->getTitle() &&
-   !$isMainPage &&
-   $out->getTitle()->getNamespace() == NS_MAIN &&
-   $action == 'view';
-   */
-
-   $out->addMeta( 'http:content-type', 'text/html; charset=UTF-8' 
);
-
-   /*
-   if ( $isArticlePage || $isMainPage ) {
-   global $wgLanguageCode;
-
-   if ( $wgLanguageCode != 'en' ) {
-   $mobileLang = $wgLanguageCode . '.';
-   } else {
-   $mobileLang = '';
-   }
-
-   $out->addLink( array(
-   'rel' => 'alternate',
-   'media' => 'only screen and (max-width: 640px)',
-   'href' => 'http://' . $mobileLang . 
'm.wikihow.com/' . $out->getTitle()->getPartialURL()
-   ) );
-   }
-
-   $out->setCanonicalUrl( $out->getTitle()->getFullURL() );
-   $out->addLink( array(
-   'href' => 
'https://plus.google.com/102818024478962731382',
-   'rel' => 'publisher'
-   ) );
-
-   $out->addLink( array(
-   'rel' => 'alternate',
-   'type' => 'application/rss+xml',
-   'title' => 'wikiHow: How-to of the Day',
-   'href' => 'http://www.wikihow.com/feed.rss'
-   ) );
-
-   $out->addLink( array(
-   'rel' => 'apple-touch-icon',
-   'href' => $wgStylePath . 
'/BlueSky/images/safari-large-icon.png'
-   ) );
-
-   echo $out->getHeadItems();
-   */
+* TOC processing
+* Shamelessly stolen from brickimedia's refreshed skin
+* Currently: 
https://github.com/Brickimedia/Refreshed/blob/master/Refreshed.skin.php#L72
+*/
+   public static function wfTOCCrap( OutputPage &$out, ParserOutput 
$parserOutput ) {
+   global $wgBlueSkyTOC;
+   $wgBlueSkyTOC = $parserOutput->mSections;
 
return true;
}
diff --git a/BlueSky.i18n.php b/BlueSky.i18n.php
deleted file mode 100644
index 42233bf..000
--- a/BlueSky.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compa

[MediaWiki-commits] [Gerrit] planet: install xslt-proc - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: install xslt-proc
..

planet: install xslt-proc

Description-en: XSLT 1.0 command line processor

This is needed by planet to transform XML to HTML but it did not install it
via package dependencies.

INFO:planet.runner:Loading cached data
sh: 1: xsltproc: not found
sh: 1: xsltproc: not found
sh: 1: xsltproc: not found
..

Bug:T101730
Change-Id: Ib9ca87db66e920cb255d2df1cb17c3d339774b50
---
M modules/planet/manifests/packages.pp
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/planet/manifests/packages.pp 
b/modules/planet/manifests/packages.pp
index 9e4622e..d61c824 100644
--- a/modules/planet/manifests/packages.pp
+++ b/modules/planet/manifests/packages.pp
@@ -7,4 +7,9 @@
 ensure => 'present',
 }
 
+# XSLT 1.0 command line processor
+package { 'xsltproc':
+ensure => 'present',
+}
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9ca87db66e920cb255d2df1cb17c3d339774b50
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] Mark known failing tests - change (mediawiki...CirrusSearch)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Mark known failing tests
..


Mark known failing tests

This should allow our new browser test bot to successfully complete
a run by excluding tests with the @expect_failure tag.

Change-Id: Ifdcbef2553092737f784c079a733ba7d1b29673c
---
M tests/browser/README
M tests/browser/features/prefer_recent_api.feature
M tests/browser/features/relevancy_api.feature
M tests/browser/features/smoke.feature
M tests/browser/features/wildcard_api.feature
5 files changed, 13 insertions(+), 3 deletions(-)

Approvals:
  Manybubbles: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/README b/tests/browser/README
index d0950cd..5a6eb87 100644
--- a/tests/browser/README
+++ b/tests/browser/README
@@ -52,10 +52,14 @@
 Some tests don't pass!
 --
 Sorry, some of the tests don't pass the first time out of the box.  Its a sad
-thing but I haven't had time to fix it.  Rerun them like this:
- bundle exec cucumber features/smoke.feature:15 features/otherthing.feature:123
+thing but I haven't had time to fix it. Tests that are known to be flakey are
+marked with the @expect_failure tag, they can be excluded from a test run with
 
-Just grab the list from the failures list.  It sucks and I'm sorry.
+ bundle exec cucumber --tags ~@expect_failure
+
+Some of the failing test intermittently fail. Rerun them like this:
+
+ bundle exec cucumber features/smoke.feature:15 features/otherthing.feature:123
 
 Want to Contribute Some Tests?
 --
diff --git a/tests/browser/features/prefer_recent_api.feature 
b/tests/browser/features/prefer_recent_api.feature
index bc2e85d..8885558 100644
--- a/tests/browser/features/prefer_recent_api.feature
+++ b/tests/browser/features/prefer_recent_api.feature
@@ -1,5 +1,6 @@
 @clean @api @prefer_recent
 Feature: Searches with prefer-recent
+  @expect_failure
   Scenario Outline: Recently updated articles are prefered if prefer-recent: 
is specified
 When I api search for PreferRecent First OR Second OR Third
 Then PreferRecent Second Second is the first api search result
@@ -13,6 +14,7 @@
 | .99,.0001   |
 | .99,.001|
 
+  @expect_failure
   Scenario Outline: You can specify prefer-recent: in such a way that being 
super recent isn't enough
 When I api search for prefer-recent: PreferRecent First OR Second 
OR Third
 Then PreferRecent Second Second is the first api search result
diff --git a/tests/browser/features/relevancy_api.feature 
b/tests/browser/features/relevancy_api.feature
index 4488786..cd6bca1 100644
--- a/tests/browser/features/relevancy_api.feature
+++ b/tests/browser/features/relevancy_api.feature
@@ -19,6 +19,7 @@
 When I api search for Relevancylanguagetest
 Then Relevancylanguagetest/en is the first api search result
 
+  @expect_failure
   Scenario: Redirects count as incoming links
 When I api search for Relevancyredirecttest
 Then Relevancyredirecttest Larger is the first api search result
@@ -50,6 +51,7 @@
   And Relevancylanguagetest/en is the second api search result
   And Relevancylanguagetest/ar is the third api search result
 
+  @expect_failure
   Scenario: Incoming links count in page weight
 When I api search for Relevancylinktest -intitle:link
 Then Relevancylinktest Larger Extraword is the first api search result
diff --git a/tests/browser/features/smoke.feature 
b/tests/browser/features/smoke.feature
index f0a687e..82c128f 100644
--- a/tests/browser/features/smoke.feature
+++ b/tests/browser/features/smoke.feature
@@ -18,6 +18,7 @@
 Then a list of suggested pages should appear
   And Main Page should be the first result
 
+  @expect_failure
   Scenario: Fill in search term and click search
 Given I am at a random page
 When I search for: ma
diff --git a/tests/browser/features/wildcard_api.feature 
b/tests/browser/features/wildcard_api.feature
index 261d089..4b5cd9a 100644
--- a/tests/browser/features/wildcard_api.feature
+++ b/tests/browser/features/wildcard_api.feature
@@ -41,6 +41,7 @@
 | *|
 | ?|
 
+  @expect_failure
   Scenario Outline: Searching with a single wildcard finds expected results
 When I api search for catapu
 Then Catapult is the first api search result

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdcbef2553092737f784c079a733ba7d1b29673c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: jenkins-bot <>

___

[MediaWiki-commits] [Gerrit] registration: 'FilterLogTypes' is a JSON object - change (mediawiki/core)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: registration: 'FilterLogTypes' is a JSON object
..


registration: 'FilterLogTypes' is a JSON object

Change-Id: I01eb28b9d01db8e500e376db9296b4eee85854c1
---
M docs/extension.schema.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index d7d9e47..c9f629c 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -575,7 +575,7 @@
"type": "object"
},
"FilterLogTypes": {
-   "type": "array"
+   "type": "object"
},
"LogNames": {
"type": "object"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01eb28b9d01db8e500e376db9296b4eee85854c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Waldir 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] cache/misc: switch planet over to planet1001 - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: cache/misc: switch planet over to planet1001
..


cache/misc: switch planet over to planet1001

Bug:T101730
Change-Id: Ie3c6fd1fb34695864dc5d36486e38baf550a0eb6
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index fc1aea1..5a10413 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -74,7 +74,7 @@
}
}
elsif (req.http.Host ~ ".*\.planet\.wikimedia\.org" || req.http.Host == 
"planet.wikimedia.org") {
-   set req.backend = zirconium;
+   set req.backend = planet1001;
} elsif (req.http.Host == "etherpad.wikimedia.org") {
set req.backend = etherpad1001;
return (pass);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3c6fd1fb34695864dc5d36486e38baf550a0eb6
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] cache/misc: switch planet over to planet1001 - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: cache/misc: switch planet over to planet1001
..

cache/misc: switch planet over to planet1001

Bug:T101730
Change-Id: Ie3c6fd1fb34695864dc5d36486e38baf550a0eb6
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index fc1aea1..5a10413 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -74,7 +74,7 @@
}
}
elsif (req.http.Host ~ ".*\.planet\.wikimedia\.org" || req.http.Host == 
"planet.wikimedia.org") {
-   set req.backend = zirconium;
+   set req.backend = planet1001;
} elsif (req.http.Host == "etherpad.wikimedia.org") {
set req.backend = etherpad1001;
return (pass);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3c6fd1fb34695864dc5d36486e38baf550a0eb6
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] cache/misc: add planet1001 as a backend - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: cache/misc: add planet1001 as a backend
..


cache/misc: add planet1001 as a backend

It's a ganeti VM to host planet now instead of zirconium.

Bug:T101730
Change-Id: Iebbc0310c3927b8fe29166b626ecb1e48cc2c63f
---
M modules/role/manifests/cache/misc.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index 774ac00..14138d5 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -46,6 +46,7 @@
 'neon.wikimedia.org', # monitoring tools (icinga et al)
 'netmon1001.wikimedia.org', # servermon
 'palladium.eqiad.wmnet',
+'planet1001.eqiad.wmnet',
 'ruthenium.eqiad.wmnet', # parsoid rt test server
 'stat1001.eqiad.wmnet', # metrics and metrics-api
 'terbium.eqiad.wmnet', # public_html

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebbc0310c3927b8fe29166b626ecb1e48cc2c63f
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] build: Configure banana-checker and jsonlint - change (mediawiki...apex)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: Ie006b58963c70dfd498fd8e2bc8e9b27d5c2420c
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/31/221031/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie006b58963c70dfd498fd8e2bc8e9b27d5c2420c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] cache/misc: add planet1001 as a backend - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: cache/misc: add planet1001 as a backend
..

cache/misc: add planet1001 as a backend

It's a ganeti VM to host planet now instead of zirconium.

Bug:T101730
Change-Id: Iebbc0310c3927b8fe29166b626ecb1e48cc2c63f
---
M modules/role/manifests/cache/misc.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/221027/1

diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index 774ac00..14138d5 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -46,6 +46,7 @@
 'neon.wikimedia.org', # monitoring tools (icinga et al)
 'netmon1001.wikimedia.org', # servermon
 'palladium.eqiad.wmnet',
+'planet1001.eqiad.wmnet',
 'ruthenium.eqiad.wmnet', # parsoid rt test server
 'stat1001.eqiad.wmnet', # metrics and metrics-api
 'terbium.eqiad.wmnet', # public_html

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebbc0310c3927b8fe29166b626ecb1e48cc2c63f
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] build: Configure banana-checker and jsonlint - change (mediawiki...Splash)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: Ifd701f233c400f8d7bf9edc66fb07735dec6ec1d
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Splash 
refs/changes/29/221029/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd701f233c400f8d7bf9edc66fb07735dec6ec1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Splash
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Tempo)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: I58049127f0d2043f10d6821a8ebefd69cbbc484f
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Tempo 
refs/changes/30/221030/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58049127f0d2043f10d6821a8ebefd69cbbc484f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Tempo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Nostalgia)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: I72492a2c3661bb82a330a916f6f3501b436a58c8
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nostalgia 
refs/changes/26/221026/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72492a2c3661bb82a330a916f6f3501b436a58c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Slate)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: Ib5abcff6747d1ff077bd2d1d21cc6b3bcd825538
---
A Gruntfile.js
A package.json
2 files changed, 32 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Slate 
refs/changes/28/221028/1

diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5abcff6747d1ff077bd2d1d21cc6b3bcd825538
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Slate
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Mask)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: I1d4a7f5888a0dd6e34742500489f56b8899aa417
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Mask 
refs/changes/24/221024/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d4a7f5888a0dd6e34742500489f56b8899aa417
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Mask
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Metrolook)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: Ic720686a413a4514d6264bc7d432700971040546
---
A Gruntfile.js
A package.json
2 files changed, 32 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/25/221025/1

diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic720686a413a4514d6264bc7d432700971040546
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...GreyStuff)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: Ia2eca31b9547ff696a135b39cde773ef2f2af83a
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/GreyStuff 
refs/changes/23/221023/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2eca31b9547ff696a135b39cde773ef2f2af83a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Example)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: I993c24a61261293734b899db873ebd43ed68088f
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Example 
refs/changes/22/221022/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I993c24a61261293734b899db873ebd43ed68088f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...Daddio)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: I2dcc971b4e7669f06b1b9899e3ad6f0b7568d190
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/21/221021/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dcc971b4e7669f06b1b9899e3ad6f0b7568d190
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Daddio
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Hide the red border around syntax errors - change (mediawiki...SyntaxHighlight_GeSHi)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Hide the red border around syntax errors
..


Hide the red border around syntax errors

MZMcBride noticed the red border around '國' in
https://en.wikipedia.org/wiki/Swift_(programming_language)#Example_code

That particular case happens to be a Pygments bug, because multibyte characters
are valid variable names in Swift. But even in cases of legitimate syntax
errors, I don't think we want to show the red border. This behavior may be
useful in code editors, but it is not useful in a wiki environment, especially
given the longstanding habit of using an existing, mostly-compatible lexer to
highlight a language for which no specific lexer exists.

To fix this, override the style in pygments.wrapper.css, and swap the order in
which the two CSS files are concatenated, so that in general we have the
ability to override Pygments-generated CSS.

Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
(cherry picked from commit 927f40e98ac63cd93d79fbac622478344274fade)
---
M extension.json
M modules/pygments.wrapper.css
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index f2d238d..af19063 100644
--- a/extension.json
+++ b/extension.json
@@ -36,8 +36,8 @@
"mobile"
],
"styles": [
-   "pygments.wrapper.css",
-   "pygments.generated.css"
+   "pygments.generated.css",
+   "pygments.wrapper.css"
]
}
},
diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index b1f7cb9..643e3c3 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -14,3 +14,13 @@
border: 0;
padding: 0;
 }
+
+/*
+ * Don't show a red border around syntax errors. This behavior may be useful
+ * in code editors, but it is not useful in a wiki environment, especially
+ * given the longstanding habit of using an existing, mostly-compatible lexer
+ * to highlight a language for which no lexer exists.
+ */
+.mw-highlight .err {
+border: 0;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: remove role from zirconium - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: remove role from zirconium
..


planet: remove role from zirconium

It is moving to planet1001 on ganeti instead.

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index cd0af12..1c9b696 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2369,7 +2369,6 @@
 class { 'base::firewall': }
 
 include standard
-include role::planet
 include role::wikimania_scholarships
 include role::bugzilla_static
 include role::transparency

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I743b252298116a0860e91fe12f596d3015b60f90
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] build: Configure banana-checker and jsonlint - change (mediawiki...BlueSpiceSkin)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/20/221020/1

diff --git a/.gitignore b/.gitignore
index 75a89f4..9b344da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *~ 
 *.kate-swp 
 .*.swp
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.2.2",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] registration: 'FilterLogTypes' is a JSON object - change (mediawiki/core)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: registration: 'FilterLogTypes' is a JSON object
..

registration: 'FilterLogTypes' is a JSON object

Change-Id: I01eb28b9d01db8e500e376db9296b4eee85854c1
---
M docs/extension.schema.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/221019/1

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index d7d9e47..c9f629c 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -575,7 +575,7 @@
"type": "object"
},
"FilterLogTypes": {
-   "type": "array"
+   "type": "object"
},
"LogNames": {
"type": "object"

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

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

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

[MediaWiki-commits] [Gerrit] Hide the red border around syntax errors - change (mediawiki...SyntaxHighlight_GeSHi)

2015-06-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Hide the red border around syntax errors
..

Hide the red border around syntax errors

MZMcBride noticed the red border around '國' in
https://en.wikipedia.org/wiki/Swift_(programming_language)#Example_code

That particular case happens to be a Pygments bug, because multibyte characters
are valid variable names in Swift. But even in cases of legitimate syntax
errors, I don't think we want to show the red border. This behavior may be
useful in code editors, but it is not useful in a wiki environment, especially
given the longstanding habit of using an existing, mostly-compatible lexer to
highlight a language for which no specific lexer exists.

To fix this, override the style in pygments.wrapper.css, and swap the order in
which the two CSS files are concatenated, so that in general we have the
ability to override Pygments-generated CSS.

Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
(cherry picked from commit 927f40e98ac63cd93d79fbac622478344274fade)
---
M extension.json
M modules/pygments.wrapper.css
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi 
refs/changes/18/221018/1

diff --git a/extension.json b/extension.json
index f2d238d..af19063 100644
--- a/extension.json
+++ b/extension.json
@@ -36,8 +36,8 @@
"mobile"
],
"styles": [
-   "pygments.wrapper.css",
-   "pygments.generated.css"
+   "pygments.generated.css",
+   "pygments.wrapper.css"
]
}
},
diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index b1f7cb9..643e3c3 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -14,3 +14,13 @@
border: 0;
padding: 0;
 }
+
+/*
+ * Don't show a red border around syntax errors. This behavior may be useful
+ * in code editors, but it is not useful in a wiki environment, especially
+ * given the longstanding habit of using an existing, mostly-compatible lexer
+ * to highlight a language for which no lexer exists.
+ */
+.mw-highlight .err {
+border: 0;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Use spdx license identifier - change (mediawiki...FilterListUsers)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Use spdx license identifier
..

Use spdx license identifier

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


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

diff --git a/extension.json b/extension.json
index 9dbfcc2..7a8f513 100644
--- a/extension.json
+++ b/extension.json
@@ -4,7 +4,7 @@
"author": [
"Jack Phoenix"
],
-   "license-name": "GPLv2+",
+   "license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:FilterListUsers";,
"descriptionmsg": "filterlistusers-desc",
"type": "other",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie76ffe846782708a665d10e31f49d054a64c361d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FilterListUsers
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Revert "Pass uselang=user to the API instead of figuring it ... - change (mediawiki...Echo)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Pass uselang=user to the API instead of figuring it out 
client side"
..


Revert "Pass uselang=user to the API instead of figuring it out client side"

This breaks pages using ?uselang=xx where "xx" is not
the user's language.

This reverts commit 0919b01e75a2475ebc4af12fb8465b9c9569be56.

Bug: T103935
Change-Id: I219810451b991cef88bac62cf880bfda6f98e930
---
M modules/overlay/ext.echo.overlay.js
M modules/special/ext.echo.special.js
2 files changed, 7 insertions(+), 4 deletions(-)

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



diff --git a/modules/overlay/ext.echo.overlay.js 
b/modules/overlay/ext.echo.overlay.js
index 0dadd58..ae6c9ce 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -2,6 +2,8 @@
 ( function ( $, mw ) {
'use strict';
 
+   var useLang = mw.config.get( 'wgUserLanguage' );
+
function EchoOverlay( apiResultNotifications ) {
this.api = mw.echo.overlay.api;
// set internal properties
@@ -82,7 +84,7 @@
if ( this.unread.length ) {
data = {
action: 'echomarkread',
-   uselang: 'user'
+   uselang: useLang
};
if ( id ) {
// If id is given mark that as read 
otherwise use all unread messages
@@ -458,7 +460,7 @@
notformat: 'flyout',
notlimit: this.notificationLimit,
notprop: 'index|list|count',
-   uselang: 'user'
+   uselang: useLang
};
 
return this.api.get( apiData ).then( function ( result 
) {
diff --git a/modules/special/ext.echo.special.js 
b/modules/special/ext.echo.special.js
index dba9203..aa683a3 100644
--- a/modules/special/ext.echo.special.js
+++ b/modules/special/ext.echo.special.js
@@ -1,5 +1,6 @@
 ( function ( $, mw ) {
'use strict';
+   var useLang = mw.config.get( 'wgUserLanguage' );
 
mw.echo.special = {
 
@@ -67,7 +68,7 @@
notprop: 'index|list',
notcontinue: this.notcontinue,
notlimit: mw.config.get( 
'wgEchoDisplayNum' ),
-   uselang: 'user'
+   uselang: useLang
};
 
api.get( apiData ).done( function ( result ) {
@@ -129,7 +130,7 @@
api.postWithToken( 'edit', {
action: 'echomarkread',
list: unread.join( '|' ),
-   uselang: 'user'
+   uselang: useLang
} ).done( function ( result ) {
// update the badge if the link is enabled
if ( result.query.echomarkread.count !== 
undefined &&

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I219810451b991cef88bac62cf880bfda6f98e930
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Hide the red border around syntax errors - change (mediawiki...SyntaxHighlight_GeSHi)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Hide the red border around syntax errors
..


Hide the red border around syntax errors

MZMcBride noticed the red border around '國' in
https://en.wikipedia.org/wiki/Swift_(programming_language)#Example_code

That particular case happens to be a Pygments bug, because multibyte characters
are valid variable names in Swift. But even in cases of legitimate syntax
errors, I don't think we want to show the red border. This behavior may be
useful in code editors, but it is not useful in a wiki environment, especially
given the longstanding habit of using an existing, mostly-compatible lexer to
highlight a language for which no specific lexer exists.

To fix this, override the style in pygments.wrapper.css, and swap the order in
which the two CSS files are concatenated, so that in general we have the
ability to override Pygments-generated CSS.

Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
---
M extension.json
M modules/pygments.wrapper.css
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 887eb57..045e498 100644
--- a/extension.json
+++ b/extension.json
@@ -38,8 +38,8 @@
"mobile"
],
"styles": [
-   "pygments.wrapper.css",
-   "pygments.generated.css"
+   "pygments.generated.css",
+   "pygments.wrapper.css"
]
},
"ext.geshi.visualEditor": {
diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index b1f7cb9..643e3c3 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -14,3 +14,13 @@
border: 0;
padding: 0;
 }
+
+/*
+ * Don't show a red border around syntax errors. This behavior may be useful
+ * in code editors, but it is not useful in a wiki environment, especially
+ * given the longstanding habit of using an existing, mostly-compatible lexer
+ * to highlight a language for which no lexer exists.
+ */
+.mw-highlight .err {
+border: 0;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: remove role from zirconium - change (operations/puppet)

2015-06-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: remove role from zirconium
..

planet: remove role from zirconium

It is moving to planet1001 on ganeti instead.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/221016/1

diff --git a/manifests/site.pp b/manifests/site.pp
index cd0af12..1c9b696 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2369,7 +2369,6 @@
 class { 'base::firewall': }
 
 include standard
-include role::planet
 include role::wikimania_scholarships
 include role::bugzilla_static
 include role::transparency

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I743b252298116a0860e91fe12f596d3015b60f90
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] Hide the red border around syntax errors - change (mediawiki...SyntaxHighlight_GeSHi)

2015-06-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Hide the red border around syntax errors
..

Hide the red border around syntax errors

MZMcBride noticed the red border around '國' in
https://en.wikipedia.org/wiki/Swift_(programming_language)#Example_code

That particular case happens to be a Pygments bug, because multibyte characters
are valid variable names in Swift. But even in cases of legitimate syntax
errors, I don't think we want to show the red border. This behavior may be
useful in code editors, but it is not useful in a wiki environment, especially
given the longstanding habit of using an existing, mostly-compatible lexer to
highlight a language for which no specific lexer exists.

Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
---
M modules/pygments.wrapper.css
1 file changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index b1f7cb9..1c164ce 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -14,3 +14,16 @@
border: 0;
padding: 0;
 }
+
+/*
+ * Don't show a red border around syntax errors. This behavior may be useful
+ * in code editors, but it is not useful in a wiki environment, especially
+ * given the longstanding habit of using an existing, mostly-compatible lexer
+ * to highlight a language for which no lexer exists.
+ *
+ * We can trump the Pygment theme's style by using a more specific selector
+ * (using the tag name).
+ */
+.mw-highlight span.err {
+border: 0;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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] Revert "Pass uselang=user to the API instead of figuring it ... - change (mediawiki...Echo)

2015-06-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Revert "Pass uselang=user to the API instead of figuring it out 
client side"
..

Revert "Pass uselang=user to the API instead of figuring it out client side"

This breaks pages using ?uselang=xx where "xx" is not
the user's language.

This reverts commit 0919b01e75a2475ebc4af12fb8465b9c9569be56.

Bug: T103935
Change-Id: I219810451b991cef88bac62cf880bfda6f98e930
---
M modules/overlay/ext.echo.overlay.js
M modules/special/ext.echo.special.js
2 files changed, 7 insertions(+), 5 deletions(-)


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

diff --git a/modules/overlay/ext.echo.overlay.js 
b/modules/overlay/ext.echo.overlay.js
index ccdac82..ecb0a5e 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -3,7 +3,8 @@
'use strict';
 
// backwards compatibility <= MW 1.21
-   var getUrl = mw.util.getUrl || mw.util.wikiGetlink;
+   var getUrl = mw.util.getUrl || mw.util.wikiGetlink,
+   useLang = mw.config.get( 'wgUserLanguage' );
 
function EchoOverlay( apiResultNotifications ) {
this.api = mw.echo.overlay.api;
@@ -86,7 +87,7 @@
data = {
action: 'echomarkread',
token: mw.user.tokens.get( 'editToken' 
),
-   uselang: 'user'
+   uselang: useLang
};
if ( id ) {
// If id is given mark that as read 
otherwise use all unread messages
@@ -468,7 +469,7 @@
notformat: 'flyout',
notlimit: this.notificationLimit,
notprop: 'index|list|count',
-   uselang: 'user'
+   uselang: useLang
};
 
return this.api.get( apiData ).then( function ( result 
) {
diff --git a/modules/special/ext.echo.special.js 
b/modules/special/ext.echo.special.js
index 1d5726e..89b8527 100644
--- a/modules/special/ext.echo.special.js
+++ b/modules/special/ext.echo.special.js
@@ -1,5 +1,6 @@
 ( function ( $, mw ) {
'use strict';
+   var useLang = mw.config.get( 'wgUserLanguage' );
 
mw.echo.special = {
 
@@ -70,7 +71,7 @@
notprop: 'index|list',
notcontinue: this.notcontinue,
notlimit: mw.config.get( 
'wgEchoDisplayNum' ),
-   uselang: 'user'
+   uselang: useLang
};
 
api.get( apiData ).done( function ( result ) {
@@ -137,7 +138,7 @@
action: 'echomarkread',
list: unread.join( '|' ),
token: mw.user.tokens.get( 'editToken' ),
-   uselang: 'user'
+   uselang: useLang
} ).done( function ( result ) {
// update the badge if the link is enabled
if ( result.query.echomarkread.count !== 
undefined &&

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I219810451b991cef88bac62cf880bfda6f98e930
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Add high-resolution logos for the Chinese Wikipedia - change (operations/mediawiki-config)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Add high-resolution logos for the Chinese Wikipedia
..


Add high-resolution logos for the Chinese Wikipedia

This patch adds configuration support for two
high-resolution logos for the Chinese Wikipedia (zhwiki),
which currently uses Common.css overrides to achieve this.

Both logos have been generated from the official wiki logo
and optimized with optipng.

The logo is copyrighted by the Wikimedia Foundation and
released under the CC-BY-SA; also trademarked by the WMF.

See Phabricator task for details.

Bug: T102852
Change-Id: I1fc5be0af4d23c799c373c358f0bbe5df9f198e3
---
A w/static/images/project-logos/zhwiki-1.5x.png
A w/static/images/project-logos/zhwiki-2x.png
M wmf-config/InitialiseSettings.php
3 files changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/w/static/images/project-logos/zhwiki-1.5x.png 
b/w/static/images/project-logos/zhwiki-1.5x.png
new file mode 100644
index 000..4e05af0
--- /dev/null
+++ b/w/static/images/project-logos/zhwiki-1.5x.png
Binary files differ
diff --git a/w/static/images/project-logos/zhwiki-2x.png 
b/w/static/images/project-logos/zhwiki-2x.png
new file mode 100644
index 000..ed0b502
--- /dev/null
+++ b/w/static/images/project-logos/zhwiki-2x.png
Binary files differ
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 050d3d5..7cf1076 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1100,6 +1100,7 @@
'ruwiki' => array( '1.5x' => 
'/static/images/project-logos/ruwiki-1.5x.png', '2x' => 
'/static/images/project-logos/ruwiki-2x.png' ),
'tawiki' => array( '1.5x' => 
'/static/images/project-logos/tawiki-1.5x.png', '2x' => 
'/static/images/project-logos/tawiki-2x.png' ),
'viwiki' => array( '1.5x' => 
'/static/images/project-logos/viwiki-1.5x.png', '2x' => 
'/static/images/project-logos/viwiki-2x.png' ),
+   'zhwiki' => array( '1.5x' => 
'/static/images/project-logos/zhwiki-1.5x.png', '2x' => 
'/static/images/project-logos/zhwiki-2x.png' ),
 
 # Wiktionary
'viwiktionary' => array( '1.5x' => 
'/static/images/project-logos/viwiktionary-1.5x.png', '2x' => 
'/static/images/project-logos/viwiktionary-2x.png' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fc5be0af4d23c799c373c358f0bbe5df9f198e3
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update jQuery Client to v2.0.0 - change (VisualEditor/VisualEditor)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Update jQuery Client to v2.0.0
..


Update jQuery Client to v2.0.0

Breaking change

* Microsoft's new Edge browser is now identified as "edge" instead of "msie".

Project link

* https://github.com/wikimedia/jquery-client

File link

* https://github.com/wikimedia/jquery-client/blob/v2.0.0/jquery.client.js

Change-Id: I3d6aab9687feb45e813167f6c9c08575d3710148
---
M lib/jquery.client/jquery.client.js
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/lib/jquery.client/jquery.client.js 
b/lib/jquery.client/jquery.client.js
index 1560c7d..8257d85 100644
--- a/lib/jquery.client/jquery.client.js
+++ b/lib/jquery.client/jquery.client.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Client v1.0.0
+ * jQuery Client v2.0.0
  * https://www.mediawiki.org/wiki/JQuery_Client
  *
  * Copyright 2010-2015 jquery-client maintainers and other contributors.
@@ -182,9 +182,12 @@
version = match[1];
}
}
-   // And IE 12's different lies about not being IE
+   // And MS Edge's lies about being Chrome
+   //
+   // It's different enough from classic IE Trident engine 
that they do this
+   // to avoid getting caught by MSIE-specific browser 
sniffing.
if ( name === 'chrome' && ( match = ua.match( 
/\bedge\/([0-9\.]*)/ ) ) ) {
-   name = 'msie';
+   name = 'edge';
version = match[1];
layout = 'edge';
layoutversion = parseInt( match[1], 10 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d6aab9687feb45e813167f6c9c08575d3710148
Gerrit-PatchSet: 8
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP: Track geo feature usage - change (mediawiki...WikimediaEvents)

2015-06-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: WIP: Track geo feature usage
..

WIP: Track geo feature usage

Bug: T103017
Change-Id: Ifbc4ebaeb992e417dbe00da198987b0e83cb9a03
---
M WikimediaEvents.php
M WikimediaEventsHooks.php
A modules/ext.wikimediaEvents.geoFeatures.js
3 files changed, 75 insertions(+), 1 deletion(-)


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

diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index a46c63d..0deb170 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -40,6 +40,11 @@
  */
 $wgWMEStatsdBaseUri = false;
 
+/**
+ * @var bool: Whether geo/maps features specific to large Wikipedias should be 
tracked
+ */
+$wgWMETrackGeoFeatures = true;
+
 // Messages
 
 $wgMessagesDirs['WikimediaEvents'] = __DIR__ . '/i18n';
@@ -102,6 +107,20 @@
'remoteExtPath' => 'WikimediaEvents/modules',
'targets'   => array( 'desktop', 'mobile' ),
),
+   'schema.GeoFeatures' => array(
+   'class'=> 'ResourceLoaderSchemaModule',
+   'schema'   => 'GeoFeatures',
+   'revision' => 12505065,
+   ),
+   'ext.wikimediaEvents.geoFeatures' => array(
+   'scripts'   => array(
+   'ext.wikimediaEvents.geoFeatures.js',
+   ),
+   'localBasePath' => __DIR__ . '/modules',
+   'remoteExtPath' => 'WikimediaEvents/modules',
+   'targets'   => array( 'desktop', 'mobile' ),
+   'dependencies'  => array( 'schema.GeoFeatures' ),
+   ),
 );
 
 // Autoloader
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 541ecd9..b11c964 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -16,11 +16,15 @@
public static function onBeforePageDisplay( &$out, &$skin ) {
$out->addModules( 'ext.wikimediaEvents' );
 
-   global $wgWMEStatsdBaseUri;
+   global $wgWMEStatsdBaseUri, $wgWMETrackGeoFeatures;
if ( $wgWMEStatsdBaseUri !== false ) {
$out->addModules( 'ext.wikimediaEvents.statsd' );
}
 
+   if ( $wgWMETrackGeoFeatures ) {
+   $out->addModules( 'ext.wikimediaEvents.geoFeatures' );
+   }
+
$user = $out->getUser();
if ( $user->isLoggedIn() ) {
$out->addModules( 'ext.wikimediaEvents.loggedin' );
diff --git a/modules/ext.wikimediaEvents.geoFeatures.js 
b/modules/ext.wikimediaEvents.geoFeatures.js
new file mode 100644
index 000..5734bec
--- /dev/null
+++ b/modules/ext.wikimediaEvents.geoFeatures.js
@@ -0,0 +1,51 @@
+/**
+ * Track geo/mapping feature usage
+ * @see https://phabricator.wikimedia.org/T103017
+ * @see https://meta.wikimedia.org/wiki/Schema:GeoFeatures
+ */
+( function( $, mw ) {
+   var wmaIframe = "iframe[src^='//wma.wmflabs.org/iframe.html']",
+   wiwosmIframe = "iframe#openstreetmap";
+
+   /**
+* Sends tracking information
+*
+* @param feature
+* @param action
+* @param element
+*/
+   function track( feature, action, element ) {
+   var $el = $( element );
+   mw.eventLog.logEvent( 'GeoFeatures', {
+   "feature": feature,
+   "action": action,
+   "titleCoordinate": $el.is( '#coordinates *' )
+   } );
+   // If the event was caused by a click on a link, follow this 
link after a delay to give
+   // the event time to be logged
+   if ( $el.is( 'a' ) ) {
+   setTimeout(
+   function() {
+   document.location = $el.attr( 'href' );
+   },
+   200
+   );
+   }
+   }
+
+   // Track GeoHack usage
+   $( "a[href^='//tools.wmflabs.org/geohack/geohack.php']" ).on( 'click', 
function( event ) {
+   track( 'GeoHack', 'open', this );
+   event.preventDefault();
+   } );
+
+   // Track WikiMiniAtlas usage
+   $( '.wmamapbutton' ).on( 'click', function() {
+   track( 'WikiMiniAtlas', 'open', this );
+   } );
+
+   // Track WIWOSM usage
+   $( '.osm-icon-coordinates' ).on( 'click', function() {
+   track( 'WIWOSM', 'open', this );
+   } );
+}( jQuery, mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbc4ebaeb992e417dbe00da198987b0e83cb9a03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents

[MediaWiki-commits] [Gerrit] Enable composer for role::geshi - change (mediawiki/vagrant)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Enable composer for role::geshi
..


Enable composer for role::geshi

Bug: T103890
Change-Id: I961059f6c62ab954c004ad8d210a6fcc469e231e
---
M puppet/modules/role/manifests/geshi.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/geshi.pp 
b/puppet/modules/role/manifests/geshi.pp
index 692ffc6..d7b21f8 100644
--- a/puppet/modules/role/manifests/geshi.pp
+++ b/puppet/modules/role/manifests/geshi.pp
@@ -4,6 +4,7 @@
 require_package('python-pygments')
 
 mediawiki::extension { 'SyntaxHighlight_GeSHi':
+composer => true,
 settings => {
 wgPygmentizePath => '/usr/local/bin/pygmentize',
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I961059f6c62ab954c004ad8d210a6fcc469e231e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Temporarily make subpages in occupied namespaces non-Flow again - change (mediawiki...Flow)

2015-06-25 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Temporarily make subpages in occupied namespaces non-Flow again
..

Temporarily make subpages in occupied namespaces non-Flow again

This will allow ContentHandler::getDefaultModelFor to do the right
thing for wikitext subpages last edited before $wgContentHandlerUseDB
was turned on.

This should go to production.  Then, Kunal's script for T103388
should be run on all WMF wikis.  Then, this can be reverted.

Bug: T103776
Change-Id: I7af2e61dbb4968977c0898d20de24f8ce5f59f12
---
M includes/TalkpageManager.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index 7a93e5c..d399024 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -106,7 +106,7 @@
if ( in_array( $title->getPrefixedText(), 
$this->occupiedPages ) ) {
return true;
}
-   if ( in_array( $title->getNamespace(), 
$this->occupiedNamespaces ) ) {
+   if ( !$title->isSubpage() && in_array( 
$title->getNamespace(), $this->occupiedNamespaces ) ) {
return true;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7af2e61dbb4968977c0898d20de24f8ce5f59f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Enable composer for role::geshi - change (mediawiki/vagrant)

2015-06-25 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Enable composer for role::geshi
..

Enable composer for role::geshi

Bug: T103890
Change-Id: I961059f6c62ab954c004ad8d210a6fcc469e231e
---
M puppet/modules/role/manifests/geshi.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/10/221010/1

diff --git a/puppet/modules/role/manifests/geshi.pp 
b/puppet/modules/role/manifests/geshi.pp
index 692ffc6..d7b21f8 100644
--- a/puppet/modules/role/manifests/geshi.pp
+++ b/puppet/modules/role/manifests/geshi.pp
@@ -4,6 +4,7 @@
 require_package('python-pygments')
 
 mediawiki::extension { 'SyntaxHighlight_GeSHi':
+composer => true,
 settings => {
 wgPygmentizePath => '/usr/local/bin/pygmentize',
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I961059f6c62ab954c004ad8d210a6fcc469e231e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] More wikitech cleanup - change (operations/mediawiki-config)

2015-06-25 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: More wikitech cleanup
..

More wikitech cleanup

* Move semantic namespace stuff up to below Semantic includes
* Remove pmtpa reference from OSM config

Bug: T75939
Change-Id: Iebea58aee16a999d083363e16665c0ea8da265ac
---
M wmf-config/wikitech.php
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 4abbe76..03ee088 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -12,6 +12,10 @@
 require_once( "$IP/extensions/SemanticResultFormats/SemanticResultFormats.php" 
);
 enableSemantics( 'wikitech' );
 
+$smwgNamespacesWithSemanticLinks[112] = true;
+$smwgNamespacesWithSemanticLinks[NS_NOVA_RESOURCE] = true;
+#$wgNamespacesToBeSearchedDefault[NS_NOVA_RESOURCE] = true;
+
 require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
 $wgAuth = new LdapAuthenticationPlugin();
 $wgLDAPDomainNames = array( 'labs');
@@ -115,15 +119,11 @@
 # Enable doc links on the 'configure instance' page
 $wgOpenStackManagerPuppetDocBase = 
'http://doc.wikimedia.org/puppet/classes/__site__/';
 
-$wgOpenStackManagerProxyGateways = array('pmtpa' => '208.80.153.214', 'eqiad' 
=> '208.80.155.156');
+$wgOpenStackManagerProxyGateways = array( 'eqiad' => '208.80.155.156' );
 
 # Restrict eqiad to a group
 $wgOpenStackManagerRestrictedRegions = array();
 $wgOpenStackManagerReadOnlyRegions = array();
-
-$smwgNamespacesWithSemanticLinks[112] = true;
-$smwgNamespacesWithSemanticLinks[NS_NOVA_RESOURCE] = true;
-#$wgNamespacesToBeSearchedDefault[NS_NOVA_RESOURCE] = true;
 
 # TODO:  Re-enable OpenID
 #require_once("$IP/extensions/OpenID/OpenID.php");

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebea58aee16a999d083363e16665c0ea8da265ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Add an hhvm-graceful-all command - change (mediawiki...scap)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Add an hhvm-graceful-all command
..


Add an hhvm-graceful-all command

Add a new command that can be used to perform a rolling restart of HHVM
across the cluster.

Bug: T103886
Change-Id: Ic937aea94c5c5eea1a24df1d253f6e448cd99c65
---
A bin/hhvm-graceful-all
M scap/__init__.py
M scap/main.py
3 files changed, 52 insertions(+), 1 deletion(-)

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



diff --git a/bin/hhvm-graceful-all b/bin/hhvm-graceful-all
new file mode 100755
index 000..8cafdb9
--- /dev/null
+++ b/bin/hhvm-graceful-all
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Restart HHVM across the entire cluster
+#
+# Copyright © 2015 Wikimedia Foundation and contributors
+
+import os
+import sys
+
+# Add scap package to search path
+script = os.path.realpath(sys.argv[0])
+scap_src = os.path.dirname(os.path.dirname(script))
+sys.path.append(scap_src)
+
+import scap
+scap.HHVMGracefulAll.run()
diff --git a/scap/__init__.py b/scap/__init__.py
index d628c73..84af164 100644
--- a/scap/__init__.py
+++ b/scap/__init__.py
@@ -8,6 +8,7 @@
 """
 from .main import (
 CompileWikiversions,
+HHVMGracefulAll,
 MWVersionsInUse,
 PurgeL10nCache,
 RebuildCdbs,
@@ -24,6 +25,7 @@
 
 __all__ = (
 'CompileWikiversions',
+'HHVMGracefulAll',
 'MWVersionsInUse',
 'PurgeL10nCache',
 'RebuildCdbs',
@@ -40,6 +42,7 @@
 
 any((
 CompileWikiversions,
+HHVMGracefulAll,
 MWVersionsInUse,
 PurgeL10nCache,
 RebuildCdbs,
diff --git a/scap/main.py b/scap/main.py
index f36c4bf..b4f4c9e 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -263,6 +263,7 @@
 self.get_logger().warning(
 '%d hosts failed to restart HHVM', failed)
 self.soft_errors = True
+self.get_stats().increment('deploy.restart')
 
 def _after_lock_release(self):
 self.announce('Finished scap: %s (duration: %s)',
@@ -473,7 +474,7 @@
 
 
 class RestartHHVM(cli.Application):
-"""Restart the HHVM fcgi process
+"""Restart the HHVM fcgi process on the local server
 
 #. Depool the server if registered with pybal
 #. Wait for pending requests to complete
@@ -524,3 +525,33 @@
 '/usr/sbin/service apache2 start', self.get_logger())
 
 return 0
+
+
+class HHVMGracefulAll(cli.Application):
+"""Perform a rolling restart of HHVM across the cluster."""
+
+def _process_arguments(self, args, extra_args):
+if hasattr(args, 'message'):
+args.message = ' '.join(args.message) or '(no message)'
+return args, extra_args
+
+@cli.argument('message', nargs='*', help='Log message for SAL')
+def main(self, *extra_args):
+exit_code = 0
+self.announce('Restarting HHVM: %s', self.arguments.message)
+
+target_hosts = utils.read_dsh_hosts_file(self.config['dsh_targets'])
+succeeded, failed = tasks.restart_hhvm(
+target_hosts, self.config,
+# Use a batch size of 5% of the total target list
+len(target_hosts) // 20)
+if failed:
+self.get_logger().warning(
+'%d hosts failed to restart HHVM', failed)
+exit_code = 1
+
+self.announce('Finished HHVM restart: %s (duration: %s)',
+self.arguments.message, utils.human_duration(self.get_duration()))
+self.get_stats().increment('deploy.restart')
+
+return exit_code

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic937aea94c5c5eea1a24df1d253f6e448cd99c65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] i18n: Use same title across all collections - change (mediawiki...Gather)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: i18n: Use same title across all collections
..


i18n: Use same title across all collections

Bug: T102188
Change-Id: I6760d8104c5d85d3d01fd14d08a2b624de76d577
---
M i18n/en.json
M i18n/qqq.json
M includes/views/CollectionsList.php
3 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 9356920..c5d1932 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -93,7 +93,6 @@
"gather-watchlist-title": "Watchlist",
"gather-watchlist-description": "A list of pages that I am interested 
in.",
"gather-lists-title": "Collections",
-   "gather-lists-from-user-title": "Collections by $1",
"gather-meta-description": "Here are the collections $1 {{GENDER:$1|has 
created}} on {{SITENAME}}.",
"gather-read-more": "Read more",
"gather-private": "Private",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8994a1e..df8d080 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -93,7 +93,6 @@
"gather-watchlist-title": "Title used for special casing the Watchlist 
collection on the [[Special:Gather]] page.\n{{Identical|Watchlist}}",
"gather-watchlist-description": "Default description for special casing 
the Watchlist collection on the [[Special:Gather]] page.",
"gather-lists-title": "Title for [[Special:Gather]] when displaying 
user curated lists.\n{{Identical|Collection}}",
-   "gather-lists-from-user-title": "Title for [[Special:Gather]] when 
displaying user curated lists for a known user.\nParameters: $1 - name of user 
who collections belong to.",
"gather-meta-description": "Description of the [[Special:Gather]] page 
of collections of a user. Added to the meta tag on the html.\nParameters: $1 - 
name of user who collections belong to.",
"gather-read-more": "Label for the read more link used on 
[[Special:Gather]].\n{{Identical|Read more}}",
"gather-private": "Label for a collection when it is not publicly 
visible\n{{Identical|Private}}",
diff --git a/includes/views/CollectionsList.php 
b/includes/views/CollectionsList.php
index 3ee0b0d..1eeb172 100644
--- a/includes/views/CollectionsList.php
+++ b/includes/views/CollectionsList.php
@@ -48,10 +48,7 @@
 * @return string title for page showing curated lists
 */
public function getTitle() {
-   $owner = $this->collectionsList->getOwner();
-   $pageTitle = $owner ? wfMessage( 
'gather-lists-from-user-title', $owner ) :
-   wfMessage( 'gather-lists-title' );
-   return $pageTitle->text();
+   return wfMessage( 'gather-lists-title' )->text();
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6760d8104c5d85d3d01fd14d08a2b624de76d577
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BarryTheBrowserTestBot 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Robmoen 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Delay tutorial so it is more noticeable to the user - change (mediawiki...Gather)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Delay tutorial so it is more noticeable to the user
..


Delay tutorial so it is more noticeable to the user

bug: T103213
Change-Id: I37e3a548884ebfb8934ba80544400ad387fbf839
---
M resources/ext.gather.init/init.js
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/resources/ext.gather.init/init.js 
b/resources/ext.gather.init/init.js
index 38cbb9e..45a5f74 100644
--- a/resources/ext.gather.init/init.js
+++ b/resources/ext.gather.init/init.js
@@ -112,9 +112,13 @@
 
watchstar.insertBefore( $star );
$star.remove();
-   if ( shouldShow ) {
-   showPointer( watchstar );
-   }
+
+   // Delay tutorial so it's more noticeable to the user
+   setTimeout( function () {
+   if ( shouldShow ) {
+   showPointer( watchstar );
+   }
+   }, 1000 );
 
watchstar.on( 'completed', function ( firstTimeUser, 
isNewCollection ) {
if ( isNewCollection ) {
@@ -160,8 +164,8 @@
isAnon: user.isAnon(),
isWatched: $star.hasClass( 'watched' )
} );
-   skin.emit( 'changed' );
}
+   skin.emit( 'changed' );
} else {
revealCollectionsInMainMenu();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37e3a548884ebfb8934ba80544400ad387fbf839
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Robmoen 
Gerrit-Reviewer: BarryTheBrowserTestBot 
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] Cherry-pick 892b52a, ca778d0, f834b71. - change (mediawiki...SyntaxHighlight_GeSHi)

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: Cherry-pick 892b52a, ca778d0, f834b71.
..


Cherry-pick 892b52a, ca778d0, f834b71.

* 892b52a - Avoid displaying double borders for inline code snippets
* ca778d0 - Partially revert "Remove obsolete mw-highlighter styles"
* f834b71 - Remove obsolete mw-highlighter styles

Backports fixes for T85794 and T103705.

Change-Id: I5d1510dc80d6d4712ca841129fcd26f84ea03862
---
M modules/pygments.wrapper.css
1 file changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index f6dfb71..b1f7cb9 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -1,6 +1,16 @@
 .mw-highlight {
-   font-family: monospace;
+   /* All supported programming languages are written left-to-right */
/* @noflip */
direction: ltr;
unicode-bidi: embed;
 }
+
+/* Avoid displaying double borders for nested 'code' elements.
+   Before we started using the 'code' tag for inline code snippets,
+   ...
+   was a common pattern. Continue supporting it in existing content. */
+code code.mw-highlight {
+   background-color: transparent;
+   border: 0;
+   padding: 0;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d1510dc80d6d4712ca841129fcd26f84ea03862
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Cherry-pick 892b52a, ca778d0, f834b71. - change (mediawiki...SyntaxHighlight_GeSHi)

2015-06-25 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Cherry-pick 892b52a, ca778d0, f834b71.
..

Cherry-pick 892b52a, ca778d0, f834b71.

* 892b52a - Avoid displaying double borders for inline code snippets
* ca778d0 - Partially revert "Remove obsolete mw-highlighter styles"
* f834b71 - Remove obsolete mw-highlighter styles

Backports fixes for T85794 and T103705.

Change-Id: I5d1510dc80d6d4712ca841129fcd26f84ea03862
---
M modules/pygments.wrapper.css
1 file changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index f6dfb71..b1f7cb9 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -1,6 +1,16 @@
 .mw-highlight {
-   font-family: monospace;
+   /* All supported programming languages are written left-to-right */
/* @noflip */
direction: ltr;
unicode-bidi: embed;
 }
+
+/* Avoid displaying double borders for nested 'code' elements.
+   Before we started using the 'code' tag for inline code snippets,
+   ...
+   was a common pattern. Continue supporting it in existing content. */
+code code.mw-highlight {
+   background-color: transparent;
+   border: 0;
+   padding: 0;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d1510dc80d6d4712ca841129fcd26f84ea03862
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4f2b052..bd39419 - change (mediawiki/extensions)

2015-06-25 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 4f2b052..bd39419
..


Syncronize VisualEditor: 4f2b052..bd39419

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

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



diff --git a/VisualEditor b/VisualEditor
index 4f2b052..bd39419 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4f2b052fc20281264ba5e65a200a416918865dfe
+Subproject commit bd394194e38fa863bcfcb5792769c8872c7e8e38

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4f2b052..bd39419 - change (mediawiki/extensions)

2015-06-25 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 4f2b052..bd39419
..

Syncronize VisualEditor: 4f2b052..bd39419

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


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

diff --git a/VisualEditor b/VisualEditor
index 4f2b052..bd39419 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4f2b052fc20281264ba5e65a200a416918865dfe
+Subproject commit bd394194e38fa863bcfcb5792769c8872c7e8e38

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

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

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

[MediaWiki-commits] [Gerrit] ve.init.mw.Target: Strip all

2015-06-25 Thread jenkins-bot (Code Review)

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

Change subject: ve.init.mw.Target: Strip all

1 2 3 4 5 6 >

1 - 100 of 540 matches

Mail list logo