[MediaWiki-commits] [Gerrit] Conversion to WANObjectCache - change (mediawiki...CentralAuth)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225013
Change subject: Conversion to WANObjectCache
..
Conversion to WANObjectCache
Bug: T93141
Change-Id: Icf2981d7f690330788d22deb83856e1793ff3c33
---
M includes/CentralAuthUser.php
1 file changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/13/225013/1
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
old mode 100644
new mode 100755
index 5dd3c64..5219669
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -323,8 +323,7 @@
*/
protected function loadFromCache( $cache = null, $fromMaster = false ) {
if ( $cache == null ) {
- global $wgMemc;
- $cache = $wgMemc->get( $this->getCacheKey() );
+ $cache = ObjectCache::getMainWANInstance()->get(
$this->getCacheKey() );
$fromMaster = true;
}
@@ -383,8 +382,6 @@
* Save cachable data to memcached.
*/
protected function saveToCache() {
- global $wgMemc;
-
// Make sure the data is fresh
if ( isset( $this->mGlobalId ) && !$this->mFromMaster ) {
$this->resetState();
@@ -392,7 +389,7 @@
$obj = $this->getCacheObject();
wfDebugLog( 'CentralAuthVerbose', "Saving user {$this->mName}
to cache." );
- $wgMemc->set( $this->getCacheKey(), $obj, 86400 );
+ ObjectCache::getMainWANInstance()->set( $this->getCacheKey(),
$obj, 86400 );
}
/**
@@ -2669,7 +2666,8 @@
wfDebugLog( 'CentralAuthVerbose', "Quick cache invalidation for
global user {$this->mName}" );
- $wgMemc->delete( $this->getCacheKey() );
+ ObjectCache::getMainWANInstance()->delete( $this->getCacheKey()
);
+ $wgMemc->delete( $this->getCacheKey() ); // transition b/c
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/225013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf2981d7f690330788d22deb83856e1793ff3c33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
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] Fixed local user cache purge in adminDelete() - change (mediawiki...CentralAuth)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225012
Change subject: Fixed local user cache purge in adminDelete()
..
Fixed local user cache purge in adminDelete()
Change-Id: Ie1ffd645400396658227f2bb98a544119e0aa252
---
M includes/CentralAuthUser.php
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/12/225012/1
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
old mode 100644
new mode 100755
index 5dd3c64..d12f84e
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -1225,9 +1225,9 @@
* @return Status
*/
function adminDelete( $reason ) {
- global $wgMemc;
wfDebugLog( 'CentralAuth', "Deleting global account for user
{$this->mName}" );
$centralDB = self::getCentralDB();
+ $wanCache = ObjectCache::getMainWANInstance();
# Synchronise passwords
$password = $this->getPassword();
@@ -1245,8 +1245,12 @@
array( 'user_name' => $name ),
__METHOD__
);
- $id = $localDB->selectField( 'user', 'user_id', array(
'user_name' => $this->mName ), __METHOD__ );
- $wgMemc->delete( "$wiki:user:id:$id" );
+
+ // @TODO: this has poor separation of concerns :/
+ $id = $localDB->selectField( 'user', 'user_id',
+ array( 'user_name' => $this->mName ),
__METHOD__ );
+ $wanCache->delete( "$wiki:user:id:$id" );
+
$lb->reuseConnection( $localDB );
}
$wasSuppressed = $this->isOversighted();
--
To view, visit https://gerrit.wikimedia.org/r/225012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1ffd645400396658227f2bb98a544119e0aa252
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
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] Fix CreateLocalAccountJob caching - change (mediawiki...CentralAuth)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225011
Change subject: Fix CreateLocalAccountJob caching
..
Fix CreateLocalAccountJob caching
Make sure that cache invalidation happens after slaves have caught up.
Bug: T105105
Change-Id: Ibbbd2ebf50a56603365b25654f61e8f207aa6ea3
---
M includes/CreateLocalAccountJob.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/11/225011/1
diff --git a/includes/CreateLocalAccountJob.php
b/includes/CreateLocalAccountJob.php
index 08445bc..2b87621 100644
--- a/includes/CreateLocalAccountJob.php
+++ b/includes/CreateLocalAccountJob.php
@@ -52,6 +52,7 @@
$success = CentralAuthHooks::attemptAddUser( $user );
if ( $success ) {
+ $centralUser->waitForSlaves();
$centralUser->invalidateCache();
}
--
To view, visit https://gerrit.wikimedia.org/r/225011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbbd2ebf50a56603365b25654f61e8f207aa6ea3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-6 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Chinese Conversion Table Update 2015-6 .. Chinese Conversion Table Update 2015-6 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: Ibf6d776d07a611a2afcb2c6c984074c39c8c0d70 --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/toTrad.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 8 files changed, 294 insertions(+), 812 deletions(-) Approvals: LNDDYL: Looks good to me, but someone else must approve Liangent: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 87cc48e..31806b7 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1370,6 +1370,7 @@ '脶' => '腡', '脸' => '臉', '腊' => '臘', +'腌' => '醃', '腘' => '膕', '腭' => '齶', '腻' => '膩', @@ -3355,6 +3356,7 @@ '干奴才' => '乾奴才', '干妹' => '乾妹', '干姊' => '乾姊', +'干姐' => '乾姐', '干娘' => '乾娘', '干妈' => '乾媽', '干子' => '乾子', @@ -3416,6 +3418,7 @@ '干癣' => '乾癬', '干瘾' => '乾癮', '干白儿' => '乾白兒', +'干白葡萄酒' => '乾白葡萄酒', '干的' => '乾的', '干眼' => '乾眼', '干瞪眼' => '乾瞪眼', @@ -3426,6 +3429,7 @@ '干篾片' => '乾篾片', '干粉' => '乾粉', '干粮' => '乾糧', +'干红葡萄酒' => '乾紅葡萄酒', '干结' => '乾結', '干丝' => '乾絲', '干纲' => '乾綱', @@ -3654,7 +3658,6 @@ '于贈' => '于贈', '于赠' => '于贈', '于越' => '于越', -'于军' => '于軍', '于軍' => '于軍', '于道泉' => '于道泉', '于远伟' => '于遠偉', @@ -3677,9 +3680,8 @@ '于韦斯屈莱' => '于韋斯屈萊', '于風政' => '于風政', '于风政' => '于風政', +'于飛' => '于飛', '于飞' => '于飛', -'于飛島' => '于飛島', -'于飞岛' => '于飛島', '于余曲折' => '于餘曲折', '于鬯' => '于鬯', '于魁智' => '于魁智', @@ -3731,6 +3733,7 @@ '人数里' => '人數裡', '人物志' => '人物誌', '人生天里' => '人生天里', +'人发指' => '人髮指', '什锦面' => '什錦麵', '仇仇' => '仇讎', '介胄' => '介冑', @@ -3744,7 +3747,6 @@ '代理发行' => '代理發行', '代码表' => '代碼表', '代表' => '代表', -'令人发指' => '令人髮指', '以自制' => '以自制', '仲裁制' => '仲裁制', '件钟' => '件鐘', @@ -3835,6 +3837,7 @@ '依托' => '依託', '侵并' => '侵併', '局促' => '侷促', +'便于' => '便於', '系数' => '係數', '系为' => '係為', '保险柜' => '保險柜', @@ -3844,6 +3847,7 @@ '修杰麟' => '修杰麟', '修胡刀' => '修鬍刀', '俯冲' => '俯衝', +'个月里' => '個月裡', '个里' => '個裡', '个钟' => '個鐘', '个钟表' => '個鐘錶', @@ -3854,7 +3858,6 @@ '候复' => '候覆', '倚闲' => '倚閑', '倛丑' => '倛醜', -'借听于聋' => '借聽於聾', '借鉴' => '借鑑', '倦游' => '倦遊', '假里' => '假裡', @@ -4066,8 +4069,8 @@ '分子钟' => '分子鐘', '分子云' => '分子雲', '分布于' => '分布於', -'分散于' => '分散於', '分钟' => '分鐘', +'分钟里' => '分鐘裡', '刑余' => '刑餘', '划一桨' => '划一槳', '划上' => '划上', @@ -4243,7 +4246,6 @@ '卵与石斗' => '卵與石鬥', '卷须' => '卷鬚', '厂部' => '厂部', -'厝薪于火' => '厝薪於火', '原子钟' => '原子鐘', '原钟' => '原鐘', '历物之意' => '厤物之意', @@ -4256,6 +4258,7 @@ '反复' => '反覆', '反覆' => '反覆', '取舍' => '取捨', +'取决于' => '取決於', '受雇' => '受僱', '受托' => '受託', '丛林里' => '叢林裡', @@ -4517,6 +4520,7 @@ '回游' => '回遊', '因于' => '因於', '困倦起来' => '困倦起來', +'困于' => '困於', '困兽之斗' => '困獸之鬥', '困兽犹斗' => '困獸猶鬥', '困斗' => '困鬥', @@ -4568,6 +4572,7 @@ '埃及历史' => '埃及歷史', '埃及艳后' => '埃及豔后', '埃荣冲' => '埃榮衝', +'城市里' => '城市裡', '城里' => '城裡', '埔子里' => '埔子里', '埔里社' => '埔裏社', @@ -4765,7 +4770,6 @@ '字汇' => '字彙', '字码表' => '字碼表', '字里行间' => '字裡行間', -'存十一于千百' => '存十一於千百', '存折' => '存摺', '存于' => '存於', '孛里海' => '孛里海', @@ -4811,10 +4815,10 @@ '实干' => '實幹', '实累累' => '實纍纍', '写字台' => '寫字檯', -'宽宽松松' => '寬寬鬆鬆', '宽于' => '寬於', '宽余' => '寬餘', '宽松' => '寬鬆', +'宽松松' => '寬鬆鬆', '寮采' => '寮寀', '寶山庄' => '寶山庄', '宝历' => '寶曆', @@ -4864,13 +4868,16 @@ '小型钟表面' => '小型鐘表面', '小型钟表' => '小型鐘錶', '小型钟面' => '小型鐘面', +'小时里' => '小時裡', '小米面' => '小米麵', '小只' => '小隻', '少采' => '少採', '就范' => '就範', '就里' => '就裡', '尸位素餐' => '尸位素餐', +'尸佼' => '尸佼', '尸利' => '尸利', +'尸子' => '尸子', '尸居余气' => '尸居餘氣', '尸弃佛' => '尸棄佛', '尸祝' => '尸祝', @@ -4900,7 +4907,7 @@ '山羊胡' => '山羊鬍', '山里有' => '山裡有', '山里的' => '山裡的', -'山谷道' => '山谷道', +'山谷' => '山谷', '山重水复' => '山重水複', '岫岩' => '岫巖', '岱岳' => '岱嶽', @@ -4945,7 +4952,7 @@ '已占算' => '已占算', '巴尔干' => '巴爾幹', '巷里' => '巷裡', -'市里' => '市裡', +'市里的' => '市裡的', '布谷' => '布穀', '布谷鸟' => '布穀鳥', '布谷鸟钟' => '布穀鳥鐘', @@ -4985,8 +4992,8 @@ '干了' => '幹了', '干事' => '幹事', '干些' => '幹些', -'干人' => '幹人', '干什么' => '幹什麼', +'干仗' => '幹仗', '干个' => '幹個', '干劲' => '幹勁', '干吏' => '幹吏', @@ -5025,8 +5032,7 @@ '干起来' => '幹起來', '干路' => '幹路', '干办' => '幹辦', -'干这一行' => '幹這一行', -'干这种事' => '幹這種事', +'干这' => '幹這', '干道' => '幹道', '干部' => '幹部', '干革命' => '幹革命', @@ -5344,6 +5350,7 @@ '忠于' => '忠於', '快快当当' => '快快當當', '快冲' => '快衝', +'怎么干' => '怎麼幹', '怒于' => '怒於', '怒气冲天' => '怒氣衝天', '怒火冲天' => '怒火衝天', @@ -5441,6 +5448,7 @@ '截发' => '截髮', '战天斗地' => '戰天鬥地', '战栗' => '戰慄', +'战于' => '戰於', '战斗' => '戰鬥', '戏
[MediaWiki-commits] [Gerrit] Popup added - does not work as intended - change (mediawiki...LanguageTool)
Ankita-ks has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225010
Change subject: Popup added - does not work as intended
..
Popup added - does not work as intended
Change-Id: If99cf6c91e999f098154d2c2385b71fc084f3ceb
---
M modules/ext.LanguageToolAction.js
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool
refs/changes/10/225010/1
diff --git a/modules/ext.LanguageToolAction.js
b/modules/ext.LanguageToolAction.js
index dd44775..9e53e60 100644
--- a/modules/ext.LanguageToolAction.js
+++ b/modules/ext.LanguageToolAction.js
@@ -171,6 +171,15 @@
height: rects[j].height
} ) );
}
+ var popup = new OO.ui.PopupWidget( {
+ $content: $( 'Hi there!' ),
+ padded: true,
+ width: 300,
+ head: true,
+ label: 'The PopupWidget label'
+ } );
+ $result.append( popup.$element );
+ popup.toggle( true );
this.$errors.append( $result );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/225010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If99cf6c91e999f098154d2c2385b71fc084f3ceb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Ankita-ks
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance for Ifda867ef - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update WikimediaMaintenance for Ifda867ef .. Update WikimediaMaintenance for Ifda867ef Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 45ee134..bb11b01 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 45ee134be922328263dd6f45b65dec03173f76b2 +Subproject commit bb11b01343e7561539c5162c862616165c7837f6 -- To view, visit https://gerrit.wikimedia.org/r/225008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf14 Gerrit-Owner: Alex Monk Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Last minute changes, turning all 'Projects' into 'projects' - change (wikimedia/TransparencyReport-private)
MSyed has uploaded a new change for review. https://gerrit.wikimedia.org/r/225009 Change subject: Last minute changes, turning all 'Projects' into 'projects' .. Last minute changes, turning all 'Projects' into 'projects' Change-Id: I3fecbd38df83ab3edd80789370dbf066c7174591 --- M locales/en.yml 1 file changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/09/225009/1 diff --git a/locales/en.yml b/locales/en.yml index a86ec77..fc5b918 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -22,7 +22,7 @@ home: title: "Wikimedia Foundation" title_two: "Transparency Report" -lead: "Our mission is to provide free access to the sum of all human knowledge. We believe that protecting user privacy and defending against censorship are essential to the success of that mission. Every year, we receive requests from governments, individuals, and organizations to disclose information about our users or to delete or alter content on our Projects. Some are legitimate. Some are not. The purpose of this transparency report is to shed light on the requests we receive and how we respond to them." +lead: "Our mission is to provide free access to the sum of all human knowledge. We believe that protecting user privacy and defending against censorship are essential to the success of that mission. Every year, we receive requests from governments, individuals, and organizations to disclose information about our users or to delete or alter content on our projects. Some are legitimate. Some are not. The purpose of this transparency report is to shed light on the requests we receive and how we respond to them." privacy: "Requests for User Data" content: "Requests for Content Alteration & Takedown" faq: "Frequently AskedQuestions" @@ -36,7 +36,7 @@ title: "Requests forUser Data" total_number_of_requests: "Total Number of Requests" percentage_of_times_information_produced: "Percentage of Times Information Produced" -lead: "Freedom of speech is essential to the Wikimedia movement—our Projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously." +lead: "Freedom of speech is essential to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously." intro: "However, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we collect little nonpublic information about users and retain that information for a short period of time. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our standards—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users.If we must produce information due to a legally valid request, we will notify the affected user before we disclose, if we are legally permitted and have the means to do so. In certain cases, we may help find assistance for users to fight an invalid request.Below, you will find more information about the requests for user data we receive." quote: "Awareness that the Government may be watching chills associational and expressive freedoms. And the Government’s unrestrained power to assemble data that reveal private aspects of identity is susceptible to abuse." cite: "Justice Sonia SotomayorU.S. Supreme Court (2012)" @@ -65,7 +65,7 @@ by_country: "By Country" graph_voluntary_disclosure: "Voluntary disclosures by type" voluntary_disclosures_title: "Voluntary Disclosures" -voluntary_disclosures_intro: "On rare occasions, we become aware of concerning statements on the Wikimedia Projects, like a suicide threat or bomb threat. We take these statements seriously and assess each one individually. As appropriate, we contact the authorities to help resolve the issue.The stories below are real. They are also meant to be illustrative of the kinds of situations that would warrant a possible voluntary disclosure of user information. Please note that these specific stories may not have occurred during the precise time frame that this transparency report covers. Some variables, such as the privacy of our users, may require our postponing the reporting of certain stories." +voluntary_disclosures_intro: "On rare occasions, we become aware of concerning statements on the Wikimedia projects, like a suicide threat or bomb threat. We take these statements seriously and assess each one individually. As appropriate, we contact the authoritie
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance for Ifda867ef - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/225008 Change subject: Update WikimediaMaintenance for Ifda867ef .. Update WikimediaMaintenance for Ifda867ef Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/08/225008/1 diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 45ee134..bb11b01 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 45ee134be922328263dd6f45b65dec03173f76b2 +Subproject commit bb11b01343e7561539c5162c862616165c7837f6 -- To view, visit https://gerrit.wikimedia.org/r/225008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf14 Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
$lines = array_map( 'trim', explode( "\n", trim( $intermap ) )
);
if ( !$lines || count( $lines ) < 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225006
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/06/225006/1
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
$lines = array_map( 'trim', explode( "\n", trim( $intermap ) )
);
if ( !$lines || count( $lines ) < 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225007
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/07/225007/1
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
$lines = array_map( 'trim', explode( "\n", trim( $intermap ) )
);
if ( !$lines || count( $lines ) < 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf14
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
$lines = array_map( 'trim', explode( "\n", trim( $intermap ) )
);
if ( !$lines || count( $lines ) < 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf14
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert spaces to tabs in CrossCheckViolationFormatter.php - change (mediawiki...WikibaseQualityExternalValidation)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert spaces to tabs in CrossCheckViolationFormatter.php
..
Convert spaces to tabs in CrossCheckViolationFormatter.php
Change-Id: I29d8ac3b34e7d59a63c86cd8e39afa589a76086b
---
M includes/Violations/CrossCheckViolationFormatter.php
1 file changed, 229 insertions(+), 197 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Violations/CrossCheckViolationFormatter.php
b/includes/Violations/CrossCheckViolationFormatter.php
index 9b0a0ad..361d82e 100755
--- a/includes/Violations/CrossCheckViolationFormatter.php
+++ b/includes/Violations/CrossCheckViolationFormatter.php
@@ -3,8 +3,8 @@
namespace WikibaseQuality\ExternalValidation\Violations;
use Deserializers\Deserializer;
-use InvalidArgumentException;
use Html;
+use InvalidArgumentException;
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\EntityIdFormatter;
@@ -12,216 +12,244 @@
use WikibaseQuality\Violations\Violation;
use WikibaseQuality\Violations\ViolationFormatter;
-
class CrossCheckViolationFormatter implements ViolationFormatter {
+ const EXTERNAL_VIOLATION_ICON_CLASS = 'wbq-icon-arrows-severe';
-const EXTERNAL_VIOLATION_ICON_CLASS = 'wbq-icon-arrows-severe';
+ /**
+* @var Deserializer
+*/
+ private $dataValueDeserializer;
-/**
- * @var Deserializer
- */
-private $dataValueDeserializer;
+ /**
+* @var EntityIdFormatter
+*/
+ private $entityIdFormatter;
-/**
- * @var EntityIdFormatter
- */
-private $entityIdFormatter;
+ /**
+* @var ValueFormatter
+*/
+ private $valueFormatter;
-/**
- * @var ValueFormatter
- */
-private $valueFormatter;
+ /**
+* @var DumpMetaInformationLookup
+*/
+ private $dumpMetaInformationLookup;
-/**
- * @var DumpMetaInformationLookup
- */
-private $dumpMetaInformationLookup;
+ /**
+* @param Deserializer $dataValueDeserializer
+* @param EntityIdFormatter $entityIdFormatter (must return HTML)
+* @param ValueFormatter $valueFormatter (must return HTML)
+* @param DumpMetaInformationLookup $dumpMetaInformationLookup
+*/
+ public function __construct(
+ Deserializer $dataValueDeserializer,
+ EntityIdFormatter $entityIdFormatter,
+ ValueFormatter $valueFormatter,
+ DumpMetaInformationLookup $dumpMetaInformationLookup
+ ) {
+ $this->dataValueDeserializer = $dataValueDeserializer;
+ $this->entityIdFormatter = $entityIdFormatter;
+ $this->valueFormatter = $valueFormatter;
+ $this->dumpMetaInformationLookup = $dumpMetaInformationLookup;
+ }
-/**
- * @param Deserializer $dataValueDeserializer
- * @param EntityIdFormatter $entityIdFormatter (must return HTML)
- * @param ValueFormatter $valueFormatter (must return HTML)
- * @param DumpMetaInformationLookup $dumpMetaInformationLookup
- */
-public function __construct( Deserializer $dataValueDeserializer,
-
EntityIdFormatter $entityIdFormatter,
-ValueFormatter
$valueFormatter,
-
DumpMetaInformationLookup $dumpMetaInformationLookup ) {
-$this->dataValueDeserializer = $dataValueDeserializer;
-$this->entityIdFormatter = $entityIdFormatter;
-$this->valueFormatter = $valueFormatter;
-$this->dumpMetaInformationLookup = $dumpMetaInformationLookup;
-}
+ /**
+* @see ViolationFormatter::isFormatterFor
+*
+* @param Violation $violation
+*
+* @return bool
+*/
+ public function isFormatterFor( Violation $violation ) {
+ $splitConstraintId =
+ explode( Violation::CONSTRAINT_ID_DELIMITER,
$violation->getConstraintId() );
+ $prefix = $splitConstraintId[0];
-/**
- * @see ViolationFormatter::isFormatterFor
- *
- * @param Violation $violation
- *
- * @return bool
- */
-public function isFormatterFor( Violation $violation ) {
-$splitConstraintId = explode( Violation::CONSTRAINT_ID_DELIMITER,
$violation->getConstraintId() );
-$prefix = $splitConstraintId[0];
+ return $prefix === WBQ_EXTERNAL_VALIDATION_ID;
+ }
-return $prefix === WBQ_EXTERNAL_VALIDATION_ID;
-}
+ /**
+* @see ViolationFormatter::formatAdditionalInformation
+*
+* @param Violation $violation
+*
+* @throws InvalidArgumentException
+* @
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
$lines = array_map( 'trim', explode( "\n", trim( $intermap ) )
);
if ( !$lines || count( $lines ) < 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
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] Get outdated messages in the target language using MessageCo... - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225005
Change subject: Get outdated messages in the target language using
MessageCollection
..
Get outdated messages in the target language using MessageCollection
Steps:
1. Used filtered query to search for a string in a source language.
Suppose source language is finnish, search for 'Aloita', it returns all
finnish messages with 'Aloita'.(Default source language is the wiki's content
language)
2. Create message definitions for all message keys found in step 1.
3. Filter to get all the outdated messages in the selected target language.
By default the target language is the interface language.
Use parameter 'filter=translated' to get translated messages.
Bug: T101221
Change-Id: Ic0326d688f799a91d308ebd1d78facccb2a4e61a
---
M specials/SpecialSearchTranslations.php
M ttmserver/ElasticSearchTTMServer.php
2 files changed, 106 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/05/225005/1
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index 17c880e..364ed16 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -51,6 +51,7 @@
}
public function execute( $par ) {
+ global $wgLanguageCode;
$this->setHeaders();
$this->checkPermissions();
@@ -64,9 +65,11 @@
$this->opts = $opts = new FormOptions();
$opts->add( 'query', '' );
+ $opts->add( 'sourcelanguage', '' );
$opts->add( 'language', '' );
$opts->add( 'group', '' );
$opts->add( 'grouppath', '' );
+ $opts->add( 'filter', '' );
$opts->add( 'limit', $this->limit );
$opts->add( 'offset', 0 );
@@ -87,9 +90,23 @@
throw new ErrorPageError( 'tux-sst-solr-offline-title',
'tux-sst-solr-offline-body' );
}
+ $terms = array();
+ if( $opts->getValue( 'filter' ) === 'outdated' ) {
+ if ( $opts->getValue( 'language' ) === '' ) {
+ $opts->add( 'language',
$this->getLanguage()->getCode() );
+ }
+ $collection = $this->applyFilter( $resultset );
+ $docs = $collection['documents'];
+ $terms = $collection['terms'];
+ $documents = $this->getMessages( $docs );
+ $total = $collection['total'];
+ } else {
+ $documents = $server->getDocuments( $resultset );
+ $total = $server->getTotalHits( $resultset );
+ }
+
// Part 1: facets
$facets = $server->getFacets( $resultset );
- $total = $server->getTotalHits( $resultset );
$facetHtml = '';
if ( count( $facets['language'] ) > 0 ) {
@@ -113,7 +130,6 @@
// Part 2: results
$resultsHtml = '';
- $documents = $server->getDocuments( $resultset );
foreach ( $documents as $document ) {
$text = $document['content'];
@@ -145,7 +161,7 @@
$resultAttribs['data-translation'] =
$helpers->getTranslation();
$resultAttribs['data-group'] = $groupId;
- $uri = wfAppendQuery( $document['uri'], array(
'action' => 'edit' ) );
+ $uri = wfAppendQuery(
$handle->getTitle()->getCanonicalUrl(), array( 'action' => 'edit' ) );
$link = Html::element( 'a', array(
'href' => $uri,
), $this->msg( 'tux-sst-edit' )->text() );
@@ -209,6 +225,47 @@
$this->showSearch( $search, $count, $facetHtml, $resultsHtml );
}
+ protected function getMessages( $collect ) {
+ $ret = $documents = array();
+ foreach ( $collect as $mkey => $value ) {
+ $ret = array();
+ $ret['content'] = $collect[$mkey]['translation'];
+ $localid = explode( '/',
$collect[$mkey]['title']->getPrefixedText() );
+ $ret['localid'] = $localid[0];
+ $ret['language'] = $localid[1];
+ $documents[] = $ret;
+ }
+ return $documents;
+ }
+
+ protected function applyFilter( $resultset ) {
+ $messages = $documents = $terms = array();
+ $language = $this->opts->getValue( 'language' );
+ foreach ( $resultset->getResults() as $docum
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225004
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/04/225004/1
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw', 30 );
$lines = array_map( 'trim', explode( "\n", trim( $intermap ) )
);
if ( !$lines || count( $lines ) < 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
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] API: Changing the output if there are zero users for the fea... - change (mediawiki...BetaFeatures)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Changing the output if there are zero users for the feature
..
API: Changing the output if there are zero users for the feature
Bug: T99502
Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
---
M includes/ApiListBetaFeatures.php
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiListBetaFeatures.php b/includes/ApiListBetaFeatures.php
index 9955a81..f6fc2e6 100644
--- a/includes/ApiListBetaFeatures.php
+++ b/includes/ApiListBetaFeatures.php
@@ -47,12 +47,15 @@
$key
);
if ( isset( $counts[$key] ) ) {
- $this->getResult()->addValue(
- $path,
- 'count',
- $counts[$key]
- );
+ $count = $counts[$key];
+ } else {
+ $count = 0;
}
+ $this->getResult()->addValue(
+ $path,
+ 'count',
+ $count
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/225003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Quiddity
Gerrit-Reviewer: Alex Monk
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] API: Changing the output if there are zero users for the fea... - change (mediawiki...BetaFeatures)
Quiddity has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225003
Change subject: API: Changing the output if there are zero users for the feature
..
API: Changing the output if there are zero users for the feature
Bug: T99502
Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
---
M includes/ApiListBetaFeatures.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures
refs/changes/03/225003/1
diff --git a/includes/ApiListBetaFeatures.php b/includes/ApiListBetaFeatures.php
index 9955a81..d61870e 100644
--- a/includes/ApiListBetaFeatures.php
+++ b/includes/ApiListBetaFeatures.php
@@ -47,12 +47,15 @@
$key
);
if ( isset( $counts[$key] ) ) {
- $this->getResult()->addValue(
+ $count = $counts[$key];
+ } else {
+ $count = 0;
+ }
+ $this->getResult()->addValue(
$path,
'count',
- $counts[$key]
+ $count
);
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/225003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Quiddity
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-6 - change (mediawiki/core)
Chiefwei has uploaded a new change for review. https://gerrit.wikimedia.org/r/225002 Change subject: Chinese Conversion Table Update 2015-6 .. Chinese Conversion Table Update 2015-6 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: Ibf6d776d07a611a2afcb2c6c984074c39c8c0d70 --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/toTrad.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 8 files changed, 266 insertions(+), 812 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/225002/1 diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 87cc48e..8b6c0b0 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1370,6 +1370,7 @@ '脶' => '腡', '脸' => '臉', '腊' => '臘', +'腌' => '醃', '腘' => '膕', '腭' => '齶', '腻' => '膩', @@ -3355,6 +3356,7 @@ '干奴才' => '乾奴才', '干妹' => '乾妹', '干姊' => '乾姊', +'干姐' => '乾姐', '干娘' => '乾娘', '干妈' => '乾媽', '干子' => '乾子', @@ -3416,6 +3418,7 @@ '干癣' => '乾癬', '干瘾' => '乾癮', '干白儿' => '乾白兒', +'干白葡萄酒' => '乾白葡萄酒', '干的' => '乾的', '干眼' => '乾眼', '干瞪眼' => '乾瞪眼', @@ -3426,6 +3429,7 @@ '干篾片' => '乾篾片', '干粉' => '乾粉', '干粮' => '乾糧', +'干红葡萄酒' => '乾紅葡萄酒', '干结' => '乾結', '干丝' => '乾絲', '干纲' => '乾綱', @@ -3654,7 +3658,6 @@ '于贈' => '于贈', '于赠' => '于贈', '于越' => '于越', -'于军' => '于軍', '于軍' => '于軍', '于道泉' => '于道泉', '于远伟' => '于遠偉', @@ -3677,9 +3680,8 @@ '于韦斯屈莱' => '于韋斯屈萊', '于風政' => '于風政', '于风政' => '于風政', +'于飛' => '于飛', '于飞' => '于飛', -'于飛島' => '于飛島', -'于飞岛' => '于飛島', '于余曲折' => '于餘曲折', '于鬯' => '于鬯', '于魁智' => '于魁智', @@ -3731,6 +3733,7 @@ '人数里' => '人數裡', '人物志' => '人物誌', '人生天里' => '人生天里', +'人发指' => '人髮指', '什锦面' => '什錦麵', '仇仇' => '仇讎', '介胄' => '介冑', @@ -3744,7 +3747,6 @@ '代理发行' => '代理發行', '代码表' => '代碼表', '代表' => '代表', -'令人发指' => '令人髮指', '以自制' => '以自制', '仲裁制' => '仲裁制', '件钟' => '件鐘', @@ -3835,6 +3837,7 @@ '依托' => '依託', '侵并' => '侵併', '局促' => '侷促', +'便于' => '便於', '系数' => '係數', '系为' => '係為', '保险柜' => '保險柜', @@ -3854,7 +3857,6 @@ '候复' => '候覆', '倚闲' => '倚閑', '倛丑' => '倛醜', -'借听于聋' => '借聽於聾', '借鉴' => '借鑑', '倦游' => '倦遊', '假里' => '假裡', @@ -4066,7 +4068,6 @@ '分子钟' => '分子鐘', '分子云' => '分子雲', '分布于' => '分布於', -'分散于' => '分散於', '分钟' => '分鐘', '刑余' => '刑餘', '划一桨' => '划一槳', @@ -4243,7 +4244,6 @@ '卵与石斗' => '卵與石鬥', '卷须' => '卷鬚', '厂部' => '厂部', -'厝薪于火' => '厝薪於火', '原子钟' => '原子鐘', '原钟' => '原鐘', '历物之意' => '厤物之意', @@ -4256,6 +4256,7 @@ '反复' => '反覆', '反覆' => '反覆', '取舍' => '取捨', +'取决于' => '取決於', '受雇' => '受僱', '受托' => '受託', '丛林里' => '叢林裡', @@ -4517,6 +4518,7 @@ '回游' => '回遊', '因于' => '因於', '困倦起来' => '困倦起來', +'困于' => '困於', '困兽之斗' => '困獸之鬥', '困兽犹斗' => '困獸猶鬥', '困斗' => '困鬥', @@ -4568,6 +4570,7 @@ '埃及历史' => '埃及歷史', '埃及艳后' => '埃及豔后', '埃荣冲' => '埃榮衝', +'城市里' => '城市裡', '城里' => '城裡', '埔子里' => '埔子里', '埔里社' => '埔裏社', @@ -4765,7 +4768,6 @@ '字汇' => '字彙', '字码表' => '字碼表', '字里行间' => '字裡行間', -'存十一于千百' => '存十一於千百', '存折' => '存摺', '存于' => '存於', '孛里海' => '孛里海', @@ -4811,10 +4813,10 @@ '实干' => '實幹', '实累累' => '實纍纍', '写字台' => '寫字檯', -'宽宽松松' => '寬寬鬆鬆', '宽于' => '寬於', '宽余' => '寬餘', '宽松' => '寬鬆', +'宽松松' => '寬鬆鬆', '寮采' => '寮寀', '寶山庄' => '寶山庄', '宝历' => '寶曆', @@ -4870,7 +4872,9 @@ '就范' => '就範', '就里' => '就裡', '尸位素餐' => '尸位素餐', +'尸佼' => '尸佼', '尸利' => '尸利', +'尸子' => '尸子', '尸居余气' => '尸居餘氣', '尸弃佛' => '尸棄佛', '尸祝' => '尸祝', @@ -4900,7 +4904,7 @@ '山羊胡' => '山羊鬍', '山里有' => '山裡有', '山里的' => '山裡的', -'山谷道' => '山谷道', +'山谷' => '山谷', '山重水复' => '山重水複', '岫岩' => '岫巖', '岱岳' => '岱嶽', @@ -4945,7 +4949,7 @@ '已占算' => '已占算', '巴尔干' => '巴爾幹', '巷里' => '巷裡', -'市里' => '市裡', +'市里的' => '市裡的', '布谷' => '布穀', '布谷鸟' => '布穀鳥', '布谷鸟钟' => '布穀鳥鐘', @@ -4985,8 +4989,8 @@ '干了' => '幹了', '干事' => '幹事', '干些' => '幹些', -'干人' => '幹人', '干什么' => '幹什麼', +'干仗' => '幹仗', '干个' => '幹個', '干劲' => '幹勁', '干吏' => '幹吏', @@ -5025,8 +5029,7 @@ '干起来' => '幹起來', '干路' => '幹路', '干办' => '幹辦', -'干这一行' => '幹這一行', -'干这种事' => '幹這種事', +'干这' => '幹這', '干道' => '幹道', '干部' => '幹部', '干革命' => '幹革命', @@ -5344,6 +5347,7 @@ '忠于' => '忠於', '快快当当' => '快快當當', '快冲' => '快衝', +'怎么干' => '怎麼幹', '怒于' => '怒於', '怒气冲天' => '怒氣衝天', '怒火冲天' => '怒火衝天', @@ -5441,6 +5445,7 @@ '截发' => '截髮', '战天斗地' => '戰天鬥地', '战栗' => '戰慄', +'战于' => '戰於', '战斗' => '戰鬥', '戏里' => '戲裡', '戲院里' => '戲院里', @@ -5734,7 +5739,6 @@ '控制' => '控制', '推情准理' => '推情準理', '推托之词' => '推托之詞', -'推舟于陆' => '推舟於陸', '推托' => '推託', '提子干' => '提子乾', '提心吊胆' => '提心弔膽', @@ -5876,126 +5880,10 @@ '方志恒' => '方志恒', '方法里' => '方法裡', '方志' => '方誌', -'于0' => '於0', -'于1' => '於1', -'于1天' => '於1天', -'于2' => '於2', -'
[MediaWiki-commits] [Gerrit] Make the height of search input field same as its container - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the height of search input field same as its container
..
Make the height of search input field same as its container
Bug: T105960
Change-Id: I916c2add6cec3fe193de424a9d98a5e6cd08ccb0
---
M modules/tools/styles/ext.cx.tools.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/styles/ext.cx.tools.less
b/modules/tools/styles/ext.cx.tools.less
index e044684..9fa84ff 100644
--- a/modules/tools/styles/ext.cx.tools.less
+++ b/modules/tools/styles/ext.cx.tools.less
@@ -10,7 +10,7 @@
.cx-card--search__input {
font-size: 16px;
width: 100%;
- height: 100%;
+ height: 2.5em;
border: none;
background: none;
outline: none;
--
To view, visit https://gerrit.wikimedia.org/r/224974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I916c2add6cec3fe193de424a9d98a5e6cd08ccb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Fixed documentation for hasmg parameter - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: API: Fixed documentation for hasmg parameter .. API: Fixed documentation for hasmg parameter The API returns a plural "messages" key. Bug: T105120 Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 --- M includes/api/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index f972a42..ab513a2 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -980,7 +980,7 @@ "apihelp-query+usercontribs-example-ipprefix": "Show contributions from all IP addresses with prefix 192.0.2..", "apihelp-query+userinfo-description": "Get information about the current user.", - "apihelp-query+userinfo-param-prop": "Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag message if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:Deprecated. Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the Accept-Language header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns $2 if more).", + "apihelp-query+userinfo-param-prop": "Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag messages if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:Deprecated. Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the Accept-Language header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns $2 if more).", "apihelp-query+userinfo-example-simple": "Get information about the current user.", "apihelp-query+userinfo-example-data": "Get additional information about the current user.", -- To view, visit https://gerrit.wikimedia.org/r/225000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Quiddity Gerrit-Reviewer: Anomie Gerrit-Reviewer: Legoktm 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] Hygiene: Adjust styling of main menu so browser tests do not... - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225001
Change subject: Hygiene: Adjust styling of main menu so browser tests do not
fail
..
Hygiene: Adjust styling of main menu so browser tests do not fail
Confusingly the header-title element covers the entire header. I'm not sure
what purpose this is for, given that we do not want to cover the notifications
icon (and will not due to z-index) and the search icon to the left of it does
the same thing.
This however does confuse browser tests which attempt to click on the left
search
icon but cannot click it, as the header accepts the clicks.
If the sole purpose is to center without the notifications icon, given that
this is beta
I'd rather remove this now and revisit it in the event we push to beta.
Bug: T105878
Change-Id: I3a1ab6f615f80ee5947dc0b0cbe0112d88a9a309
---
M resources/skins.minerva.beta.styles/ui.less
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/01/225001/1
diff --git a/resources/skins.minerva.beta.styles/ui.less
b/resources/skins.minerva.beta.styles/ui.less
index c1cdb2a..821fe49 100644
--- a/resources/skins.minerva.beta.styles/ui.less
+++ b/resources/skins.minerva.beta.styles/ui.less
@@ -36,12 +36,7 @@
.header-title {
// align the text in the middle regardless of whether the
notification icon exists or not
- bottom: 0;
- left: 0;
- position: absolute;
- right: 0;
text-align: center;
- top: 0;
width: auto;
a {
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/225001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a1ab6f615f80ee5947dc0b0cbe0112d88a9a309
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Fixed documentation for hasmg parameter - change (mediawiki/core)
Quiddity has uploaded a new change for review. https://gerrit.wikimedia.org/r/225000 Change subject: API: Fixed documentation for hasmg parameter .. API: Fixed documentation for hasmg parameter The API returns a plural "messages" key. Bug: T105120 Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 --- M includes/api/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/225000/1 diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index f972a42..ab513a2 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -980,7 +980,7 @@ "apihelp-query+usercontribs-example-ipprefix": "Show contributions from all IP addresses with prefix 192.0.2..", "apihelp-query+userinfo-description": "Get information about the current user.", - "apihelp-query+userinfo-param-prop": "Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag message if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:Deprecated. Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the Accept-Language header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns $2 if more).", + "apihelp-query+userinfo-param-prop": "Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag messages if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:Deprecated. Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the Accept-Language header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns $2 if more).", "apihelp-query+userinfo-example-simple": "Get information about the current user.", "apihelp-query+userinfo-example-data": "Get additional information about the current user.", -- To view, visit https://gerrit.wikimedia.org/r/225000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Quiddity ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style improvements for page selector - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Style improvements for page selector
..
Style improvements for page selector
* All items should have the same height.
* All images should occupy the same (square) area.
* Articles without an image should show a generic article placeholder.
Bug: T105966
Change-Id: I4ba24b76dcc354034c7e2b474a05b1dff24876c8
---
M modules/widgets/pageselector/ext.cx.pageselector.js
M modules/widgets/pageselector/ext.cx.pageselector.less
A modules/widgets/pageselector/page-placeholder.png
A modules/widgets/pageselector/page-placeholder.svg
4 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.js
b/modules/widgets/pageselector/ext.cx.pageselector.js
index 71388fa..6821140 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.js
+++ b/modules/widgets/pageselector/ext.cx.pageselector.js
@@ -115,8 +115,7 @@
thumbnailHeight = 50;
}
$resultItem.css( {
- 'background-image': 'url(' +
page.thumbnail.source + ')',
- 'background-size': thumbnailWidth + 'px
' + thumbnailHeight + 'px'
+ 'background-image': 'url(' +
page.thumbnail.source + ')'
} );
}
this.$menu.append( $resultItem );
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.less
b/modules/widgets/pageselector/ext.cx.pageselector.less
index 76859fc..3a2ca14 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.less
+++ b/modules/widgets/pageselector/ext.cx.pageselector.less
@@ -18,6 +18,8 @@
background-position: left center;
background-size: 50px 50px;
padding: 5px 5px 5px 60px;
+ min-height: 40px;
+ .background-image-svg('page-placeholder.svg',
'page-placeholder.png');
}
li.mw-pageselector-selected {
diff --git a/modules/widgets/pageselector/page-placeholder.png
b/modules/widgets/pageselector/page-placeholder.png
new file mode 100644
index 000..6a79e7b
--- /dev/null
+++ b/modules/widgets/pageselector/page-placeholder.png
Binary files differ
diff --git a/modules/widgets/pageselector/page-placeholder.svg
b/modules/widgets/pageselector/page-placeholder.svg
new file mode 100644
index 000..6e27a49
--- /dev/null
+++ b/modules/widgets/pageselector/page-placeholder.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
--
To view, visit https://gerrit.wikimedia.org/r/224982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ba24b76dcc354034c7e2b474a05b1dff24876c8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce the size of icons in dashboard to match the font size - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce the size of icons in dashboard to match the font size
..
Reduce the size of icons in dashboard to match the font size
Bug: T105962
Change-Id: I1d21ef1046f6b60fe39bfb1c1c71a3a1307997bf
---
M modules/dashboard/styles/ext.cx.dashboard.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less
b/modules/dashboard/styles/ext.cx.dashboard.less
index 8341a45..926 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -56,7 +56,7 @@
padding: 30px 40px;
background-position: center left;
background-repeat: no-repeat;
- background-size: 25px;
+ background-size: 20px;
}
&__title {
--
To view, visit https://gerrit.wikimedia.org/r/224976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d21ef1046f6b60fe39bfb1c1c71a3a1307997bf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't show groups on Special:ListGroupRights if they have no... - change (mediawiki/core)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224999
Change subject: Don't show groups on Special:ListGroupRights if they have no
actual enabled rights
..
Don't show groups on Special:ListGroupRights if they have no actual enabled
rights
Change-Id: I9b80679ec4f9980619969f7af78bcf6a646fd3d4
---
M includes/specials/SpecialListgrouprights.php
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/99/224999/1
diff --git a/includes/specials/SpecialListgrouprights.php
b/includes/specials/SpecialListgrouprights.php
index 828a93b..5950595 100644
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -56,7 +56,17 @@
$config = $this->getConfig();
$groupPermissions = $config->get( 'GroupPermissions' );
+ foreach ( $groupPermissions as $group => $rights ) {
+ if ( count( array_filter( $rights ) ) === 0 ) {
+ unset( $groupPermissions[$group] );
+ }
+ }
$revokePermissions = $config->get( 'RevokePermissions' );
+ foreach ( $revokePermissions as $group => $rights ) {
+ if ( count( array_filter( $rights ) ) === 0 ) {
+ unset( $revokePermissions[$group] );
+ }
+ }
$addGroups = $config->get( 'AddGroups' );
$removeGroups = $config->get( 'RemoveGroups' );
$groupsAddToSelf = $config->get( 'GroupsAddToSelf' );
--
To view, visit https://gerrit.wikimedia.org/r/224999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b80679ec4f9980619969f7af78bcf6a646fd3d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change time of Wikidata browser test to run at 01:00 UTC - change (integration/config)
JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/224998 Change subject: Change time of Wikidata browser test to run at 01:00 UTC .. Change time of Wikidata browser test to run at 01:00 UTC This is in preparation for running them also against testwikidata and making sure that they run after the deployment train for group 0 and so that we can still react before train for group 1. Bug: T105985 Change-Id: I8a1f10c5b2a53e068416d454222dc73deece684d --- M jjb/job-templates-browsertests.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/98/224998/1 diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml index 79fbcf4..da431ec 100644 --- a/jjb/job-templates-browsertests.yaml +++ b/jjb/job-templates-browsertests.yaml @@ -58,7 +58,7 @@ defaults: browsertests triggers: - - timed: "H 14 * * *" + - timed: "H 01 * * *" - defaults: name: browsertests -- To view, visit https://gerrit.wikimedia.org/r/224998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a1f10c5b2a53e068416d454222dc73deece684d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: JanZerebecki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix link to WD Json dumps on other dumps html page - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Fix link to WD Json dumps on other dumps html page .. Fix link to WD Json dumps on other dumps html page This makes the 'other' dumps link to the newer / correct location for the WD json dumps. Bug: T104307 Change-Id: Icfb78eea7953a9320d595535324402c617efa76f --- M modules/dataset/files/html/other_index.html 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/dataset/files/html/other_index.html b/modules/dataset/files/html/other_index.html index 926c14a..dc85649 100644 --- a/modules/dataset/files/html/other_index.html +++ b/modules/dataset/files/html/other_index.html @@ -114,7 +114,7 @@ Also see daily dumps of additions/changes to content (Experimental!) Historical material only: archives of sql/XML dumps for previous years starting from 2001 Other content - Wikidata JSON dumps + Wikidata entity dumps Pagecount data collected by Domas Mituzas Pagecount/projectcount data derived by Erik Zachte from Domas Mituzas' archives Pagecount/projectcount data including mobile/zero sites -- To view, visit https://gerrit.wikimedia.org/r/224768 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfb78eea7953a9320d595535324402c617efa76f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Addshore Gerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Hoo man Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misc-web varnish: retab - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224997
Change subject: misc-web varnish: retab
..
misc-web varnish: retab
Let's use spaces instead of literal tabs because we do in all the puppet
classes and this just means having to switch editor config back and forth.
Change-Id: Iff01aa9549e0db474b3439bf238c0f58d0a0f57e
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 99 insertions(+), 99 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/224997/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 63e1012..47a6b38 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -1,109 +1,109 @@
include "errorpage.inc.vcl";
sub vcl_recv {
- if (req.http.Host == "git.wikimedia.org") {
- set req.backend = antimony;
- // gitblit requires the following request headers:
- set req.http.X-Forwarded-Proto = "https";
- set req.http.X-Forwarded-Port = "443";
- } elsif (req.http.Host == "doc.wikimedia.org" || req.http.Host ==
"integration.wikimedia.org") {
- set req.backend = gallium;
- } elsif (req.http.Host == "download.wikimedia.org") {
- set req.backend = dataset1001;
- } elsif (req.http.Host == "gerrit.wikimedia.org") {
- set req.backend = ytterbium;
- // No caching
- return (pass);
- } elsif (req.http.Host == "gdash.wikimedia.org" || req.http.Host ==
"tessera.wikimedia.org" || req.http.Host == "performance.wikimedia.org" ||
req.http.Host == "graphite.wikimedia.org") {
- set req.backend = graphite1001;
- } elsif (req.http.Host == "logstash.wikimedia.org"){
- set req.backend = logstash;
- } elsif (req.http.Host == "releases.wikimedia.org") {
- set req.backend = caesium;
- } elsif (req.http.Host == "grafana.wikimedia.org" || req.http.Host ==
"iegreview.wikimedia.org") {
- set req.backend = zirconium;
- } elsif (req.http.Host == "parsoid-tests.wikimedia.org") {
- set req.backend = ruthenium;
- } elsif (req.http.Host == "horizon.wikimedia.org") {
- set req.backend = californium;
- } elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host
== "phab.wmfusercontent.org" || req.http.Host == "bugzilla.wikimedia.org" ||
req.http.Host == "bugs.wikimedia.org") {
- set req.backend = iridium;
- } elsif (req.http.Host == "static-bugzilla.wikimedia.org" ||
req.http.Host == "annual.wikimedia.org" || req.http.Host ==
"transparency.wikimedia.org" || req.http.Host == "policy.wikimedia.org") {
- set req.backend = bromine;
- return (pass);
- } elsif (req.http.Host == "servermon.wikimedia.org") {
- set req.backend = netmon1001;
- } elsif (req.http.Host == "people.wikimedia.org") {
- set req.backend = terbium;
- // No caching of public_html dirs
- return (pass);
- } elsif (req.http.Host == "ishmael.wikimedia.org") {
- set req.backend = neon;
- } elsif (req.http.Host == "racktables.wikimedia.org" || req.http.Host
== "rt.wikimedia.org") {
- set req.backend = magnesium;
- } elsif (req.http.Host == "metrics.wikimedia.org" || req.http.Host ==
"stats.wikimedia.org") {
- set req.backend = stat1001;
- } elsif (req.http.Host == "datasets.wikimedia.org") {
- set req.backend = stat1001;
- // No caching of datasets. They can be larger than misc
varnish can deal with.
- return (pass);
- } elsif (req.http.Host == "config-master.wikimedia.org") {
- set req.backend = palladium;
- // No caching of configs; scripts may want to know when things
change
- return (pass);
- } elsif (req.http.Host == "noc.wikimedia.org" || req.http.Host ==
"dbtree.wikimedia.org") {
- set req.backend = terbium;
- } elsif (req.http.Host == "scholarships.wikimedia.org") {
- set req.backend = krypton;
- } elsif (req.http.Host == "hue.wikimedia.org") {
- // make sure all requests to Hue are via https proxy
- if (req.http.X-Forwarded-Proto != "https") {
- set req.http.Location = "https://"; + req.http.Host +
req.url;
- // Use a custom 755 error code to indicate internally
- // that we are forcing a 301 redirect to https.
- error 755 "TLS Redirect";
- }
- else {
- set req.backend = analytics1027;
- }
- }
- elsif (req.http.Host == "yarn.wikimedia.org") {
-
[MediaWiki-commits] [Gerrit] Reduce the z-index of callout to a reasonable level - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce the z-index of callout to a reasonable level
..
Reduce the z-index of callout to a reasonable level
It had a huge z-index causing IME selector hidden under it.
Bug: T105954
Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
---
M modules/widgets/callout/ext.cx.callout.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/widgets/callout/ext.cx.callout.css
b/modules/widgets/callout/ext.cx.callout.css
index 9fbf067..0531b32 100644
--- a/modules/widgets/callout/ext.cx.callout.css
+++ b/modules/widgets/callout/ext.cx.callout.css
@@ -7,7 +7,7 @@
border: 1px solid #ccc;
border-radius: 3px;
max-width: 500px;
- z-index: 10;
+ z-index: 999;
}
.cx-callout::after, .cx-callout::before {
--
To view, visit https://gerrit.wikimedia.org/r/224990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] scholarships: switch app to backend krypton - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: scholarships: switch app to backend krypton
..
scholarships: switch app to backend krypton
Bug:T105003
Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 3 insertions(+), 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 34517df..63e1012 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -20,7 +20,7 @@
set req.backend = logstash;
} elsif (req.http.Host == "releases.wikimedia.org") {
set req.backend = caesium;
- } elsif (req.http.Host == "scholarships.wikimedia.org" || req.http.Host
== "grafana.wikimedia.org" || req.http.Host == "iegreview.wikimedia.org") {
+ } elsif (req.http.Host == "grafana.wikimedia.org" || req.http.Host ==
"iegreview.wikimedia.org") {
set req.backend = zirconium;
} elsif (req.http.Host == "parsoid-tests.wikimedia.org") {
set req.backend = ruthenium;
@@ -53,6 +53,8 @@
return (pass);
} elsif (req.http.Host == "noc.wikimedia.org" || req.http.Host ==
"dbtree.wikimedia.org") {
set req.backend = terbium;
+ } elsif (req.http.Host == "scholarships.wikimedia.org") {
+ set req.backend = krypton;
} elsif (req.http.Host == "hue.wikimedia.org") {
// make sure all requests to Hue are via https proxy
if (req.http.X-Forwarded-Proto != "https") {
--
To view, visit https://gerrit.wikimedia.org/r/224996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: BBlack
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] scholarships: switch app to backend krypton - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224996
Change subject: scholarships: switch app to backend krypton
..
scholarships: switch app to backend krypton
Bug:T105003
Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/224996/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 34517df..f70f448 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -20,7 +20,7 @@
set req.backend = logstash;
} elsif (req.http.Host == "releases.wikimedia.org") {
set req.backend = caesium;
- } elsif (req.http.Host == "scholarships.wikimedia.org" || req.http.Host
== "grafana.wikimedia.org" || req.http.Host == "iegreview.wikimedia.org") {
+ } elsif (req.http.Host == "grafana.wikimedia.org" || req.http.Host ==
"iegreview.wikimedia.org") {
set req.backend = zirconium;
} elsif (req.http.Host == "parsoid-tests.wikimedia.org") {
set req.backend = ruthenium;
@@ -53,6 +53,8 @@
return (pass);
} elsif (req.http.Host == "noc.wikimedia.org" || req.http.Host ==
"dbtree.wikimedia.org") {
set req.backend = terbium;
+} elsif (req.http.Host == "scholarships.wikimedia.org") {
+set req.backend = krypton;
} elsif (req.http.Host == "hue.wikimedia.org") {
// make sure all requests to Hue are via https proxy
if (req.http.X-Forwarded-Proto != "https") {
--
To view, visit https://gerrit.wikimedia.org/r/224996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
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] Convert MWExceptionHandler to use structured logging - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert MWExceptionHandler to use structured logging
..
Convert MWExceptionHandler to use structured logging
Replace wfDebugLog() calls in MWExceptionHandler with direct use of
LoggerFactory and LoggerInterface. Logged exceptions are added to the
log message context.
LegacyLogger is also updated to append stack traces to any log event
when $wgLogExceptionBacktrace is true and the PSR-3 recommendation of
passing the exception as an 'exception' context item.
Handling of context data in LegacyLogger is expanded to support arrays,
exceptions and common object types.
Bug: T88649
Change-Id: I71499d895582bdea033a2516c902e23e38084080
---
M includes/debug/logger/LegacyLogger.php
M includes/exception/MWExceptionHandler.php
M tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
3 files changed, 215 insertions(+), 48 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/debug/logger/LegacyLogger.php
b/includes/debug/logger/LegacyLogger.php
index 6bd6411..8010790 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -22,6 +22,7 @@
use DateTimeZone;
use MWDebug;
+use MWExceptionHandler;
use Psr\Log\AbstractLogger;
use Psr\Log\LogLevel;
use UDPTransport;
@@ -167,7 +168,7 @@
* @return string
*/
public static function format( $channel, $message, $context ) {
- global $wgDebugLogGroups;
+ global $wgDebugLogGroups, $wgLogExceptionBacktrace;
if ( $channel === 'wfDebug' ) {
$text = self::formatAsWfDebug( $channel, $message,
$context );
@@ -213,6 +214,16 @@
} else {
// Default formatting is wfDebugLog's historic style
$text = self::formatAsWfDebugLog( $channel, $message,
$context );
+ }
+
+ // Append stacktrace of exception if available
+ if ( $wgLogExceptionBacktrace &&
+ isset( $context['exception'] ) &&
+ $context['exception'] instanceof Exception
+ ) {
+ $text .= MWExceptionHandler::getRedactedTraceAsString(
+ $context['exception']->getTraceAsString()
+ ) . "\n";
}
return self::interpolate( $text, $context );
@@ -301,7 +312,7 @@
if ( strpos( $message, '{' ) !== false ) {
$replace = array();
foreach ( $context as $key => $val ) {
- $replace['{' . $key . '}'] = $val;
+ $replace['{' . $key . '}'] = self::flatten(
$val );
}
$message = strtr( $message, $replace );
}
@@ -310,6 +321,66 @@
/**
+* Convert a logging context element to a string suitable for
+* interpolation.
+*
+* @param mixed $item
+* @return string
+*/
+ protected static function flatten( $item ) {
+ if ( null === $item ) {
+ return '[Null]';
+ }
+
+ if ( is_bool( $item ) ) {
+ return $item ? 'true' : 'false';
+ }
+
+ if ( is_float( $item ) ) {
+ if ( is_infinite( $item ) ) {
+ return ( $item > 0 ? '' : '-' ) . 'INF';
+ }
+ if ( is_nan( $item ) ) {
+ return 'NaN';
+ }
+ return $data;
+ }
+
+ if ( is_scalar( $item ) ) {
+ return (string) $item;
+ }
+
+ if ( is_array( $item ) ) {
+ return '[Array(' . count( $item ) . ')]';
+ }
+
+ if ( $item instanceof \DateTime ) {
+ return $item->format( 'c' );
+ }
+
+ if ( $item instanceof \Exception ) {
+ return '[Exception ' . get_class( $item ) . '( ' .
+ $item->getFile() . ':' . $item->getLine() . ')
' .
+ $item->getMessage() . ']';
+ }
+
+ if ( is_object( $item ) ) {
+ if ( method_exists( $item, '__toString' ) ) {
+ return (string) $item;
+ }
+
+ return '[Object ' . get_class( $item ) . ']';
+ }
+
+ if ( is_resource( $item ) ) {
+ return '[Resource ' . get_resource_type( $item ) . ']';
+ }
+
+ return '[Unknown ' . gett
[MediaWiki-commits] [Gerrit] misc-web: add node krypton as a backend - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: misc-web: add node krypton as a backend .. misc-web: add node krypton as a backend Bug:T104946 Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 --- M modules/role/manifests/cache/misc.pp 1 file changed, 2 insertions(+), 1 deletion(-) 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 7e010e4..d5beec8 100644 --- a/modules/role/manifests/cache/misc.pp +++ b/modules/role/manifests/cache/misc.pp @@ -32,7 +32,7 @@ 'analytics1001.eqiad.wmnet', # Hadoop Yarn ResourceManager GUI 'analytics1027.eqiad.wmnet', # Hue (Hadoop GUI) 'antimony.wikimedia.org', -'bromine.eqiad.wmnet', # ganeti VM for misc. services +'bromine.eqiad.wmnet', # ganeti VM for misc. static HTML sites 'caesium.eqiad.wmnet', 'californium.wikimedia.org', 'dataset1001.wikimedia.org', @@ -40,6 +40,7 @@ 'gallium.wikimedia.org', # CI server 'graphite1001.eqiad.wmnet', 'iridium.eqiad.wmnet', # main phab +'krypton.eqiad.wmnet', # ganeti VM for misc. PHP apps 'logstash1001.eqiad.wmnet', 'logstash1002.eqiad.wmnet', 'logstash1003.eqiad.wmnet', -- To view, visit https://gerrit.wikimedia.org/r/224995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: BBlack 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] Add salt configuration for Sentry - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Add salt configuration for Sentry .. Add salt configuration for Sentry Split out from I1207235f0ee97c253b1a1e9e2bfa89eb79665290 as a self-hosted puppetmaster is not enough to make salt work and using a self-hosted salt master runs into all kinds of OS incompatibilities. Bug: T84956 Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 --- M hieradata/common/role/deployment.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: BryanDavis: Looks good to me, but someone else must approve John F. Lewis: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 69b4677..9e05ebe 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -94,3 +94,5 @@ wdqs/wdqs: gitfat_enabled: true upstream: https://gerrit.wikimedia.org/r/wikidata/query/deploy + sentry/sentry: +upstream: https://gerrit.wikimedia.org/r/operations/software/sentry -- To view, visit https://gerrit.wikimedia.org/r/224987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gergő Tisza Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Gilles Gerrit-Reviewer: John F. Lewis Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Provide static PNG logo for emlwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Provide static PNG logo for emlwiki .. Provide static PNG logo for emlwiki The PNG had been exported from SVG originally created during the Great Vectorization. The Emiliano-Romagnolo Wikipedia already uses this new logo, so this patch's only change is to provide a cache-friendly logo instead of serving one defined by $stdlogo. The file was optimized with optipng before being uploaded. See Phabricator task for more details. Bug: T100953 Change-Id: I6b23fd3115b7547f09e05eb2be10dea2b856830c --- M w/static/images/project-logos/emlwiki.png M wmf-config/InitialiseSettings.php 2 files changed, 1 insertion(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/w/static/images/project-logos/emlwiki.png b/w/static/images/project-logos/emlwiki.png index aa6c230..d45dafa 100644 --- a/w/static/images/project-logos/emlwiki.png +++ b/w/static/images/project-logos/emlwiki.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fb484cd..df16299 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -496,6 +496,7 @@ 'dzwiki' => '/static/images/project-logos/dzwiki.png', // T50397 'eewiki' => '/static/images/project-logos/eewiki.png', // T50397 'elwiki' => '/static/images/project-logos/elwiki.png', + 'emlwiki' => '/static/images/project-logos/emlwiki.png', // T100953 'enwiki' => '/static/images/project-logos/enwiki.png', 'eowiki' => '/static/images/project-logos/eowiki.png', 'eswiki' => '/static/images/project-logos/eswiki.png', -- To view, visit https://gerrit.wikimedia.org/r/214981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b23fd3115b7547f09e05eb2be10dea2b856830c Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Odder Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misc-web: add node krypton as a backend - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224995 Change subject: misc-web: add node krypton as a backend .. misc-web: add node krypton as a backend Bug:T104946 Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 --- M modules/role/manifests/cache/misc.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/95/224995/1 diff --git a/modules/role/manifests/cache/misc.pp b/modules/role/manifests/cache/misc.pp index 7e010e4..d5beec8 100644 --- a/modules/role/manifests/cache/misc.pp +++ b/modules/role/manifests/cache/misc.pp @@ -32,7 +32,7 @@ 'analytics1001.eqiad.wmnet', # Hadoop Yarn ResourceManager GUI 'analytics1027.eqiad.wmnet', # Hue (Hadoop GUI) 'antimony.wikimedia.org', -'bromine.eqiad.wmnet', # ganeti VM for misc. services +'bromine.eqiad.wmnet', # ganeti VM for misc. static HTML sites 'caesium.eqiad.wmnet', 'californium.wikimedia.org', 'dataset1001.wikimedia.org', @@ -40,6 +40,7 @@ 'gallium.wikimedia.org', # CI server 'graphite1001.eqiad.wmnet', 'iridium.eqiad.wmnet', # main phab +'krypton.eqiad.wmnet', # ganeti VM for misc. PHP apps 'logstash1001.eqiad.wmnet', 'logstash1002.eqiad.wmnet', 'logstash1003.eqiad.wmnet', -- To view, visit https://gerrit.wikimedia.org/r/224995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 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] wikimania scholarships: update Apache config for 2.4 - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: wikimania scholarships: update Apache config for 2.4 .. wikimania scholarships: update Apache config for 2.4 Apache 2.2 -> Apache 2.4 changed syntax. Need to adjust it for this app to work on a jessie host now. Bug:T105003 Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 --- M modules/wikimania_scholarships/templates/apache.conf.erb 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: John F. Lewis: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/wikimania_scholarships/templates/apache.conf.erb b/modules/wikimania_scholarships/templates/apache.conf.erb index fdd22e6..d41612e 100644 --- a/modules/wikimania_scholarships/templates/apache.conf.erb +++ b/modules/wikimania_scholarships/templates/apache.conf.erb @@ -23,8 +23,7 @@ /public> Options Indexes FollowSymLinks AllowOverride None -Order allow,deny -allow from all +Require all granted -- To view, visit https://gerrit.wikimedia.org/r/224994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: John F. Lewis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moar restriction icons! - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Moar restriction icons! .. Moar restriction icons! Icons for all important non-copyright restriction types. Also, some tweaks made in CSS e.g. add 1 px margin to top of mw-mmv-labels Finally, new test to check if default restriction is placed last. Example files: copydesign: https://commons.wikimedia.org/wiki/File:Peugeot_404_dsc01875.jpg trademark: https://commons.wikimedia.org/wiki/File:Logo_NIKE.svg trademark+insignia: https://commons.wikimedia.org/wiki/File:Flag_of_UNESCO.svg personality: https://commons.wikimedia.org/wiki/File:Vice_President_Megawati_Sukarnoputri_-_Indonesia.jpg communist+insignia: https://commons.wikimedia.org/wiki/File:Flag_of_Georgian_SSR.svg nazi: https://commons.wikimedia.org/wiki/File:PropagandaNaziJapaneseMonster.gif costume: https://commons.wikimedia.org/wiki/File:Shrek_%26_Fiona.jpg fan-art: https://commons.wikimedia.org/wiki/File:Magic_wand.gif (I think that's enough) Bug: T102693 Change-Id: I907396c59752511448145a4ac5d29096166f841f --- M MultimediaViewer.php M i18n/en.json M i18n/qqq.json A resources/mmv/ui/img/restrict-2257.svg A resources/mmv/ui/img/restrict-aus-reserve.svg A resources/mmv/ui/img/restrict-communist.svg A resources/mmv/ui/img/restrict-costume.svg A resources/mmv/ui/img/restrict-currency.svg A resources/mmv/ui/img/restrict-default.svg A resources/mmv/ui/img/restrict-design.svg A resources/mmv/ui/img/restrict-fan-art.svg A resources/mmv/ui/img/restrict-ihl.svg A resources/mmv/ui/img/restrict-insignia.svg A resources/mmv/ui/img/restrict-ita-mibac.svg A resources/mmv/ui/img/restrict-nazi.svg A resources/mmv/ui/img/restrict-personality.svg M resources/mmv/ui/mmv.ui.metadataPanel.js M resources/mmv/ui/mmv.ui.metadataPanel.less M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js 19 files changed, 1,039 insertions(+), 15 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 4cb5b1c..fb790e3 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -271,7 +271,23 @@ // for license messages see end of file 'multimediaviewer-permission-link', 'multimediaviewer-permission-link-hide', + + 'multimediaviewer-restriction-2257', + 'multimediaviewer-restriction-aus-reserve', + 'multimediaviewer-restriction-communist', + 'multimediaviewer-restriction-costume', + 'multimediaviewer-restriction-currency', + 'multimediaviewer-restriction-design', + 'multimediaviewer-restriction-fan-art', + 'multimediaviewer-restriction-ihl', + 'multimediaviewer-restriction-insignia', + 'multimediaviewer-restriction-ita-mibac', + 'multimediaviewer-restriction-nazi', + 'multimediaviewer-restriction-personality', 'multimediaviewer-restriction-trademarked', + 'multimediaviewer-restriction-default', + 'multimediaviewer-restriction-default-and-others', + 'multimediaviewer-geoloc-north', 'multimediaviewer-geoloc-east', 'multimediaviewer-geoloc-south', diff --git a/i18n/en.json b/i18n/en.json index e105b2a..adfe8f4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -43,7 +43,21 @@ "multimediaviewer-permission-link": "view terms", "multimediaviewer-permission-link-hide": "hide terms", "multimediaviewer-permission-viewmore": "View more", + "multimediaviewer-restriction-2257": "This image contains sexually explicit content which may be subject to the Child Protection and Obscenity Enforcement Act in the United States.", + "multimediaviewer-restriction-aus-reserve": "This image was photographed in an Australian Commonwealth reserve and cannot be used for commercial gain without a permit.", + "multimediaviewer-restriction-communist": "This image contains Communist insignia which may be banned in some countries.", + "multimediaviewer-restriction-costume": "This image depicts costuming and may be subject to legal restrictions.", + "multimediaviewer-restriction-currency": "This image represents a depiction of a unit of currency and may be subject to legal restrictions.", + "multimediaviewer-restriction-design": "The design of the subject of this image may be copyrighted and subject to legal restrictions.", + "multimediaviewer-restriction-fan-art": "This image is a work of fan art, and re-use may be subject to legal restrictions.", + "multimediaviewer-restriction-ihl": "This image contains symbols restricted by Inter
[MediaWiki-commits] [Gerrit] wikimania scholarships: update Apache config for 2.4 - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224994 Change subject: wikimania scholarships: update Apache config for 2.4 .. wikimania scholarships: update Apache config for 2.4 Apache 2.2 -> Apache 2.4 changed syntax. Need to adjust it for this app to work on a jessie host now. Bug:T105003 Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 --- M modules/wikimania_scholarships/templates/apache.conf.erb 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/224994/1 diff --git a/modules/wikimania_scholarships/templates/apache.conf.erb b/modules/wikimania_scholarships/templates/apache.conf.erb index fdd22e6..d41612e 100644 --- a/modules/wikimania_scholarships/templates/apache.conf.erb +++ b/modules/wikimania_scholarships/templates/apache.conf.erb @@ -23,8 +23,7 @@ /public> Options Indexes FollowSymLinks AllowOverride None -Order allow,deny -allow from all +Require all granted -- To view, visit https://gerrit.wikimedia.org/r/224994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 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] Allow adding any external or internal link to the translation - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow adding any external or internal link to the translation
..
Allow adding any external or internal link to the translation
Bug: T89953
Change-Id: Ife7de3415fab71edccb6cc20e3646439bdb2f9c8
---
M extension.json
M hooks.md
M i18n/en.json
M i18n/he.json
M i18n/qqq.json
M modules/tools/ext.cx.tools.js
M modules/tools/ext.cx.tools.link.js
A modules/tools/images/add_link_gray.png
A modules/tools/images/add_link_gray.svg
A modules/tools/images/external_link.png
A modules/tools/images/external_link.svg
M modules/tools/styles/ext.cx.tools.link.less
A modules/tools/styles/ext.cx.tools.linker.less
M modules/translation/ext.cx.translation.js
M modules/util/ext.cx.util.selection.js
M modules/widgets/pageselector/ext.cx.pageselector.js
M modules/widgets/pageselector/ext.cx.pageselector.less
17 files changed, 546 insertions(+), 66 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index c76108b..512b3f6 100644
--- a/extension.json
+++ b/extension.json
@@ -318,6 +318,9 @@
"styles": [
"widgets/pageselector/ext.cx.pageselector.less"
],
+ "messages": [
+ "mw-pageselector-missing"
+ ],
"dependencies": [
"mediawiki.api"
]
@@ -469,7 +472,8 @@
"tools/ext.cx.tools.link.js"
],
"styles": [
- "tools/styles/ext.cx.tools.link.less"
+ "tools/styles/ext.cx.tools.link.less",
+ "tools/styles/ext.cx.tools.linker.less"
],
"messages": [
"cx-tools-link-title",
@@ -479,9 +483,17 @@
"cx-tools-missing-link-title",
"cx-tools-missing-link-text",
"cx-tools-missing-link-tooltip",
- "cx-tools-missing-link-mark-link"
+ "cx-tools-missing-link-mark-link",
+ "cx-tools-link-internal-link",
+ "cx-tools-link-internal-link-placeholder",
+ "cx-tools-link-external-link",
+ "cx-tools-link-external-link-placeholder",
+ "cx-tools-link-to-another-page",
+ "cx-tools-link-apply"
],
"dependencies": [
+ "ext.cx.pageselector",
+ "ext.cx.tools.manager",
"ext.cx.tools.card",
"ext.cx.tools.manager",
"jquery.uls.data",
diff --git a/hooks.md b/hooks.md
index 00b6f26..1293bc2 100644
--- a/hooks.md
+++ b/hooks.md
@@ -39,11 +39,6 @@
Used to trigger the publish action.
-## mw.cx.search.link
-
-This is fired when a link title is searched in tools search box.
-The search string is passed as an argument. Example subscribers are link and
dictionary tools.
-
## mw.cx.search.word
This is fired when a word is searched in the tools search box.
diff --git a/i18n/en.json b/i18n/en.json
index 33cc8a6..d560abb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -209,5 +209,12 @@
"cx-notification-hundredth-translation": "You just made 100
translations! That is a remarkable achievement. Share the word to other
editors.",
"cx-notification-hundredth-translation-email-subject": "Congratulations
for your one hundredth translation",
"cx-translationlist-empty-title": "Nothing to translate?",
- "cx-translationlist-empty-desc": "{{GENDER:|Start}} your translation
now and continue it anytime."
+ "cx-translationlist-empty-desc": "{{GENDER:|Start}} your translation
now and continue it anytime.",
+ "cx-tools-link-internal-link": "Link to page",
+ "cx-tools-link-internal-link-placeholder": "Find page to link",
+ "cx-tools-link-external-link": "External",
+ "cx-tools-link-external-link-placeholder": "Add external link",
+ "cx-tools-link-to-another-page": "Link to another page",
+ "cx-tools-link-apply": "Done",
+ "mw-pageselector-missing": "Page does not exist"
}
diff --git a/i18n/he.json b/i18n/he.json
index d476d0a..4ee0d83 100644
--- a/i18n/he.json
+++ b/i18n/he.json
@@ -204,5 +204,12 @@
"cx-notification-hundredth-translation": "עשית 100 תרגומים! זה הישג
מרשים. זה הזמן לספר על כך לעורכים אחרים.",
"cx-notification-hundredth-translation-email-subject": "ברכות על התרגום
[MediaWiki-commits] [Gerrit] delete files/apache/conf.d/namevirtualhost - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224993 Change subject: delete files/apache/conf.d/namevirtualhost .. delete files/apache/conf.d/namevirtualhost After it was recently removed from the scholarships and the racktables modules (both of them did not need it anymore), this file is now unused and can be removed. Change-Id: I88f116289de8077b5610ed421118b5547c5e8145 --- D files/apache/conf.d/namevirtualhost 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/224993/1 diff --git a/files/apache/conf.d/namevirtualhost b/files/apache/conf.d/namevirtualhost deleted file mode 100644 index 81424c4..000 --- a/files/apache/conf.d/namevirtualhost +++ /dev/null @@ -1,2 +0,0 @@ -NameVirtualHost *:80 -NameVirtualHost *:443 -- To view, visit https://gerrit.wikimedia.org/r/224993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88f116289de8077b5610ed421118b5547c5e8145 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] PHPUnit test for DonationInterface::createAdapter - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224991
Change subject: PHPUnit test for DonationInterface::createAdapter
..
PHPUnit test for DonationInterface::createAdapter
Helps not break recurring GlobalCollect. Currently failing because
of wacky session detection bug I tried to sledgehammer with
I3875c7386572041b1b111d62e341c46894f0ad1f
Bug: T105848
Change-Id: Ib2e2d7ff113fec3ceb5b99f4db8140920e437ed8
---
A sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
1 file changed, 34 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/91/224991/1
diff --git
a/sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
new file mode 100644
index 000..e5437fa
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
@@ -0,0 +1,34 @@
+ 9.99,
+ 'effort_id' => 1,
+ 'order_id' => mt_rand(),
+ 'currency_code' => 'USD',
+ 'payment_product' => '',
+ 'language' => 'en',
+ 'contribution_tracking_id' => mt_rand(),
+ 'referrer' => 'dummy',
+ );
+ $adapter = DonationInterface::createAdapter( 'GlobalCollect',
$values );
+ // see FIXME in recurring globalcollect
+ $adapter->addRequestData( array(
+ 'effort_id' => 1,
+ ) );
+ $data = $adapter->getData_Unstaged_Escaped();
+ foreach ( $values as $key => $value ) {
+ $this->assertEquals( $value, $data[$key], "$key is
being mangled in adapter construction" );
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/224991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2e2d7ff113fec3ceb5b99f4db8140920e437ed8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] racktables: delete namevirtualhost file - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224992
Change subject: racktables: delete namevirtualhost file
..
racktables: delete namevirtualhost file
There is no need for this file anymore. It was only here to have
virtual host on 443 and racktables is behind misc-web.
Also, this seems the last module/role using this at all, so we can
delete from files/apache/conf.d/. The general ./files/ directory
should all move into modules where possible.
Change-Id: I347ab9d2197b87fffd7dff8931b763fedcd669c7
---
M modules/racktables/manifests/init.pp
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/224992/1
diff --git a/modules/racktables/manifests/init.pp
b/modules/racktables/manifests/init.pp
index 02a06ae..46f9a95 100644
--- a/modules/racktables/manifests/init.pp
+++ b/modules/racktables/manifests/init.pp
@@ -32,10 +32,6 @@
content => template('racktables/racktables.wikimedia.org.erb'),
}
-apache::conf { 'namevirtualhost':
-source => 'puppet:///files/apache/conf.d/namevirtualhost',
-}
-
# Increase the default memory limit T102092
file_line { 'racktables_php_memory':
path=> '/etc/php5/apache2/php.ini',
--
To view, visit https://gerrit.wikimedia.org/r/224992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I347ab9d2197b87fffd7dff8931b763fedcd669c7
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] Reduce the z-index of callout to a reasonable level - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224990
Change subject: Reduce the z-index of callout to a reasonable level
..
Reduce the z-index of callout to a reasonable level
It had a huge z-index causing IME selector hidden under it.
Bug: T105954
Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
---
M modules/widgets/callout/ext.cx.callout.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/90/224990/1
diff --git a/modules/widgets/callout/ext.cx.callout.css
b/modules/widgets/callout/ext.cx.callout.css
index 9fbf067..0531b32 100644
--- a/modules/widgets/callout/ext.cx.callout.css
+++ b/modules/widgets/callout/ext.cx.callout.css
@@ -7,7 +7,7 @@
border: 1px solid #ccc;
border-radius: 3px;
max-width: 500px;
- z-index: 10;
+ z-index: 999;
}
.cx-callout::after, .cx-callout::before {
--
To view, visit https://gerrit.wikimedia.org/r/224990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove en2.wikipedia.org from redirects - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: remove en2.wikipedia.org from redirects
..
remove en2.wikipedia.org from redirects
It was already removed from DNS in I85104f7156b3edf so this is
just cleanup as requested in T105981
Bug:T105981
Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 5 deletions(-)
Approvals:
John F. Lewis: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index bb95b4e..5802f1f 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -293,7 +293,6 @@
ServerAlias www.wikipedia.com
ServerAlias www.wikipedia.net
ServerAlias en.wikipedia.com
- ServerAlias en2.wikipedia.org
ServerAlias wikipaedia.net
ServerAlias wiki-pedia.org
ServerAlias wiktionary.com
@@ -703,9 +702,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0
[R=301,L,NE]
# rewrite en.wikipedia.com//en.wikipedia.org
RewriteCond %{HTTP_HOST} =en.wikipedia.com
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite en2.wikipedia.org //en.wikipedia.org
- RewriteCond %{HTTP_HOST} =en2.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
# rewrite wikipaedia.net //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikipaedia.net
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 236f1c5..f2258f6 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -211,7 +211,6 @@
rewritewww.wikipedia.net //www.wikipedia.org
rewriteen.wikipedia.com//en.wikipedia.org
-rewriteen2.wikipedia.org //en.wikipedia.org
rewrite*wikipedia.co.uk//en.wikipedia.org
--
To view, visit https://gerrit.wikimedia.org/r/224989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: John F. Lewis
Gerrit-Reviewer: MZMcBride
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 en2.wikipedia.org from redirects - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224989
Change subject: remove en2.wikipedia.org from redirects
..
remove en2.wikipedia.org from redirects
It was already removed from DNS in I85104f7156b3edf so this is
just cleanup as requested in T105981
Bug:T105981
Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/224989/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index bb95b4e..5802f1f 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -293,7 +293,6 @@
ServerAlias www.wikipedia.com
ServerAlias www.wikipedia.net
ServerAlias en.wikipedia.com
- ServerAlias en2.wikipedia.org
ServerAlias wikipaedia.net
ServerAlias wiki-pedia.org
ServerAlias wiktionary.com
@@ -703,9 +702,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0
[R=301,L,NE]
# rewrite en.wikipedia.com//en.wikipedia.org
RewriteCond %{HTTP_HOST} =en.wikipedia.com
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite en2.wikipedia.org //en.wikipedia.org
- RewriteCond %{HTTP_HOST} =en2.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
# rewrite wikipaedia.net //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikipaedia.net
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 236f1c5..f2258f6 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -211,7 +211,6 @@
rewritewww.wikipedia.net //www.wikipedia.org
rewriteen.wikipedia.com//en.wikipedia.org
-rewriteen2.wikipedia.org //en.wikipedia.org
rewrite*wikipedia.co.uk//en.wikipedia.org
--
To view, visit https://gerrit.wikimedia.org/r/224989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
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] wikimania scholarships: remove namevirtualhost file - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: wikimania scholarships: remove namevirtualhost file
..
wikimania scholarships: remove namevirtualhost file
There is no need for this to listen on 443 anymore, it is behind misc-web
and it only causes errors when applied on a host with Apache 2.4 anyways
since there is no more "conf.d" directory.
Bug:T105920
Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
---
M modules/wikimania_scholarships/manifests/init.pp
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index 0845a8b..82581a8 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -73,10 +73,7 @@
include ::apache::mod::rewrite
include ::apache::mod::headers
-file { '/etc/apache2/conf.d/namevirtualhost':
-source => 'puppet:///files/apache/conf.d/namevirtualhost',
-mode => '0444',
-notify => Service['apache2'],
-}
}
+
+
# vim:sw=4 ts=4 sts=4 et:
--
To view, visit https://gerrit.wikimedia.org/r/224988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
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] wikimania scholarships: remove namevirtualhost file - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224988
Change subject: wikimania scholarships: remove namevirtualhost file
..
wikimania scholarships: remove namevirtualhost file
There is no need for this to listen on 443 anymore, it is behind misc-web
and it only causes errors when applied on a host with Apache 2.4 anyways
since there is no more "conf.d" directory.
Bug:T105920
Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
---
M modules/wikimania_scholarships/manifests/init.pp
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/224988/1
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index 0845a8b..82581a8 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -73,10 +73,7 @@
include ::apache::mod::rewrite
include ::apache::mod::headers
-file { '/etc/apache2/conf.d/namevirtualhost':
-source => 'puppet:///files/apache/conf.d/namevirtualhost',
-mode => '0444',
-notify => Service['apache2'],
-}
}
+
+
# vim:sw=4 ts=4 sts=4 et:
--
To view, visit https://gerrit.wikimedia.org/r/224988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
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] Add salt configuration for Sentry - change (operations/puppet)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/224987 Change subject: Add salt configuration for Sentry .. Add salt configuration for Sentry Bug: T84956 Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 --- M hieradata/common/role/deployment.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/224987/1 diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 69b4677..9e05ebe 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -94,3 +94,5 @@ wdqs/wdqs: gitfat_enabled: true upstream: https://gerrit.wikimedia.org/r/wikidata/query/deploy + sentry/sentry: +upstream: https://gerrit.wikimedia.org/r/operations/software/sentry -- To view, visit https://gerrit.wikimedia.org/r/224987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 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] wikimania scholarships: remove role from zirconium - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: wikimania scholarships: remove role from zirconium
..
wikimania scholarships: remove role from zirconium
We need to make changes to the Apache config for it to work
on 2.4 and jessie. So removing it from zirconium already or it
would cause breakage there.
Bug:T105003
Change-Id: Ic95bec8cea71b5834da8f39f7a8a8ebc4083d438
---
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 cc0494d..72c1030 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2401,7 +2401,6 @@
node 'zirconium.wikimedia.org' {
include base::firewall
include standard
-include role::wikimania_scholarships
include role::grafana
include role::iegreview
--
To view, visit https://gerrit.wikimedia.org/r/224985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic95bec8cea71b5834da8f39f7a8a8ebc4083d438
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] Update recurring GC for DonationInterface changes - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224986
Change subject: Update recurring GC for DonationInterface changes
..
Update recurring GC for DonationInterface changes
Needed a new global and needed to deal with a new return type.
Also cleans up some unused return values.
Bug: T105848
Change-Id: I71ffd5a5bb34cd4fe16cadfad3d19855f8eb6159
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
M sites/all/modules/wmf_civicrm/DonationInterface.php
2 files changed, 10 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/86/224986/1
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 8e16239..76c7e1d 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -237,13 +237,8 @@
foreach ($contribution_batch as $contribution_recur)
{
try {
- $status = recurring_globalcollect_charge($contribution_recur->id,
$options);
-
- if ($status) {
- $succeeded[] = $contribution_recur;
- } else {
- $failed[] = $contribution_recur;
- }
+ recurring_globalcollect_charge($contribution_recur->id, $options);
+ $succeeded[] = $contribution_recur;
}
catch ( WmfException $e )
{
@@ -275,8 +270,6 @@
* @param int $contribution_recur_id
* @param array $options Accepts the following optional keys:
* contribution_tags - array of tags to associate with the contribution
- *
- * @return array adapter result details
*
* @throws WmfException if the payment fails or any other error occurs.
*/
@@ -314,26 +307,20 @@
'effort_id' => $subscription->processor_id + 1,
) );
- $result = $adapter->do_transaction('Recurring_Charge');
+ $result = $adapter->do_transaction( 'Recurring_Charge' );
// If success, add a record to the contribution table and send a thank you
email.
- if ($result['status'] && empty($result['errors'])) {
+ if ( $result->getCommunicationStatus() && empty( $result->getErrors() ) ) {
// Mark this donation as successful, and reschedule it for next month
// This is done before anything else, otherwise any errors that occur
while storing the contribution
// record in civi might cause this subscription to end up in a weird state
and not recur correctly.
// If storing the donation in civi fails, that's not a big deal, we'll get
the data eventually
// by reconciling the data we get from the payment processor.
-_recurring_globalcollect_update_record_success($contribution_recur_id);
+_recurring_globalcollect_update_record_success( $contribution_recur_id );
$msg = recurring_globalcollect_create_message( $contribution_recur_id );
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-
-// FIXME: what is this nonsense?
-$contribution['contribution_id'] = $contribution['id'];
-unset( $contribution['id'] );
-
-return $result;
+wmf_civicrm_contribution_message_import( $msg );
}
else
{
diff --git a/sites/all/modules/wmf_civicrm/DonationInterface.php
b/sites/all/modules/wmf_civicrm/DonationInterface.php
index 9fa57d2..a75ce8e 100644
--- a/sites/all/modules/wmf_civicrm/DonationInterface.php
+++ b/sites/all/modules/wmf_civicrm/DonationInterface.php
@@ -23,7 +23,8 @@
$wgDonationInterfacePriceCeiling,
$wgGlobalCollectGatewayAccountInfo,
$wgGlobalCollectGatewayURL,
-$wgGlobalCollectGatewayMerchantID;
+$wgGlobalCollectGatewayMerchantID,
+$wgDonationInterfaceGatewayAdapters;
// Adapt Drupal configuration into MediaWiki globals.
$wgGlobalCollectGatewayMerchantID =
variable_get('recurring_globalcollect_merchant_id', 0);
@@ -40,6 +41,8 @@
$wgDonationInterfacePriceCeiling = 1.00;
$className = "{$type}Adapter";
+$wgDonationInterfaceGatewayAdapters = array( $className );
+
$adapter = new $className( $adapterOptions );
return $adapter;
}
--
To view, visit https://gerrit.wikimedia.org/r/224986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71ffd5a5bb34cd4fe16cadfad3d19855f8eb6159
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimania scholarships: remove role from zirconium - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224985
Change subject: wikimania scholarships: remove role from zirconium
..
wikimania scholarships: remove role from zirconium
We need to make changes to the Apache config for it to work
on 2.4 and jessie. So removing it from zirconium already or it
would cause breakage there.
Bug:T105003
Change-Id: Ic95bec8cea71b5834da8f39f7a8a8ebc4083d438
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/224985/1
diff --git a/manifests/site.pp b/manifests/site.pp
index cc0494d..72c1030 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2401,7 +2401,6 @@
node 'zirconium.wikimedia.org' {
include base::firewall
include standard
-include role::wikimania_scholarships
include role::grafana
include role::iegreview
--
To view, visit https://gerrit.wikimedia.org/r/224985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic95bec8cea71b5834da8f39f7a8a8ebc4083d438
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] Added Mailgun extension for Mediawiki - change (mediawiki...Mailgun)
01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224984
Change subject: Added Mailgun extension for Mediawiki
..
Added Mailgun extension for Mediawiki
Todo: Still requires exception handling
Bug: T105781
Change-Id: I12951a9397d80b2a4929afaba1e170616e44473b
---
A MailgunHooks.php
A composer.json
A extension.json
3 files changed, 107 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Mailgun
refs/changes/84/224984/1
diff --git a/MailgunHooks.php b/MailgunHooks.php
new file mode 100644
index 000..128b6a7
--- /dev/null
+++ b/MailgunHooks.php
@@ -0,0 +1,76 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Tony Thomas <01tonytho...@gmail.com>
+ * @license GPL-2.0
+ * @ingroup Extensions
+*/
+class MailgunHooks {
+ /**
+* Function to be run on startup in $wgExtensionFunctions
+*/
+ public static function onRegistration() {
+ if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ require_once __DIR__ . '/vendor/autoload.php';
+ }
+
+ }
+
+ /**
+* Send a mail using Mailgun API
+*
+* @param array $headers
+* @param array $to
+* @param MailAddress $from
+* @param $subject
+* @param $body
+* @return bool
+*/
+ public static function onAlternateUserMailer( array $headers, array
$to, MailAddress $from, $subject, $body ) {
+ global $wgMailgunAPIKey, $wgMailgunDomain;
+
+ try {
+ $mailgunTransport = new \Mailgun\Mailgun(
$wgMailgunAPIKey );
+ } catch( Exception $e ) {
+ return $e->getMessage();
+ }
+
+ foreach( $to as $recip ) {
+ $message = $mailgunTransport->MessageBuilder();
+
+ $message->setFromAddress( $from );
+ $message->addToRecipient( $recip );
+ $message->setSubject( $subject );
+ $message->setTextBody( $body );
+
+ foreach( $headers as $headerName => $headerValue ) {
+ $message->addCustomHeader( $headerName,
$headerValue );
+ }
+
+ try {
+ $mailgunTransport->sendMessage(
$wgMailgunDomain, $message->getMessage() );
+ } catch( Exception $e ){
+ return $e->getMessage();
+ }
+ }
+
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..6acf437
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,8 @@
+{
+"name": "mediawiki/mailgun",
+"require": {
+"mailgun/mailgun-php": "1.7.2"
+},
+"prepend-autoloader": false,
+"optimize-autoloader": true
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..89121d1
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,23 @@
+{
+"name": "Mailgun",
+"version": "1.0",
+"author": [
+"Tony Thomas"
+],
+"url": "https://www.mediawiki.org/wiki/Extension:Mailgun";,
+"AutoloadClasses": {
+"MailgunHooks": "MailgunHooks.php"
+},
+"Hooks": {
+"AlternateUserMailer": [
+"MailgunHooks::onAlternateUserMailer"
+]
+},
+"callback": "MailgunHooks::onRegistration",
+"config": {
+"MailgunAPIKey": "key-8fad6f8f77944d7d7abb9b7c66185476",
+"MailgunDomain": "amritafoss.in"
+},
+"manifest_version": 1
+
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/224984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12951a9397d80b2a4929afaba1e170616e44473b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Mailgun
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Contribution hover menu icon and layout adjustments - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224983
Change subject: Contribution hover menu icon and layout adjustments
..
Contribution hover menu icon and layout adjustments
* Icons are verically centered
* Reduced the min-width of menu from 250px to 200px
Bug: T105961
Change-Id: I0e72e4cc206d68e968f3e926990fe4fe7e21f01a
---
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/83/224983/1
diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index e2cd9e2..f988ab7 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -13,9 +13,9 @@
padding: 5px 10px 5px 40px;
margin: 0;
border-bottom: 1px solid #ccc;
- min-width: 250px;
+ min-width: 200px;
background-size: 24px;
- background-position: left 5px top 5px;
+ background-position: left 10px center;
background-repeat: no-repeat;
a {
--
To view, visit https://gerrit.wikimedia.org/r/224983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e72e4cc206d68e968f3e926990fe4fe7e21f01a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style improvements for page selector - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224982
Change subject: Style improvements for page selector
..
Style improvements for page selector
* All items should have the same height.
* All images should occupy the same (square) area.
* Articles without an image should show a generic article placeholder.
Bug: T105966
Change-Id: I4ba24b76dcc354034c7e2b474a05b1dff24876c8
---
M modules/widgets/pageselector/ext.cx.pageselector.js
M modules/widgets/pageselector/ext.cx.pageselector.less
A modules/widgets/pageselector/page-placeholder.png
A modules/widgets/pageselector/page-placeholder.svg
4 files changed, 5 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/82/224982/1
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.js
b/modules/widgets/pageselector/ext.cx.pageselector.js
index 898d83c..31dafbe 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.js
+++ b/modules/widgets/pageselector/ext.cx.pageselector.js
@@ -93,8 +93,7 @@
);
if ( page.thumbnail ) {
$resultItem.css( {
- 'background-image': 'url(' +
page.thumbnail.source + ')',
- 'background-size':
page.thumbnail.width + 'px ' + page.thumbnail.height + 'px'
+ 'background-image': 'url(' +
page.thumbnail.source + ')'
} );
}
self.$menu.append( $resultItem );
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.less
b/modules/widgets/pageselector/ext.cx.pageselector.less
index 7333275..df577c4 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.less
+++ b/modules/widgets/pageselector/ext.cx.pageselector.less
@@ -1,3 +1,4 @@
+@import "mediawiki.mixins";
.mw-pageselector-menu {
position: absolute;
border: 1px solid #ccc;
@@ -16,6 +17,8 @@
background-position: left center;
background-size: 50px 50px;
padding: 5px 5px 5px 60px;
+ min-height: 40px;
+ .background-image-svg('page-placeholder.svg',
'page-placeholder.png');
}
li.mw-pageselector-selected {
diff --git a/modules/widgets/pageselector/page-placeholder.png
b/modules/widgets/pageselector/page-placeholder.png
new file mode 100644
index 000..6a79e7b
--- /dev/null
+++ b/modules/widgets/pageselector/page-placeholder.png
Binary files differ
diff --git a/modules/widgets/pageselector/page-placeholder.svg
b/modules/widgets/pageselector/page-placeholder.svg
new file mode 100644
index 000..6e27a49
--- /dev/null
+++ b/modules/widgets/pageselector/page-placeholder.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
--
To view, visit https://gerrit.wikimedia.org/r/224982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ba24b76dcc354034c7e2b474a05b1dff24876c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing aria labels - change (labs...crosswatch)
Sitic has submitted this change and it was merged.
Change subject: Add missing aria labels
..
Add missing aria labels
Change-Id: I33617277d5d0e4908d6bb97ec0e26a9db45577a6
---
M frontend/src/components/notifications/notifications.html
M frontend/src/components/settings/settings.html
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Sitic: Verified; Looks good to me, approved
diff --git a/frontend/src/components/notifications/notifications.html
b/frontend/src/components/notifications/notifications.html
index 2046882..9153d1f 100644
--- a/frontend/src/components/notifications/notifications.html
+++ b/frontend/src/components/notifications/notifications.html
@@ -7,7 +7,7 @@
-
diff --git a/frontend/src/components/settings/settings.html
b/frontend/src/components/settings/settings.html
index 4666f66..4f76cd6 100644
--- a/frontend/src/components/settings/settings.html
+++ b/frontend/src/components/settings/settings.html
@@ -9,13 +9,15 @@
{{'WIKIS' |
translate}}
{{item}}
{{'NAMESPACES' |
translate}}
-
+
{{item.label}}
--
To view, visit https://gerrit.wikimedia.org/r/224981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33617277d5d0e4908d6bb97ec0e26a9db45577a6
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
Gerrit-Reviewer: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing aria labels - change (labs...crosswatch)
Sitic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224981
Change subject: Add missing aria labels
..
Add missing aria labels
Change-Id: I33617277d5d0e4908d6bb97ec0e26a9db45577a6
---
M frontend/src/components/notifications/notifications.html
M frontend/src/components/settings/settings.html
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch
refs/changes/81/224981/1
diff --git a/frontend/src/components/notifications/notifications.html
b/frontend/src/components/notifications/notifications.html
index 2046882..9153d1f 100644
--- a/frontend/src/components/notifications/notifications.html
+++ b/frontend/src/components/notifications/notifications.html
@@ -7,7 +7,7 @@
-
diff --git a/frontend/src/components/settings/settings.html
b/frontend/src/components/settings/settings.html
index 4666f66..4f76cd6 100644
--- a/frontend/src/components/settings/settings.html
+++ b/frontend/src/components/settings/settings.html
@@ -9,13 +9,15 @@
{{'WIKIS' |
translate}}
{{item}}
{{'NAMESPACES' |
translate}}
-
+
{{item.label}}
--
To view, visit https://gerrit.wikimedia.org/r/224981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33617277d5d0e4908d6bb97ec0e26a9db45577a6
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add option to hide own edits - change (labs...crosswatch)
Sitic has submitted this change and it was merged.
Change subject: Add option to hide own edits
..
Add option to hide own edits
Also cleaned up dead code.
Bug: T105937
Change-Id: I4e3a3e70937426f53ef8648c042afdd675e1f837
---
M frontend/src/app/filters.js
M frontend/src/app/runBlock.js
M frontend/src/app/services.js
M frontend/src/components/settings/settings.html
M frontend/src/i18n/locale-en.json
5 files changed, 32 insertions(+), 9 deletions(-)
Approvals:
Sitic: Verified; Looks good to me, approved
diff --git a/frontend/src/app/filters.js b/frontend/src/app/filters.js
index 83a8dc6..48a9021 100644
--- a/frontend/src/app/filters.js
+++ b/frontend/src/app/filters.js
@@ -5,7 +5,6 @@
.filter('list', listFilter)
.filter('watchlist', watchlistFilter)
.filter('projects', projectsFilter)
- .filter('editflags', editflagsFilter)
;
/**
@@ -51,6 +50,10 @@
if (bool) {
bool = namespaceFilterFunc(item, this.namespacesSelected,
this.namespacesList)
}
+
+if (bool && this.hideOwnEdits) {
+ bool = usernameFilterFunc(item, this.username)
+}
return bool;
}
}
@@ -88,14 +91,15 @@
return false;
}
+/**
+ * Filter out own edits
+ */
+function usernameFilterFunc (item, username) {
+ return item.user !== username;
+}
+
function projectsFilter () {
return function (items, projects) {
return items.filter(projectsFilterFunc, projects)
- };
-}
-
-function editflagsFilter () {
- return function (items, flags) {
-return items.filter(editsflagsFilterFunc, flags)
};
}
diff --git a/frontend/src/app/runBlock.js b/frontend/src/app/runBlock.js
index 835a949..144abb7 100644
--- a/frontend/src/app/runBlock.js
+++ b/frontend/src/app/runBlock.js
@@ -15,6 +15,7 @@
$location.path('/welcome');
}
else {
+ dataService.config.username = authService.user();
$location.path('/');
}
});
diff --git a/frontend/src/app/services.js b/frontend/src/app/services.js
index 08e94b7..0c59295 100644
--- a/frontend/src/app/services.js
+++ b/frontend/src/app/services.js
@@ -68,6 +68,9 @@
* Timeperiod for which the watchlist is retrieved in days
*/
watchlistperiod: 1.5,
+/**
+ * Show flags instead of language names
+ */
flagsenable: false,
/**
* Options to show minor, bot, anon and registered user edits
@@ -84,8 +87,17 @@
/**
* List of namespaces shown in options list
*/
-namespacesList: ["0", "1", "2", "3", "4", "5", "6", "7", "10", "11", "12",
"13", "OTHER"]
+namespacesList: ["0", "1", "2", "3", "4", "5", "6", "7", "10", "11", "12",
"13", "OTHER"],
+/**
+ * Username
+ */
+username: "",
+/**
+ * Filter out own edits
+ */
+hideOwnEdits: false
};
+ // Get config from localstorage or create from defaultconfig
if (localStorageService.get('config') !== null) {
vm.config = localStorageService.get('config');
vm.config.__proto__ = vm.defaultconfig;
@@ -182,6 +194,7 @@
vm.watchlist.original = [];
vm.watchlist.filtered = [];
vm.watchlist.active.length = 0; /* preserve pointer, slow due to GC */
+vm.notifications.length = 0;
vm.queryWatchlist();
vm.saveConfig();
};
diff --git a/frontend/src/components/settings/settings.html
b/frontend/src/components/settings/settings.html
index d06f254..4666f66 100644
--- a/frontend/src/components/settings/settings.html
+++ b/frontend/src/components/settings/settings.html
@@ -71,6 +71,10 @@
+
+
+
+
diff --git a/frontend/src/i18n/locale-en.json b/frontend/src/i18n/locale-en.json
index 1130148..2362c25 100644
--- a/frontend/src/i18n/locale-en.json
+++ b/frontend/src/i18n/locale-en.json
@@ -69,5 +69,6 @@
"ONELINE": "Traditional watchlist layout",
"NOTIFICATIONS": "Notifications",
"MARKALLREAD": "mark all as read",
- "STYLE": "Style"
+ "STYLE": "Style",
+ "HIDEOWNEDITS": "Hide my edits from the watchlist"
}
--
To view, visit https://gerrit.wikimedia.org/r/224980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e3a3e70937426f53ef8648c042afdd675e1f837
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] postgres: allow defaults for unix_socket_directory - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: postgres: allow defaults for unix_socket_directory .. postgres: allow defaults for unix_socket_directory unix_socket_directory allows to specify the postgres unix_socket directory. However we are anyway defining the default value and that variable has been changed to unix_socket_directories in 9.3. Default it and avoiding setting it anyway Change-Id: I8d72aff12a230a91f7fdb0892220252e2a73b39f --- M modules/postgresql/templates/postgresql.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/postgresql/templates/postgresql.conf.erb b/modules/postgresql/templates/postgresql.conf.erb index 55fa1c9..9692ec7 100644 --- a/modules/postgresql/templates/postgresql.conf.erb +++ b/modules/postgresql/templates/postgresql.conf.erb @@ -65,7 +65,7 @@ # Note: Increasing max_connections costs ~400 bytes of shared memory per # connection slot, plus lock space (see max_locks_per_transaction). #superuser_reserved_connections = 3# (change requires restart) -unix_socket_directory = '/var/run/postgresql' # (change requires restart) +#unix_socket_directory = '/var/run/postgresql' # (change requires restart) #unix_socket_group = ''# (change requires restart) #unix_socket_permissions = 0777# begin with 0 to use octal notation # (change requires restart) -- To view, visit https://gerrit.wikimedia.org/r/224979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d72aff12a230a91f7fdb0892220252e2a73b39f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris 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 option to hide own edits - change (labs...crosswatch)
Sitic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224980
Change subject: Add option to hide own edits
..
Add option to hide own edits
Also cleaned up dead code.
Bug: T105937
Change-Id: I4e3a3e70937426f53ef8648c042afdd675e1f837
---
M frontend/src/app/filters.js
M frontend/src/app/runBlock.js
M frontend/src/app/services.js
M frontend/src/components/settings/settings.html
M frontend/src/i18n/locale-en.json
5 files changed, 32 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch
refs/changes/80/224980/1
diff --git a/frontend/src/app/filters.js b/frontend/src/app/filters.js
index 83a8dc6..48a9021 100644
--- a/frontend/src/app/filters.js
+++ b/frontend/src/app/filters.js
@@ -5,7 +5,6 @@
.filter('list', listFilter)
.filter('watchlist', watchlistFilter)
.filter('projects', projectsFilter)
- .filter('editflags', editflagsFilter)
;
/**
@@ -51,6 +50,10 @@
if (bool) {
bool = namespaceFilterFunc(item, this.namespacesSelected,
this.namespacesList)
}
+
+if (bool && this.hideOwnEdits) {
+ bool = usernameFilterFunc(item, this.username)
+}
return bool;
}
}
@@ -88,14 +91,15 @@
return false;
}
+/**
+ * Filter out own edits
+ */
+function usernameFilterFunc (item, username) {
+ return item.user !== username;
+}
+
function projectsFilter () {
return function (items, projects) {
return items.filter(projectsFilterFunc, projects)
- };
-}
-
-function editflagsFilter () {
- return function (items, flags) {
-return items.filter(editsflagsFilterFunc, flags)
};
}
diff --git a/frontend/src/app/runBlock.js b/frontend/src/app/runBlock.js
index 835a949..144abb7 100644
--- a/frontend/src/app/runBlock.js
+++ b/frontend/src/app/runBlock.js
@@ -15,6 +15,7 @@
$location.path('/welcome');
}
else {
+ dataService.config.username = authService.user();
$location.path('/');
}
});
diff --git a/frontend/src/app/services.js b/frontend/src/app/services.js
index 08e94b7..0c59295 100644
--- a/frontend/src/app/services.js
+++ b/frontend/src/app/services.js
@@ -68,6 +68,9 @@
* Timeperiod for which the watchlist is retrieved in days
*/
watchlistperiod: 1.5,
+/**
+ * Show flags instead of language names
+ */
flagsenable: false,
/**
* Options to show minor, bot, anon and registered user edits
@@ -84,8 +87,17 @@
/**
* List of namespaces shown in options list
*/
-namespacesList: ["0", "1", "2", "3", "4", "5", "6", "7", "10", "11", "12",
"13", "OTHER"]
+namespacesList: ["0", "1", "2", "3", "4", "5", "6", "7", "10", "11", "12",
"13", "OTHER"],
+/**
+ * Username
+ */
+username: "",
+/**
+ * Filter out own edits
+ */
+hideOwnEdits: false
};
+ // Get config from localstorage or create from defaultconfig
if (localStorageService.get('config') !== null) {
vm.config = localStorageService.get('config');
vm.config.__proto__ = vm.defaultconfig;
@@ -182,6 +194,7 @@
vm.watchlist.original = [];
vm.watchlist.filtered = [];
vm.watchlist.active.length = 0; /* preserve pointer, slow due to GC */
+vm.notifications.length = 0;
vm.queryWatchlist();
vm.saveConfig();
};
diff --git a/frontend/src/components/settings/settings.html
b/frontend/src/components/settings/settings.html
index d06f254..4666f66 100644
--- a/frontend/src/components/settings/settings.html
+++ b/frontend/src/components/settings/settings.html
@@ -71,6 +71,10 @@
+
+
+
+
diff --git a/frontend/src/i18n/locale-en.json b/frontend/src/i18n/locale-en.json
index 1130148..2362c25 100644
--- a/frontend/src/i18n/locale-en.json
+++ b/frontend/src/i18n/locale-en.json
@@ -69,5 +69,6 @@
"ONELINE": "Traditional watchlist layout",
"NOTIFICATIONS": "Notifications",
"MARKALLREAD": "mark all as read",
- "STYLE": "Style"
+ "STYLE": "Style",
+ "HIDEOWNEDITS": "Hide my edits from the watchlist"
}
--
To view, visit https://gerrit.wikimedia.org/r/224980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e3a3e70937426f53ef8648c042afdd675e1f837
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] postgres: allow defaults for unix_socket_directory - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/224979 Change subject: postgres: allow defaults for unix_socket_directory .. postgres: allow defaults for unix_socket_directory unix_socket_directory allows to specify the postgres unix_socket directory. However we are anyway defining the default value and that variable has been changed to unix_socket_directories in 9.3. Default it and avoiding setting it anyway Change-Id: I8d72aff12a230a91f7fdb0892220252e2a73b39f --- M modules/postgresql/templates/postgresql.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/224979/1 diff --git a/modules/postgresql/templates/postgresql.conf.erb b/modules/postgresql/templates/postgresql.conf.erb index 55fa1c9..9692ec7 100644 --- a/modules/postgresql/templates/postgresql.conf.erb +++ b/modules/postgresql/templates/postgresql.conf.erb @@ -65,7 +65,7 @@ # Note: Increasing max_connections costs ~400 bytes of shared memory per # connection slot, plus lock space (see max_locks_per_transaction). #superuser_reserved_connections = 3# (change requires restart) -unix_socket_directory = '/var/run/postgresql' # (change requires restart) +#unix_socket_directory = '/var/run/postgresql' # (change requires restart) #unix_socket_group = ''# (change requires restart) #unix_socket_permissions = 0777# begin with 0 to use octal notation # (change requires restart) -- To view, visit https://gerrit.wikimedia.org/r/224979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d72aff12a230a91f7fdb0892220252e2a73b39f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use deferred updates in place of $wgActivityUpdatesUseJobQue... - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224978
Change subject: Use deferred updates in place of $wgActivityUpdatesUseJobQueue
for simplicity
..
Use deferred updates in place of $wgActivityUpdatesUseJobQueue for simplicity
Change-Id: Icb8b6aaeb496a4ff3cd3a7e20cdbea0c7dabd677
---
M includes/DefaultSettings.php
M includes/WatchedItem.php
2 files changed, 13 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/224978/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6050ba7..70ae468 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1624,15 +1624,6 @@
$wgEnotifUseJobQ = false;
/**
- * Use the job queue for user activity updates like updating "last visited"
- * fields for email notifications of page changes. This should only be enabled
- * if the jobs have a dedicated runner to avoid update lag.
- *
- * @since 1.26
- */
-$wgActivityUpdatesUseJobQueue = false;
-
-/**
* Use real name instead of username in e-mail "from" field.
*/
$wgEnotifUseRealName = false;
diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 73b0b937..adee126 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -224,8 +224,6 @@
public function resetNotificationTimestamp(
$force = '', $oldid = 0, $mode = self::IMMEDIATE
) {
- global $wgActivityUpdatesUseJobQueue;
-
// Only loggedin user can have a watchlist
if ( wfReadOnly() || $this->mUser->isAnon() ||
!$this->isAllowed( 'editmywatchlist' ) ) {
return;
@@ -275,20 +273,20 @@
}
// If the page is watched by the user (or may be watched),
update the timestamp
- if ( $mode === self::DEFERRED && $wgActivityUpdatesUseJobQueue
) {
- JobQueueGroup::singleton()->push(
- EnqueueJob::newFromLocalJobs( new
JobSpecification(
- 'activityUpdateJob',
- array(
- 'type' =>
'updateWatchlistNotification',
- 'userid'=>
$this->getUserId(),
- 'notifTime' =>
$notificationTimestamp,
- 'curTime' => time()
- ),
- array( 'removeDuplicates' => true ),
- $title
- ) )
+ if ( $mode === self::DEFERRED ) {
+ $job = new ActivityUpdateJob(
+ $title,
+ array(
+ 'type' =>
'updateWatchlistNotification',
+ 'userid'=> $this->getUserId(),
+ 'notifTime' => $notificationTimestamp,
+ 'curTime' => time()
+ )
);
+ // Try to run this post-send
+ DeferredUpdates::addCallableUpdate( function() use (
$job ) {
+ $job->run();
+ } );
} else {
$dbw = wfGetDB( DB_MASTER );
$dbw->update( 'watchlist',
--
To view, visit https://gerrit.wikimedia.org/r/224978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb8b6aaeb496a4ff3cd3a7e20cdbea0c7dabd677
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] Update cassandra seeds for maps-team project - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Update cassandra seeds for maps-team project .. Update cassandra seeds for maps-team project Also unquote some strings Change-Id: I708a200cb744f01a3bb26f9f516a89cc3e066528 --- M hieradata/labs/maps-team/common.yaml 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/maps-team/common.yaml b/hieradata/labs/maps-team/common.yaml index fa7e17a..12208fd 100644 --- a/hieradata/labs/maps-team/common.yaml +++ b/hieradata/labs/maps-team/common.yaml @@ -10,17 +10,17 @@ user: replication password: justapass cidr: 10.68.17.160/32 -attrs: 'REPLICATION' -database: 'replication' +attrs: REPLICATION +database: replication pgversion: 9.4 replication@mapsslave02-v4: user: replication password: justapass cidr: 10.68.17.164/32 -attrs: 'REPLICATION' -database: 'replication' +attrs: REPLICATION +database: replication pgversion: 9.4 cassandra::cluster_name: Test cluster -cassandra::seeds: [ '10.68.18.8', '10.68.18.9', '10.68.17.13', ] +cassandra::seeds: [ 10.68.17.79, 10.68.17.160, 10.68.17.164 ] cassandra::dc: mydc cassandra::rack: myrack -- To view, visit https://gerrit.wikimedia.org/r/224977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I708a200cb744f01a3bb26f9f516a89cc3e066528 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris 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 cassandra seeds for maps-team project - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/224977 Change subject: Update cassandra seeds for maps-team project .. Update cassandra seeds for maps-team project Also unquote some strings Change-Id: I708a200cb744f01a3bb26f9f516a89cc3e066528 --- M hieradata/labs/maps-team/common.yaml 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/224977/1 diff --git a/hieradata/labs/maps-team/common.yaml b/hieradata/labs/maps-team/common.yaml index fa7e17a..12208fd 100644 --- a/hieradata/labs/maps-team/common.yaml +++ b/hieradata/labs/maps-team/common.yaml @@ -10,17 +10,17 @@ user: replication password: justapass cidr: 10.68.17.160/32 -attrs: 'REPLICATION' -database: 'replication' +attrs: REPLICATION +database: replication pgversion: 9.4 replication@mapsslave02-v4: user: replication password: justapass cidr: 10.68.17.164/32 -attrs: 'REPLICATION' -database: 'replication' +attrs: REPLICATION +database: replication pgversion: 9.4 cassandra::cluster_name: Test cluster -cassandra::seeds: [ '10.68.18.8', '10.68.18.9', '10.68.17.13', ] +cassandra::seeds: [ 10.68.17.79, 10.68.17.160, 10.68.17.164 ] cassandra::dc: mydc cassandra::rack: myrack -- To view, visit https://gerrit.wikimedia.org/r/224977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I708a200cb744f01a3bb26f9f516a89cc3e066528 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix SSL/TLS SMTP authentication missing in SwiftMailer - change (mediawiki...SwiftMailer)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix SSL/TLS SMTP authentication missing in SwiftMailer
..
Fix SSL/TLS SMTP authentication missing in SwiftMailer
This will make the maile work with SMTP configurations requiring
issue of a STARTTLS or SSL command
Bug: T100284
Change-Id: If5ff23ebb444d6ffefccd51c28702491f35a38b1
---
M SwiftMailer.php
M SwiftMailerHooks.php
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SwiftMailer.php b/SwiftMailer.php
index d4d218e..dc530fb 100644
--- a/SwiftMailer.php
+++ b/SwiftMailer.php
@@ -37,6 +37,10 @@
'license-name' => "GPL-2.0",
);
+// Used when $wgSMTP['auth'] is set to true
+// Set to 'ssl' or 'tls'. Eg: $wgSMTPAuthenticationMethod = 'tls'
+$wgSMTPAuthenticationMethod = false;
+
//Hooks files
$wgAutoloadClasses[ 'SwiftMailerHooks' ] = __DIR__ . '/SwiftMailerHooks.php';
diff --git a/SwiftMailerHooks.php b/SwiftMailerHooks.php
index a99d01d..183da80 100644
--- a/SwiftMailerHooks.php
+++ b/SwiftMailerHooks.php
@@ -78,7 +78,7 @@
* @return SwiftMailer::Transport object
Swift_MailTransport|Swift_SmtpTransport
*/
protected static function getSwiftMailer() {
- global $wgSMTP;
+ global $wgSMTP, $wgSMTPAuthenticationMethod;
static $swiftTransport = null;
if ( !$swiftTransport ) {
if ( is_array( $wgSMTP ) ) {
@@ -86,6 +86,9 @@
$swiftTransport =
Swift_SmtpTransport::newInstance( $wgSMTP['host'], $wgSMTP['port'] )
->setUsername( $wgSMTP['username'] )
->setPassword( $wgSMTP['password'] );
+ if ( $wgSMTP['auth'] === true &&
$wgSMTPAuthenticationMethod ) {
+ $swiftTransport->setEncryption(
$wgSMTPAuthenticationMethod );
+ }
} else {
$swiftTransport =
Swift_MailTransport::newInstance();
}
--
To view, visit https://gerrit.wikimedia.org/r/213547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5ff23ebb444d6ffefccd51c28702491f35a38b1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SwiftMailer
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jgreen
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] config: Remove closed/read-only wikis from selector - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: config: Remove closed/read-only wikis from selector
..
config: Remove closed/read-only wikis from selector
Based on closed.dblist
Change-Id: Idfb7d95b1e0bc335ede434c370c7497259818ad4
---
M config.defaults.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.defaults.js b/config.defaults.js
index 177f0ec..b208f08 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -38,8 +38,8 @@
cert: null,
// Service registry
registry: {
- source: [ 'aa', 'ab', 'ace', 'af', 'ak', 'am', 'ang', 'an',
'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'ba', 'bcl',
'be-tarask', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br',
'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch',
'chy', 'ckb', 'co', 'crh-latn', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'da',
'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et',
'eu', 'ext', 'fa', 'ff', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr', 'fur', 'fy',
'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'gom', 'got', 'gsw', 'gu', 'gv',
'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'lrc', 'ltg',
'lt', 'lv', 'lzh', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi',
'mk', 'ml', 'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my',
'mzn', 'nah', 'nan', 'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl',
'nn', 'nov', 'no', 'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag',
'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb',
'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn', 'roa-tara', 'rup', 'ro', 'rue',
'ru', 'rw', 'sah', 'sa', 'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sgs', 'sh',
'simple', 'si', 'sk', 'sl', 'sm', 'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq',
'st', 'su', 'sv', 'sw', 'szl', 'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl',
'tn', 'to', 'tpi', 'tr', 'ts', 'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug',
'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls', 'vo', 'vro', 'war', 'wa',
'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'yue', 'za', 'zea', 'zh', 'zu' ],
- target: [ 'aa', 'ab', 'ace', 'af', 'ak', 'am', 'ang', 'an',
'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'ba', 'bcl',
'be-tarask', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br',
'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch',
'chy', 'ckb', 'co', 'crh-latn', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'da',
'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et',
'eu', 'ext', 'fa', 'ff', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr', 'fur', 'fy',
'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'gom', 'got', 'gsw', 'gu', 'gv',
'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'lrc', 'ltg',
'lt', 'lv', 'lzh', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi',
'mk', 'ml', 'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my',
'mzn', 'nah', 'nan', 'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl',
'nn', 'nov', 'no', 'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag',
'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb',
'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn', 'roa-tara', 'rup', 'ro', 'rue',
'ru', 'rw', 'sah', 'sa', 'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sgs', 'sh',
'simple', 'si', 'sk', 'sl', 'sm', 'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq',
'st', 'su', 'sv', 'sw', 'szl', 'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl',
'tn', 'to', 'tpi', 'tr', 'ts', 'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug',
'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls', 'vo', 'vro', 'war', 'wa',
'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'yue', 'za', 'zea', 'zh', 'zu' ],
+ source: [ 'ab', 'ace', 'af', 'ak', 'am', 'ang', 'an', 'arc',
'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'ba', 'bcl', 'be-tarask',
'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug',
'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'chr', 'ch', 'chy', 'ckb', 'co',
'crh-latn', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'da', 'de', 'diq', 'dsb',
'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es'
[MediaWiki-commits] [Gerrit] Set $wgMainStash to redis instead of the DB default - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Set $wgMainStash to redis instead of the DB default
..
Set $wgMainStash to redis instead of the DB default
* Our redis has client sharding/failover and good performance.
It also has replication like MySQL (and unlike memcached),
which is required for this purpose.
Bug: T88493
Change-Id: I3cb73c2ddbf74be1b99964adde136dc8c1ddc864
---
M wmf-config/CommonSettings.php
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ae21763..6d4970c 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -311,19 +311,21 @@
'password' => $wmgRedisPassword,
'loggroup' => 'redis',
);
-}
-
-// Use the cache setup above and configure sessions caching
-if ( $wgDBname === 'labswiki' ) {
- $wgSessionCacheType = 'memcached-pecl';
- $wgMessageCacheType = 'memcached-pecl';
- $wgCookieDomain = "wikitech.wikimedia.org";
-} else {
+ // Use the cache setup above and configure sessions caching
$wgSessionCacheType = 'sessions';
+ $wgMainStash = 'sessions'; // mostly for tokens and user states (T88493)
+} else {
+ $wgSessionCacheType = 'memcached-pecl';
+ $wgMainStash = 'memcached-pecl';
}
$wgSessionsInObjectCache = true;
session_name( $lang . 'wikiSession' );
+if ( $wgDBname === 'labswiki' ) {
+ $wgMessageCacheType = 'memcached-pecl';
+ $wgCookieDomain = "wikitech.wikimedia.org"; // TODO: Is this really
necessary?
+}
+
// Use PBKDF2 for password hashing (T70766)
$wgPasswordDefault = 'pbkdf2';
// This needs to be increased as allowable by server performance
--
To view, visit https://gerrit.wikimedia.org/r/221885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cb73c2ddbf74be1b99964adde136dc8c1ddc864
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Gilles
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] Reduce the size of icons in dashboard to match the font size - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224976
Change subject: Reduce the size of icons in dashboard to match the font size
..
Reduce the size of icons in dashboard to match the font size
Bug: T105962
Change-Id: I1d21ef1046f6b60fe39bfb1c1c71a3a1307997bf
---
M modules/dashboard/styles/ext.cx.dashboard.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/76/224976/1
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less
b/modules/dashboard/styles/ext.cx.dashboard.less
index 8341a45..926 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -56,7 +56,7 @@
padding: 30px 40px;
background-position: center left;
background-repeat: no-repeat;
- background-size: 25px;
+ background-size: 20px;
}
&__title {
--
To view, visit https://gerrit.wikimedia.org/r/224976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d21ef1046f6b60fe39bfb1c1c71a3a1307997bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Only enable ContentTranslation on wikipedias - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/224975 Change subject: Beta: Only enable ContentTranslation on wikipedias .. Beta: Only enable ContentTranslation on wikipedias Bug: T91340 Change-Id: I85914deababbf601a8f9715a5c7e5307b34e3c4c --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/75/224975/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 5334c45..7ed88c1 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -1053,7 +1053,7 @@ ), 'wmgUseContentTranslation' => array( 'default' => false, - 'wiki' => true, + 'wikipedia' => true, ), 'wmgUsePetition' => array( -- To view, visit https://gerrit.wikimedia.org/r/224975 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85914deababbf601a8f9715a5c7e5307b34e3c4c 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] Make the height of search input field same as its container - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224974
Change subject: Make the height of search input field same as its container
..
Make the height of search input field same as its container
Bug: T105960
Change-Id: I916c2add6cec3fe193de424a9d98a5e6cd08ccb0
---
M modules/tools/styles/ext.cx.tools.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/74/224974/1
diff --git a/modules/tools/styles/ext.cx.tools.less
b/modules/tools/styles/ext.cx.tools.less
index e044684..9fa84ff 100644
--- a/modules/tools/styles/ext.cx.tools.less
+++ b/modules/tools/styles/ext.cx.tools.less
@@ -10,7 +10,7 @@
.cx-card--search__input {
font-size: 16px;
width: 100%;
- height: 100%;
+ height: 2.5em;
border: none;
background: none;
outline: none;
--
To view, visit https://gerrit.wikimedia.org/r/224974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I916c2add6cec3fe193de424a9d98a5e6cd08ccb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Use new grunt-tyops package rather than local original - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224973
Change subject: build: Use new grunt-tyops package rather than local original
..
build: Use new grunt-tyops package rather than local original
Bug: T104916
Change-Id: I473c5224b4f6c6e37397e187f647a369ca5ebf13
---
M Gruntfile.js
D build/tasks/typos.js
M package.json
3 files changed, 5 insertions(+), 92 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/73/224973/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 6f20054..835fd01 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,6 +20,7 @@
grunt.loadNpmTasks( 'grunt-file-exists' );
grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-tyops' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-svg2png' );
grunt.loadTasks( 'build/tasks' );
@@ -109,7 +110,7 @@
fileExists: {
src: requiredFiles
},
- typos: {
+ tyops: {
options: {
typos: 'build/typos.json'
},
@@ -407,7 +408,7 @@
grunt.registerTask( 'build-i18n', [ 'copy:i18n' ] );
grunt.registerTask( 'build-tests', [ 'exec:rubyTestSuiteGenerator',
'exec:phpGenerateJSPHPForKarma' ] );
grunt.registerTask( 'build', [
- 'clean:build', 'fileExists', 'typos', 'build-code',
'build-styling', 'build-i18n',
+ 'clean:build', 'fileExists', 'tyops', 'build-code',
'build-styling', 'build-i18n',
'clean:tmp', 'demos'
] );
@@ -415,7 +416,7 @@
// Quickly build a no-frills vector-only ltr-only version for
development
grunt.registerTask( 'quick-build', [
- 'pre-git-build', 'clean:build', 'fileExists', 'typos',
+ 'pre-git-build', 'clean:build', 'fileExists', 'tyops',
'concat:js',
'colorizeSvg', 'less:distVector', 'concat:css',
'copy:imagesCommon', 'copy:imagesApex', 'copy:imagesMediaWiki',
diff --git a/build/tasks/typos.js b/build/tasks/typos.js
deleted file mode 100644
index df14547..000
--- a/build/tasks/typos.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Check files from 'src' for typos; fail if any are found.
- */
-
-/*jshint node:true */
-module.exports = function ( grunt ) {
-
- grunt.registerMultiTask( 'typos', function () {
- var typosData, typosCSRegExp, typosCIRegExp, file,
- options = this.options( {
- typos: 'typos.json'
- } ),
- files = this.filesSrc,
- fileCount = files.length,
- typosJSON = grunt.file.read( options.typos ),
- typoCount = 0,
- ok = true;
-
- try {
- typosData = JSON.parse( typosJSON );
- } catch ( e ) {
- grunt.log.error( 'Could not parse ' + options.typos +
': ' + e );
- }
-
- typosData.caseSensitive = typosData.caseSensitive || [];
- typosData.caseInsensitive = typosData.caseInsensitive || [];
-
- typoCount += typosData.caseSensitive.length +
typosData.caseInsensitive.length;
-
- function patternMap( typo ) {
- return typo[ 0 ];
- }
-
- if ( typosData.caseSensitive.length ) {
- typosCSRegExp = new RegExp(
- '(' + typosData.caseSensitive.map( patternMap
).join( '|' ) + ')', 'g'
- );
- }
-
- if ( typosData.caseInsensitive.length ) {
- typosCIRegExp = new RegExp(
- '(' + typosData.caseInsensitive.map( patternMap
).join( '|' ) + ')', 'gi'
- );
- }
-
- function findTypo( line, lineNumber, filepath, typos, flags ) {
- // Check each pattern to find the replacement
- typos.forEach( function ( typo ) {
- var replace,
- pattern = new RegExp( typo[ 0 ], flags
),
- matches = line.match( pattern );
-
- if ( matches ) {
- ok = false;
- replace = matches[ 0 ].replace(
pattern, typo[ 1 ], flags );
- grunt.log.error(
- 'File "' + filepath + '"
contains typo "' + matches[ 0 ] + '" on line ' + lineNumber +
-
[MediaWiki-commits] [Gerrit] Reduce number of RL modules in MultimediaViewer - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Reduce number of RL modules in MultimediaViewer .. Reduce number of RL modules in MultimediaViewer Having many modules makes the startup module in the head unnecessarily longer. Things should only be in their own module if they're going to be loaded on demand on their own or are a shared dependency of separate modules that are. This change brings down the amount of modules declared by Media Viewer from 53 to 8. The ones that remain are mostly things loaded on demand. Bug: T103706 Change-Id: I5b0d29209599285b93217e96def818e641646c73 --- M MultimediaViewer.php M MultimediaViewerHooks.php M resources/mmv/mmv.head.js M resources/mmv/mmv.js M resources/mmv/ui/mmv.ui.reuse.dialog.js M tests/qunit/mmv/mmv.lightboxinterface.test.js M tests/qunit/mmv/mmv.test.js M tests/qunit/mmv/ui/mmv.ui.permission.test.js 8 files changed, 194 insertions(+), 738 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 41af5a7..f17f5b1 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -138,173 +138,29 @@ ); $wgResourceModules += array( - 'mmv.lightboximage' => $wgMediaViewerResourceTemplate + array( + // Loaded on demand by mmv.bootstrap.js + 'mmv' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv/mmv.lightboximage.js', - ), - - 'dependencies' => array( - 'mmv.base', - ), - ), - - 'mmv.lightboxinterface' => $wgMediaViewerResourceTemplate + array( - 'scripts' => array( - 'mmv/mmv.lightboxinterface.js', - ), - - 'styles' => array( - 'mmv/mmv.lightboxinterface.less', - ), - - 'dependencies' => array( - 'mmv.base', - 'mmv.logging.ActionLogger', - 'mmv.ui', - 'mmv.ui.canvas', - 'mmv.ui.canvasButtons', - 'mmv.ui.description', - 'mmv.ui.download.dialog', - 'mmv.ui.metadataPanel', - 'mmv.ui.reuse.dialog', - 'mmv.ui.viewingOptions', - ), - - 'messages' => array( - 'multimediaviewer-close-popup-text', - 'multimediaviewer-fullscreen-popup-text', - 'multimediaviewer-defullscreen-popup-text', - ), - ), - - 'mmv.ThumbnailWidthCalculator' => $wgMediaViewerResourceTemplate + array( - 'scripts' => array( - 'mmv/mmv.ThumbnailWidthCalculator.js', - ), - - 'dependencies' => array( - 'jquery.hidpi', - 'mmv.base', - 'mmv.model.ThumbnailWidth', - ), - ), - - 'mmv.HtmlUtils' => $wgMediaViewerResourceTemplate + array( - 'scripts' => array( - 'mmv/mmv.HtmlUtils.js', - ), - - 'dependencies' => array( - 'mmv.base', - ), - ), - - 'mmv.model' => $wgMediaViewerResourceTemplate + array( - 'scripts' => array( + 'mmv/logging/mmv.logging.Api.js', + 'mmv/logging/mmv.logging.AttributionLogger.js', + 'mmv/logging/mmv.logging.DimensionLogger.js', + 'mmv/logging/mmv.logging.ViewLogger.js', + 'mmv/logging/mmv.logging.PerformanceLogger.js', + 'mmv/routing/mmv.routing.js', + 'mmv/routing/mmv.routing.Route.js', + 'mmv/routing/mmv.routing.ThumbnailRoute.js', + 'mmv/routing/mmv.routing.MainFileRoute.js', + 'mmv/routing/mmv.routing.Router.js', 'mmv/model/mmv.model.js', - ), - - 'dependencies' => array( - 'mmv.base', - 'oojs', - ), - ), - - 'mmv.model.IwTitle' => $wgMediaViewerResourceTemplate + array( - 'scripts' => array( 'mmv/model/mmv.model.IwTitle.js', - ), - - 'dependencies' => array( - 'mmv.model', - ), - ), - - 'mmv.model.EmbedFileInfo' => $wgMediaViewerResourceTemplate + array( - 'scripts' => array( - 'mmv/model/mmv.model.EmbedFileInfo.js', - ), - - 'dependencies' => array( - 'mmv.model', -
[MediaWiki-commits] [Gerrit] Remove wmgDualLicense, orphaned - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove wmgDualLicense, orphaned .. Remove wmgDualLicense, orphaned Bug: T62023 Change-Id: I62b43bfb678d0efa5754138e56d42dc6d5c233ca --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 105 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1fff09b..f96f359 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10899,111 +10899,6 @@ 'default' => true, ), -'wmgUseDualLicense' => array( - 'default' => false, - 'wikidata' => true, - 'wikivoyage' => true, - // Add new wikis for dual-license here... - 'acewiki' => true, - 'arbcom_dewiki' => true, - 'arbcom_nlwiki' => true, - 'arbcom_fiwiki' => true, - 'arwikimedia' => true, - 'arwikiversity' => true, - 'arzwiki' => true, - 'bewikimedia' => true, - 'bewikisource' => true, - 'bjnwiki' => true, - 'boardgovcomwiki' => true, - 'brwikimedia' => true, - 'brwikisource' => true, - 'cawikimedia' => true, - 'checkuserwiki' => true, - 'ckbwiki' => true, - 'cnwikimedia' => true, // T98676 - 'cswikinews' => true, - 'cswikiversity' => true, - 'cowikimedia' => true, - 'dkwikimedia' => true, - 'donatewiki' => true, - 'elwikinews' => true, - 'eowikinews' => true, - 'eowikisource' => true, - 'etwikimedia' => true, - 'extwiki' => true, - 'fawikinews' => true, - 'fiwikimedia' => true, - 'frrwiki' => true, - 'gagwiki' => true, - 'ganwiki' => true, - 'guwikisource' => true, - 'huwikinews' => true, - 'iegcomwiki' => true, - 'jawikiversity' => true, - 'hifwiki' => true, - 'kaawiki' => true, - 'kbdwiki' => true, - 'koiwiki' => true, - 'kowikiversity' => true, - 'legalteamwiki' => true, - 'lezwiki' => true, - 'liwikibooks' => true, - 'liwikisource' => true, - 'loginwiki' => true, - 'ltgwiki' => true, - 'mdfwiki' => true, - 'mhrwiki' => true, - 'minwiki' => true, - 'movementroleswiki' => true, - 'mrjwiki' => true, - 'mwlwiki' => true, - 'mxwikimedia' => true, - 'myvwiki' => true, - 'noboard_chapterswikimedia' => true, - 'nsowiki' => true, - 'nycwikimedia' => true, - 'ombudsmenwiki' => true, - 'pcdwiki' => true, - 'pflwiki' => true, - 'pnbwiki' => true, - 'ptwikiversity' => true, - 'ruewiki' => true, - 'nowikimedia' => true, - 'ruwikimedia' => true, - 'ruwikiversity' => true, - 'sawikiquote' => true, - 'sahwiki' => true, - 'sahwikisource' => true, - 'sawikisource' => true, - 'sewikimedia' => true, - 'slwikiversity' => true, - 'sqwikinews' => true, - 'stewardwiki' => true, - 'strategywiki' => true, - 'svwikiversity' => true, - 'szlwiki' => true, - 'srnwiki' => true, - 'tenwiki' => true, - 'transitionteamwiki' => true, - 'trwikimedia' => true, - 'trwikinews' => true, - 'tyvwiki' => true, // T51328 - 'uawikimedia' => true, - 'ukwikimedia' => true, - 'usabilitywiki' => true, - 'vecwiktionary' => true, - 'viwikivoyage' => true, // T54034 - 'wikimania2009wiki' => true, - 'wikimania2010wiki' => true, - 'wikimania2011wiki' => true, - 'wikimania2012wiki' => true, - 'wikimania2013wiki' => true, - 'wikimania2014wiki' => true, - 'wikimania2015wiki' => true, - 'wikimania2016wiki' => true, - 'xmfwiki' => true, -), - 'wgEnableWriteAPI' => array( 'default' => true, ), -- To view, visit https://gerrit.wikimedia.org/r/209840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62b43bfb678d0efa5754138e56d42dc6d5c233ca Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert no-longer-needed fix for MS Edge browser - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert no-longer-needed fix for MS Edge browser
..
Revert no-longer-needed fix for MS Edge browser
Bug with history.pushState in Edge fixed in Win10 build 10240;
Dave Storey is asking us to remove the workaround to keep our
code pure and them honest ;)
Reverts I6ea4d367
Bug: T104381
Change-Id: I5f53416dda7c31662330dc5ec67e1bbea55dace7
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 1 insertion(+), 6 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index cac6af5..0d2b272 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -469,12 +469,7 @@
hash = window.location.href.replace( /#.*$/, ''
);
}
- try {
- window.history.pushState( null, title, hash );
- } catch ( ex ) {
- // Workaround for Edge bug --
https://phabricator.wikimedia.org/T104381
- window.history.pushState( null, title, hash +
'#' );
- }
+ window.history.pushState( null, title, hash );
} else {
// Since we voluntarily changed the hash, we don't want
MMVB.hash (which will trigger on hashchange event) to treat it
this.skipNextHashHandling = true;
--
To view, visit https://gerrit.wikimedia.org/r/224969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f53416dda7c31662330dc5ec67e1bbea55dace7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Gergő Tisza
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not show raw HTML in EditEntityAction::showUndoErrorPage - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/224972 Change subject: Do not show raw HTML in EditEntityAction::showUndoErrorPage .. Do not show raw HTML in EditEntityAction::showUndoErrorPage Wow, this rabit hole is dep! The bug did not happened when there was only one conflict, but with a list of conflicts the individual messages showed raw HTML. I solced the problem by trial and error, so the solution submitted here works in both cases. The difference comes from the code in Status::getMessage that handles single and multiple errors different. Bug: T85340 Change-Id: I6a5a9cf3589a730051b55c01eeab751fb83fb7a6 --- M repo/includes/actions/EditEntityAction.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/72/224972/1 diff --git a/repo/includes/actions/EditEntityAction.php b/repo/includes/actions/EditEntityAction.php index 5e52e1c..9cb7455 100644 --- a/repo/includes/actions/EditEntityAction.php +++ b/repo/includes/actions/EditEntityAction.php @@ -241,7 +241,7 @@ $this->msg( 'errorpagetitle' ) ); - $this->getOutput()->addWikiText( $status->getMessage()->text() ); + $this->getOutput()->addHTML( $status->getMessage()->parse() ); $this->getOutput()->returnToMain(); } -- To view, visit https://gerrit.wikimedia.org/r/224972 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a5a9cf3589a730051b55c01eeab751fb83fb7a6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MonologSpi: Add method to provide additional configuration - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: MonologSpi: Add method to provide additional configuration
..
MonologSpi: Add method to provide additional configuration
Allow post-initialization configuration of MonologSpi by providing
a `mergeConfig()` method that can be used to merge a given collection of
configuration data with the existing configuration.
Bug: T104584
Change-Id: Iba6f115a79dbc0060f64a9095467d147cf53b8ae
---
M includes/debug/logger/MonologSpi.php
R tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
A tests/phpunit/includes/debug/logger/MonologSpiTest.php
3 files changed, 155 insertions(+), 1 deletion(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/debug/logger/MonologSpi.php
b/includes/debug/logger/MonologSpi.php
index a07fdc4..e32e0b2 100644
--- a/includes/debug/logger/MonologSpi.php
+++ b/includes/debug/logger/MonologSpi.php
@@ -129,7 +129,25 @@
* @param array $config Configuration data.
*/
public function __construct( array $config ) {
- $this->config = $config;
+ $this->config = array();
+ $this->mergeConfig( $config );
+ }
+
+
+ /**
+* Merge additional configuration data into the configuration.
+*
+* @since 1.26
+* @param array $config Configuration data.
+*/
+ public function mergeConfig( array $config ) {
+ foreach ( $config as $key => $value ) {
+ if ( isset( $this->config[$key] ) ) {
+ $this->config[$key] = array_merge(
$this->config[$key], $value );
+ } else {
+ $this->config[$key] = $value;
+ }
+ }
$this->reset();
}
diff --git a/tests/phpunit/includes/debug/logging/LegacyLoggerTest.php
b/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
similarity index 100%
rename from tests/phpunit/includes/debug/logging/LegacyLoggerTest.php
rename to tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
diff --git a/tests/phpunit/includes/debug/logger/MonologSpiTest.php
b/tests/phpunit/includes/debug/logger/MonologSpiTest.php
new file mode 100644
index 000..aa0a54f
--- /dev/null
+++ b/tests/phpunit/includes/debug/logger/MonologSpiTest.php
@@ -0,0 +1,136 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace MediaWiki\Logger;
+
+use MediaWikiTestCase;
+use TestingAccessWrapper;
+
+class MonologSpiTest extends MediaWikiTestCase {
+
+ /**
+* @covers MonologSpi::mergeConfig
+*/
+ public function testMergeConfig() {
+ $base = array(
+ 'loggers' => array(
+ '@default' => array(
+ 'processors' => array( 'constructor' ),
+ 'handlers' => array( 'constructor' ),
+ ),
+ ),
+ 'processors' => array(
+ 'constructor' => array(
+ 'class' => 'constructor',
+ ),
+ ),
+ 'handlers' => array(
+ 'constructor' => array(
+ 'class' => 'constructor',
+ 'formatter' => 'constructor',
+ ),
+ ),
+ 'formatters' => array(
+ 'constructor' => array(
+ 'class' => 'constructor',
+ ),
+ ),
+ );
+
+ $fixture = new MonologSpi( $base );
+ $this->assertSame(
+ $base,
+ TestingAccessWrapper::newFromObject( $fixture )->config
+ );
+
+ $fixture->mergeConfig( array(
+ 'loggers' => array(
+ 'merged' => array(
+ 'processors' => array( 'merged' ),
+ 'handlers' => array( 'merged' ),
+ ),
+ ),
+ 'processors' => array(
+ 'merged' => array(
+ 'class' => 'merged',
+ ),
+ ),
+ 'magic' => array(
+ 'idkfa' => array( 'xyzzy' ),
+ ),
+ 'handlers' => array(
+ 'merged' => array(
+ 'class' => 'm
[MediaWiki-commits] [Gerrit] Convert some usages of 'wiki' to 'wikipedia' - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Convert some usages of 'wiki' to 'wikipedia' .. Convert some usages of 'wiki' to 'wikipedia' Bug: T91340 Change-Id: I6b0a6013ce0d65139176a5b832f88ac2699881ee --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fb484cd..1fff09b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10622,7 +10622,7 @@ 'wgFavicon' => array( # Projects 'default' => '/static/favicon/wmf.ico', // T50479 - 'wiki' => '/static/favicon/wikipedia.ico', // T50479 + 'wikipedia' => '/static/favicon/wikipedia.ico', // T50479 'wikibooks' => '/static/favicon/wikibooks.ico', 'wikimania' => '/static/favicon/wikimania.ico', 'wikinews' => '/static/favicon/wikinews.ico', @@ -10787,7 +10787,7 @@ 'mediawikiwiki' => '/static/apple-touch/mediawiki.png', 'usabilitywiki' => '/static/apple-touch/usability.png', 'wikinews' => '/static/apple-touch/wikinews.png', - 'wiki' => '/static/apple-touch/wikipedia.png', + 'wikipedia' => '/static/apple-touch/wikipedia.png', 'wiktionary' => '/static/apple-touch/wiktionary.png', 'wikidata' => '/static/apple-touch/wikidata.png', // T72996 'enwiktionary' => '/static/apple-touch/wiktionary/en.png', // T48431 -- To view, visit https://gerrit.wikimedia.org/r/194075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b0a6013ce0d65139176a5b832f88ac2699881ee Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [HACKATHON-WIP] Create an OOUI module for WikiEditor - change (mediawiki...WikiEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224971
Change subject: [HACKATHON-WIP] Create an OOUI module for WikiEditor
..
[HACKATHON-WIP] Create an OOUI module for WikiEditor
Change-Id: Id631290c42a0aba2cc31faf532e24f13eaa0c43c
---
M .jshintrc
M WikiEditor.hooks.php
M extension.json
A modules/ooui-module/mw.wikiEditor.TriggerListener.js
A modules/ooui-module/mw.wikiEditor.init.Target.js
A modules/ooui-module/mw.wikiEditor.js
A modules/ooui-module/mw.wikiEditor.ui.DesktopSurface.js
A modules/ooui-module/mw.wikiEditor.ui.Overlay.js
A modules/ooui-module/mw.wikiEditor.ui.Trigger.js
9 files changed, 1,188 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/71/224971/1
diff --git a/.jshintrc b/.jshintrc
index 81d1fa7..daaa348 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -29,6 +29,7 @@
"globals": {
"mediaWiki": false,
"jQuery": false,
- "QUnit": false
+ "QUnit": false,
+ "OO": false
}
}
diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php
index 25e340f..c693889 100644
--- a/WikiEditor.hooks.php
+++ b/WikiEditor.hooks.php
@@ -110,6 +110,11 @@
* T99257: Extension registration does not properly support 2d arrays
so set it as a global for now
*/
public static function onRegistration() {
+ global $wgWikiEditorOOUI;
+ if ( $wgWikiEditorOOUI == true ) {
+
+ return;
+ }
// Each module may be configured individually to be globally
on/off or user preference based
$features = array(
@@ -142,7 +147,6 @@
} else {
$wgWikiEditorFeatures = $features;
}
-
}
/**
@@ -235,10 +239,15 @@
* @return bool
*/
public static function editPageShowEditFormInitial( $editPage,
$outputPage ) {
+ global $wgWikiEditorOOUI;
if ( $editPage->contentModel !== CONTENT_MODEL_WIKITEXT ) {
return true;
}
+ if ( $wgWikiEditorOOUI == true ) {
+ $outputPage->addModules( 'ooui.wikiEditor' );
+ return true;
+ }
// Add modules for enabled features
foreach ( self::$features as $name => $feature ) {
if ( !self::isEnabled( $name ) ) {
diff --git a/extension.json b/extension.json
index 0d0ccfe..867995d 100644
--- a/extension.json
+++ b/extension.json
@@ -12,6 +12,9 @@
"descriptionmsg": "wikieditor-desc",
"type": "other",
"callback": "WikiEditorHooks::onRegistration",
+ "config": {
+ "WikiEditorOOUI": false
+ },
"MessagesDirs": {
"WikiEditor": [
"i18n"
@@ -47,6 +50,12 @@
]
},
"ResourceModules": {
+ "ooui.wikiEditor": {
+ "group": "ext.wikiEditor",
+ "dependencies": [
+ "oojs-ui"
+ ]
+ },
"jquery.wikiEditor": {
"group": "ext.wikiEditor",
"scripts": "jquery.wikiEditor.js",
diff --git a/modules/ooui-module/mw.wikiEditor.TriggerListener.js
b/modules/ooui-module/mw.wikiEditor.TriggerListener.js
new file mode 100644
index 000..48e3014
--- /dev/null
+++ b/modules/ooui-module/mw.wikiEditor.TriggerListener.js
@@ -0,0 +1,82 @@
+( function ( mw ) {
+ /*!
+* VisualEditor UserInterface TriggerListener class.
+*
+* @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
+*/
+
+ /**
+* Trigger listener
+*
+* @class
+*
+* @constructor
+* @param {string[]} commands Commands to listen to triggers for
+*/
+ mw.wikiEditor.TriggerListener = function MwWikiEditorUiTriggerListener(
commands ) {
+ // Properties
+ this.commands = [];
+ this.commandsByTrigger = {};
+ this.triggers = {};
+
+ this.setupCommands( commands );
+ };
+
+ /* Inheritance */
+
+ OO.initClass( mw.wikiEditor.TriggerListener );
+
+ /* Methods */
+
+ /**
+* Setup commands
+*
+* @param {string[]} commands Commands to listen to triggers for
+*/
+ mw.wikiEditor.TriggerListener.prototype.setupCommands = function (
commands ) {
+ var i, j, command, triggers;
+ this.commands = commands;
+ if ( commands.length ) {
+ for ( i = this.commands.length - 1; i >= 0; i-- ) {
+
[MediaWiki-commits] [Gerrit] Re-enable all languages in GeSHi - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Re-enable all languages in GeSHi
..
Re-enable all languages in GeSHi
Bug: T105889
Change-Id: I28a5d1ddbb05d1c8cda580be39575a4f215feb7b
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 29 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ba5224e..c6ffa3f 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -549,35 +549,6 @@
if ( $wmgUseGeSHi ) {
include( $IP .
'/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php' );
-
- // GeSHi supports 215 languages. The top 20 languages account for more
than
- // 80% of usage. The bottom 75 are not used at all. Since each supported
- // language gets an entry in ResourceLoader's start-up module, it makes
- // sense to be economical and drop support for those languages. (T93025)
- $wgGeSHiSupportedLanguages = array(
- "c", "cpp", "bash", "html4strict", "text", "java", "latex",
- "javascript", "python", "xml", "csharp", "php", "css", "asm",
"sql",
- "pascal", "matlab", "html5", "haskell", "vb", "lisp", "ruby",
"ada",
- "oracle11", "dos", "rsplus", "fortran", "d", "bnf", "ocaml",
"pcre",
- "perl", "vhdl", "actionscript", "lua", "bibtex", "go", "bf",
"cobol",
- "ini", "delphi", "arm", "scheme", "objc", "prolog",
"actionscript3",
- "mysql", "qbasic", "asp", "algol68", "groovy", "erlang", "abap",
- "email", "powershell", "ecmascript", "glsl", "sas", "apache",
"yaml",
- "java5", "vbnet", "reg", "cfm", "fsharp", "scala",
"applescript",
- "gwbasic", "clojure", "pli", "robots", "tsql", "whois",
"freebasic",
- "verilog", "llvm", "visualfoxpro", "sparql", "tcl", "plsql",
- "coffeescript", "scilab", "dot", "autoit", "boo", "mirc",
"lolcode",
- "gnuplot", "eiffel", "j", "teraterm", "oorexx", "diff",
"smalltalk",
- "cmake", "avisynth", "perl6", "xpp", "typoscript", "basic4gl",
"make",
- "awk", "e", "gml", "jquery", "zxbasic", "systemverilog",
"6502acme",
- "properties", "oracle8", "q", "purebasic", "pic16", "ldif",
"rexx",
- "unicon", "urbi", "modula3", "mpasm", "locobasic", "progress",
- "visualprolog", "vala", "octave", "winbatch", "oz",
"autohotkey",
- "cadlisp", "euphoria", "pycon", "oobas", "povray", "thinbasic",
- "68000devpac", "mmix", "modula2", "cil", "mxml", "io",
"blitzbasic",
- "parigp", "oberon2",
- );
-
}
if ( $wmgUseDoubleWiki ) {
--
To view, visit https://gerrit.wikimedia.org/r/224799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28a5d1ddbb05d1c8cda580be39575a4f215feb7b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: John Vandenberg
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 interwiki-labs.cdb - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add interwiki-labs.cdb
..
Add interwiki-labs.cdb
(not physically committed, see also T75905)
Bug: T69931
Change-Id: If56abe93a627a1d4f4cf228f90a4b3118351e127
---
M .gitignore
A docroot/noc/conf/interwiki-labs.cdb
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
4 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
20after4: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 8154be7..09f244e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
wmf-config/*-setup.php
wmf-config/checkers.php
wmf-config/interwiki.cdb
+wmf-config/interwiki-labs.cdb
lib
cgi-bin
boardvote.gpg
diff --git a/docroot/noc/conf/interwiki-labs.cdb
b/docroot/noc/conf/interwiki-labs.cdb
new file mode 12
index 000..492324a
--- /dev/null
+++ b/docroot/noc/conf/interwiki-labs.cdb
@@ -0,0 +1 @@
+../../../wmf-config/interwiki-labs.cdb
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 21abcee..2a1f621 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -92,6 +92,7 @@
wmf-config/extension-list-labs
wmf-config/extension-list-wikitech
wmf-config/interwiki.cdb
+ wmf-config/interwiki-labs.cdb
wmf-config/trusted-xff.cdb
)
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 00526ad..be7a96a 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1159,9 +1159,11 @@
$wgDiff = false;
}
-if ( file_exists( "$wmfConfigDir/interwiki.cdb" ) ) {
- $wgInterwikiCache = "$wmfConfigDir/interwiki.cdb";
+$iwCacheFile = getRealmSpecificFilename( "$wmfConfigDir/interwiki.cdb" );
+if ( file_exists( $iwCacheFile ) ) {
+ $wgInterwikiCache = $iwCacheFile;
}
+unset( $iwCacheFile );
$wgEnotifUseJobQ = true;
--
To view, visit https://gerrit.wikimedia.org/r/175755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If56abe93a627a1d4f4cf228f90a4b3118351e127
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: TTO
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use multi-master for labs salt. It has never worked. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Don't use multi-master for labs salt. It has never worked.
..
Don't use multi-master for labs salt. It has never worked.
This is a simplified version of https://gerrit.wikimedia.org/r/#/c/224660
that doesn't have the dependencies.
Change-Id: Id8bea7ccf1025f66a9389a7c6f0a3414fc947498
---
M manifests/role/salt.pp
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 500a98d..a43cdbf 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -93,12 +93,10 @@
$salt_master_key = $::salt_master_key,
) {
if $::realm == 'labs' {
-$puppet_master = hiera('labs_puppet_master')
-$puppet_master_secondary = hiera('labs_puppet_master_secondary')
+$labs_master = hiera('labs_puppet_master')
-$labs_masters = [ $puppet_master, $puppet_master_secondary ]
$labs_finger = 'c5:b1:35:45:3e:0a:19:70:aa:5f:3a:cf:bf:a0:61:dd'
-$master= pick($salt_master, $labs_masters)
+$master= pick($salt_master, $labs_master)
$master_finger = pick($salt_finger, $labs_finger)
salt::grain { 'labsproject':
--
To view, visit https://gerrit.wikimedia.org/r/224967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8bea7ccf1025f66a9389a7c6f0a3414fc947498
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert no-longer-needed fix for MS Edge browser - change (mediawiki...MultimediaViewer)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224969
Change subject: Revert no-longer-needed fix for MS Edge browser
..
Revert no-longer-needed fix for MS Edge browser
Bug with history.pushState in Edge fixed in Win10 build 10240;
Dave Storey is asking us to remove the workaround to keep our
code pure and them honest ;)
Reverts I6ea4d367
Bug: T104381
Change-Id: I5f53416dda7c31662330dc5ec67e1bbea55dace7
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 1 insertion(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/69/224969/1
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index cac6af5..0d2b272 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -469,12 +469,7 @@
hash = window.location.href.replace( /#.*$/, ''
);
}
- try {
- window.history.pushState( null, title, hash );
- } catch ( ex ) {
- // Workaround for Edge bug --
https://phabricator.wikimedia.org/T104381
- window.history.pushState( null, title, hash +
'#' );
- }
+ window.history.pushState( null, title, hash );
} else {
// Since we voluntarily changed the hash, we don't want
MMVB.hash (which will trigger on hashchange event) to treat it
this.skipNextHashHandling = true;
--
To view, visit https://gerrit.wikimedia.org/r/224969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f53416dda7c31662330dc5ec67e1bbea55dace7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Render "dcl" as "sql" - change (mediawiki...SyntaxHighlight_GeSHi)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/224970 Change subject: Render "dcl" as "sql" .. Render "dcl" as "sql" "dcl" (Data Control Language) in GeSHi was SQL with additional keyword support, and a fallback to pygments 'sql' renders correctly, albeit without all keywords highlighted, however most of the keywords are part of 'sql'. Change-Id: I121ce6d6ab20328dd1788f537127e16fa3049503 --- M SyntaxHighlight_GeSHi.compat.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/70/224970/1 diff --git a/SyntaxHighlight_GeSHi.compat.php b/SyntaxHighlight_GeSHi.compat.php index 6be48d0..6ec8bd0 100644 --- a/SyntaxHighlight_GeSHi.compat.php +++ b/SyntaxHighlight_GeSHi.compat.php @@ -99,6 +99,7 @@ 'oberon2' => 'modula2', // SQL + 'dcl' => 'sql', 'tsql' => 'sql', 'plsql'=> 'sql', 'oracle11' => 'sql', -- To view, visit https://gerrit.wikimedia.org/r/224970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I121ce6d6ab20328dd1788f537127e16fa3049503 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Add missing eo-en pair - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/224968 Change subject: CX: Add missing eo-en pair .. CX: Add missing eo-en pair Change-Id: Ic7c53c65890df8b6dc4484ad060b88c3a7b0dd3d --- M hieradata/common/cxserver.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/224968/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 09bdf4e..798d9cf 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -606,6 +606,7 @@ - 'gl' - 'sh' 'eo': +- 'en' - 'simple' 'es': - 'an' -- To view, visit https://gerrit.wikimedia.org/r/224968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7c53c65890df8b6dc4484ad060b88c3a7b0dd3d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use multi-master for labs salt. It has never worked. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224967
Change subject: Don't use multi-master for labs salt. It has never worked.
..
Don't use multi-master for labs salt. It has never worked.
This is a simplified version of https://gerrit.wikimedia.org/r/#/c/224660
that doesn't have the dependencies.
Change-Id: Id8bea7ccf1025f66a9389a7c6f0a3414fc947498
---
M manifests/role/salt.pp
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/224967/1
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 500a98d..a43cdbf 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -93,12 +93,10 @@
$salt_master_key = $::salt_master_key,
) {
if $::realm == 'labs' {
-$puppet_master = hiera('labs_puppet_master')
-$puppet_master_secondary = hiera('labs_puppet_master_secondary')
+$labs_master = hiera('labs_puppet_master')
-$labs_masters = [ $puppet_master, $puppet_master_secondary ]
$labs_finger = 'c5:b1:35:45:3e:0a:19:70:aa:5f:3a:cf:bf:a0:61:dd'
-$master= pick($salt_master, $labs_masters)
+$master= pick($salt_master, $labs_master)
$master_finger = pick($salt_finger, $labs_finger)
salt::grain { 'labsproject':
--
To view, visit https://gerrit.wikimedia.org/r/224967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8bea7ccf1025f66a9389a7c6f0a3414fc947498
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maps:: Add cassandra as a component of role::maps classes - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: maps:: Add cassandra as a component of role::maps classes
..
maps:: Add cassandra as a component of role::maps classes
Cassandra will be the vector tile storage for maps. Include it on
role::maps classes along with configuration for it in labs maps-team
project
Change-Id: Id582800967453efe9b1d915b481254594e101c9c
---
M hieradata/labs/maps-team/common.yaml
M manifests/role/maps.pp
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/maps-team/common.yaml
b/hieradata/labs/maps-team/common.yaml
index 201ae00..fa7e17a 100644
--- a/hieradata/labs/maps-team/common.yaml
+++ b/hieradata/labs/maps-team/common.yaml
@@ -20,3 +20,7 @@
attrs: 'REPLICATION'
database: 'replication'
pgversion: 9.4
+cassandra::cluster_name: Test cluster
+cassandra::seeds: [ '10.68.18.8', '10.68.18.9', '10.68.17.13', ]
+cassandra::dc: mydc
+cassandra::rack: myrack
diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 1a9865e..fea8a5e 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -22,6 +22,7 @@
include standard
include ::postgresql::slave
include ::postgresql::postgis
+include ::cassandra
system::role { 'role::maps::slave':
ensure => 'present',
--
To view, visit https://gerrit.wikimedia.org/r/224871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id582800967453efe9b1d915b481254594e101c9c
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
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 capsule select widget - change (oojs/ui)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224966
Change subject: Add a capsule select widget
..
Add a capsule select widget
Bug: T88250
Bug: T91147
Change-Id: I9935825127dfd024a459ad74b814ea04c0b74e98
---
M build/modules.json
M demos/pages/widgets.js
M src/styles/core.less
M src/styles/theme.less
A src/styles/widgets/CapsuleItemWidget.less
A src/styles/widgets/CapsuleWidget.less
M src/themes/apex/widgets.less
M src/themes/blank/widgets.less
M src/themes/mediawiki/widgets.less
A src/widgets/CapsuleItemWidget.js
A src/widgets/CapsuleWidget.js
M src/widgets/MenuSelectWidget.js
M src/widgets/OptionWidget.js
M src/widgets/SelectWidget.js
14 files changed, 967 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/66/224966/1
diff --git a/build/modules.json b/build/modules.json
index 3daef88..924371f 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -72,6 +72,8 @@
"src/widgets/ActionWidget.js",
"src/widgets/PopupButtonWidget.js",
"src/widgets/ToggleButtonWidget.js",
+ "src/widgets/CapsuleWidget.js",
+ "src/widgets/CapsuleItemWidget.js",
"src/widgets/DropdownWidget.js",
"src/widgets/SelectFileWidget.js",
"src/widgets/IconWidget.js",
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 12c4327..0173213 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1085,6 +1085,74 @@
}
),
new OO.ui.FieldLayout(
+ new OO.ui.CapsuleWidget( {
+ menu: {
+ items: [
+ new
OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'asd', label: 'Label for asd' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'jkl', label: 'Label for jkl' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'jjj', label: 'Label for jjj' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'zxc', label: 'Label for zxc' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'vbn', label: 'Label for vbn' } )
+ ]
+ }
+ } ),
+ {
+ label: 'CapsuleWidget',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.CapsuleWidget( {
+ allowArbitrary: true,
+ icon: 'tag',
+ indicator: 'required',
+ menu: {
+ items: [
+ new
OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'asd', label: 'Label for asd' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'jkl', label: 'Label for jkl' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'jjj', label: 'Label for jjj' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'zxc', label: 'Label for zxc' } ),
+ new
OO.ui.MenuOptionWidget( { data: 'vbn', label: 'Label for vbn' } )
+ ]
+ }
+ } ),
+ {
+ label: 'CapsuleWidget (icon,
indicator, arbitrary values allowed)',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+
[MediaWiki-commits] [Gerrit] WIP: [BrowserTest] Add true internationalized content suppor... - change (mediawiki...VisualEditor)
Vikassy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224965
Change subject: WIP: [BrowserTest] Add true internationalized content support
to language screenshot
..
WIP: [BrowserTest] Add true internationalized content support to language
screenshot
Bug: T105466
* LANGUAGE_SCREENSHOT_CONTENT_PATH environment variable points to path
where the json’s of different languages are present.
* Hebrew json’s are added, which needs to be translated.
Paired with Zeljko
Change-Id: I4ae516758fb01a41f0dcf53c7cf3e609c7601cf3
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/he.json
M modules/ve-mw/tests/browser/features/language_screenshot.feature
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/env.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
6 files changed, 26 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/65/224965/1
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index f5124d2..69854e4 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -308,5 +308,7 @@
"visualeditor-viewpage-savewarning-title": "Are you sure?",
"visualeditor-wikitext-warning": "You are using VisualEditor -
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|wikitext]] does not work
here. To switch to source editing at any time without losing your changes, open
the dropdown menu next to \"{{int:visualeditor-toolbar-savedialog}}\" and
select \"{{int:visualeditor-mweditmodesource-title}}\".",
"visualeditor-wikitext-warning-link":
"mediawikiwiki:Special:MyLanguage/Help:Formatting",
- "visualeditor-wikitext-warning-title": "Wikitext markup detected"
+ "visualeditor-wikitext-warning-title": "Wikitext markup detected",
+ "languagescreenshot-hello-world-text": "Hello, World!",
+ "languagescreenshot-world-text": "World"
}
diff --git a/modules/ve-mw/i18n/he.json b/modules/ve-mw/i18n/he.json
index 83151a4..e7117b1 100644
--- a/modules/ve-mw/i18n/he.json
+++ b/modules/ve-mw/i18n/he.json
@@ -300,5 +300,8 @@
"visualeditor-viewpage-savewarning-keep": "המשך עריכה",
"visualeditor-viewpage-savewarning-title": "בטוח?",
"visualeditor-wikitext-warning": "זהו עורך חזותי –
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|קוד ויקי]] לא יעבוד כאן. כדי
לעבור חזרה לעריכת קוד מקור בכל זמן בלי לאבד את השינויים שלך, יש לפתוח את התפריט
ליד \"{{int:visualeditor-toolbar-savedialog}}\" ולבחור באפשרות
\"{{int:visualeditor-mweditmodesource-title}}\".",
- "visualeditor-wikitext-warning-title": "נראה שיש כאן קוד ויקי"
+ "visualeditor-wikitext-warning-title": "נראה שיש כאן קוד ויקי",
+ "comment": "Please translate below keys",
+ "languagescreenshot-hello-world-text": "נראה שיש!",
+ "languagescreenshot-world-text": "שיש"
}
diff --git a/modules/ve-mw/tests/browser/features/language_screenshot.feature
b/modules/ve-mw/tests/browser/features/language_screenshot.feature
index 09b6911..95ed896 100644
--- a/modules/ve-mw/tests/browser/features/language_screenshot.feature
+++ b/modules/ve-mw/tests/browser/features/language_screenshot.feature
@@ -52,11 +52,12 @@
When I click on list and indentation button
Then I should see list and indentation dropdown
- Scenario: VisualEditor_External_link
-Given I go to the "Links VisualEditor Screenshot" page with source content
"Links VisualEditor Screenshot"
+ @language_screenshot
+ Scenario: VisualEditor_Internal_link
+Given I go to the "Links VisualEditor Screenshot" page with source content
"Hello World" for language screenshot
And I click in the editable part
+ And I select "World" in editable part
And I click the Link button
-When I enter http://www.mediawiki.org into link Content box
Then I should see link Content box with dropdown options
Scenario: VisualEditor_Link_editing_inline
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index ffae02b..f916040 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -50,6 +50,14 @@
step "I go to the \"#{page_title}\" page with source content
\"2+2\""
end
+Given(/^I select "(.*?)" in editable part$/) do |string|
+ on(VisualEditorPage).content_element.select_text translate(string)
+end
+
+Given(/^I go to the "(.*?)" page with source content "(.*?)" for language
screenshot$/) do |page, content|
+ step "I go to the \"#{page}\" page with source content
\"#{translate(content)}\""
+end
+
When(/^I click on the Insert menu$/) do
o
[MediaWiki-commits] [Gerrit] WIP - change (mediawiki/selenium)
Dduvall has uploaded a new change for review. https://gerrit.wikimedia.org/r/224964 Change subject: WIP .. WIP DO NOT MERGE Change-Id: Icb4d5b8a334bfa38addfd6aca1142ec436374fc1 --- M README.md 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/64/224964/1 diff --git a/README.md b/README.md index b7cb729..83ab8e2 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ features, and drive cross-browser simulations to ensure the correctness of your implementation. +Showing a demo of how to use gerrit. + ## Core Dependencies * [Cucumber](https://github.com/cucumber/cucumber) provides the natural -- To view, visit https://gerrit.wikimedia.org/r/224964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb4d5b8a334bfa38addfd6aca1142ec436374fc1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Dduvall ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maps-team hiera: Update IPs to the new ones - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: maps-team hiera: Update IPs to the new ones .. maps-team hiera: Update IPs to the new ones Change-Id: I52e8480deb6298b97b7bfd1ba643a328dda417b9 --- M hieradata/labs/maps-team/common.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/maps-team/common.yaml b/hieradata/labs/maps-team/common.yaml index a5ed1af..201ae00 100644 --- a/hieradata/labs/maps-team/common.yaml +++ b/hieradata/labs/maps-team/common.yaml @@ -9,14 +9,14 @@ replication@mapsslave01-v4: user: replication password: justapass -cidr: 10.68.18.8/32 +cidr: 10.68.17.160/32 attrs: 'REPLICATION' database: 'replication' pgversion: 9.4 replication@mapsslave02-v4: user: replication password: justapass -cidr: 10.68.18.9/32 +cidr: 10.68.17.164/32 attrs: 'REPLICATION' database: 'replication' pgversion: 9.4 -- To view, visit https://gerrit.wikimedia.org/r/224963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52e8480deb6298b97b7bfd1ba643a328dda417b9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maps-team hiera: Update IPs to the new ones - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/224963 Change subject: maps-team hiera: Update IPs to the new ones .. maps-team hiera: Update IPs to the new ones Change-Id: I52e8480deb6298b97b7bfd1ba643a328dda417b9 --- M hieradata/labs/maps-team/common.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/224963/1 diff --git a/hieradata/labs/maps-team/common.yaml b/hieradata/labs/maps-team/common.yaml index a5ed1af..201ae00 100644 --- a/hieradata/labs/maps-team/common.yaml +++ b/hieradata/labs/maps-team/common.yaml @@ -9,14 +9,14 @@ replication@mapsslave01-v4: user: replication password: justapass -cidr: 10.68.18.8/32 +cidr: 10.68.17.160/32 attrs: 'REPLICATION' database: 'replication' pgversion: 9.4 replication@mapsslave02-v4: user: replication password: justapass -cidr: 10.68.18.9/32 +cidr: 10.68.17.164/32 attrs: 'REPLICATION' database: 'replication' pgversion: 9.4 -- To view, visit https://gerrit.wikimedia.org/r/224963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52e8480deb6298b97b7bfd1ba643a328dda417b9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Order postgresql::spatialdb after postgis - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Order postgresql::spatialdb after postgis
..
Order postgresql::spatialdb after postgis
Creating the database require ::postgresql::postgis to have been
completed first
Change-Id: I01bf8c09a40565f5adf30c64ca160ba49aadbe58
---
M manifests/role/maps.pp
M modules/postgresql/manifests/slave.pp
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 5872315..1a9865e 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -2,7 +2,10 @@
include standard
include ::postgresql::master
include ::postgresql::postgis
-postgresql::spatialdb { 'gis': }
+include ::cassandra
+postgresql::spatialdb { 'gis':
+require => Class['::postgresql::postgis'],
+}
system::role { 'role::maps::master':
ensure => 'present',
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index f3f8512..52b9570 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -60,7 +60,10 @@
group => 'root',
mode=> '0444',
content => template('postgresql/recovery.conf.erb'),
-require => Class['postgresql::server'],
+require => [
+Class['postgresql::server'],
+Exec["pg_basebackup-${master_server}"],
+]
}
# Let's sync once all our content from the master
--
To view, visit https://gerrit.wikimedia.org/r/224962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01bf8c09a40565f5adf30c64ca160ba49aadbe58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
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 www.workwithsounds.eu to wgCopyUploadsDomains - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add www.workwithsounds.eu to wgCopyUploadsDomains .. Add www.workwithsounds.eu to wgCopyUploadsDomains To allow batch uploading of recordings of industrial sounds with GWToolset on Commons. Requested by Liam Wyatt; see Phabricator task for details. Bug: T105143 Change-Id: Id42d7f38358302a2cf315921238f5a7f0f892c3f --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved Dereckson: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a1bf1f8..abcbe91 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11467,6 +11467,7 @@ '*.dvidshub.net', // Defense Video and Imagery Distribution System - T103062 '*.ub.unibas.ch', // Universität Basel - T104178 '*.unibas.ch', // Universität Basel - T104178 + 'www.workwithsounds.eu',// Work With Sounds - T105143 ), ), -- To view, visit https://gerrit.wikimedia.org/r/223843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id42d7f38358302a2cf315921238f5a7f0f892c3f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Dereckson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Order postgresql::spatialdb after postgis - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224962
Change subject: Order postgresql::spatialdb after postgis
..
Order postgresql::spatialdb after postgis
Creating the database require ::postgresql::postgis to have been
completed first
Change-Id: I01bf8c09a40565f5adf30c64ca160ba49aadbe58
---
M manifests/role/maps.pp
M modules/postgresql/manifests/slave.pp
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/224962/1
diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 5872315..1a9865e 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -2,7 +2,10 @@
include standard
include ::postgresql::master
include ::postgresql::postgis
-postgresql::spatialdb { 'gis': }
+include ::cassandra
+postgresql::spatialdb { 'gis':
+require => Class['::postgresql::postgis'],
+}
system::role { 'role::maps::master':
ensure => 'present',
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index f3f8512..52b9570 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -60,7 +60,10 @@
group => 'root',
mode=> '0444',
content => template('postgresql/recovery.conf.erb'),
-require => Class['postgresql::server'],
+require => [
+Class['postgresql::server'],
+Exec["pg_basebackup-${master_server}"],
+]
}
# Let's sync once all our content from the master
--
To view, visit https://gerrit.wikimedia.org/r/224962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01bf8c09a40565f5adf30c64ca160ba49aadbe58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ShortUrl extension at orwiktionary - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable ShortUrl extension at orwiktionary .. Enable ShortUrl extension at orwiktionary Needs shorturls table to be created. Bug: T103644 Change-Id: I4728de7b9a8c304c597a329cc4aefb903094bdc7 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index da50cfe..f7f6e66 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14129,6 +14129,7 @@ 'knwiki' => true, // T97218 'newiki' => true, // T92820 'orwiki' => true, + 'orwiktionary' => true, // T103644 'sawiki' => true, // T94660 'sawikibooks' => true, // T94660 'sawikiquote' => true, // T94660 -- To view, visit https://gerrit.wikimedia.org/r/222584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4728de7b9a8c304c597a329cc4aefb903094bdc7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump version to 1.8 - change (mediawiki...Theme)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224961
Change subject: Bump version to 1.8
..
Bump version to 1.8
Change-Id: Ib0e21ca2e18268b4b5d77d5f95e3f0b698bd80ac
---
M Theme.php
M monobook/dark.css
M vector/dark.css
3 files changed, 39 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme
refs/changes/61/224961/1
diff --git a/Theme.php b/Theme.php
index 6216fc1..46b37ec 100644
--- a/Theme.php
+++ b/Theme.php
@@ -4,7 +4,7 @@
*
* @file
* @ingroup Extensions
- * @version 1.7
+ * @version 1.7.1
* @author Ryan Schmidt
* @author Jack Phoenix
* @license https://en.wikipedia.org/wiki/Public_domain Public domain
@@ -18,7 +18,7 @@
// Extension credits that will show up on Special:Version
$wgExtensionCredits['other'][] = array(
'name' => 'Theme',
- 'version' => '1.7',
+ 'version' => '1.8',
'author' => array( 'Ryan Schmidt', 'Jack Phoenix' ),
'description' => 'Theme loader extension for skins',
'url' => 'https://www.mediawiki.org/wiki/Extension:Theme'
@@ -64,7 +64,6 @@
'styles' => array(
'extensions/Theme/monobook/stellarbook.css' => array( 'media'
=> 'screen' )
)
-
);
// Vector
diff --git a/monobook/dark.css b/monobook/dark.css
index 9c8a82d..293c2ab 100644
--- a/monobook/dark.css
+++ b/monobook/dark.css
@@ -2,7 +2,7 @@
** Dark theme for MonoBook
** Originally from ZeldaWiki.org and modified by Skizzerz
for ShoutWiki
**
-** @date 14 September 2011
+** @date 1 November 2014
*/
div#content {
background: #1c3855;
@@ -313,7 +313,7 @@
/* also used on Special:Version */
table.wikitable {
- background-color: transparent;
+ background-color: transparent !important;
color: #d2d2d2;
}
@@ -424,4 +424,14 @@
td.diff-context {
background-color: transparent !important;
color: #d2d2d2;
+}
+
+/**
+ * This class appears to be the new version of TablePager, I guess?
+ * Everywhere where I see that this is used, the element also has the
TablePager
+ * class, but all CSS definitions are on this class and its children.
+ * Anyway, Special:ListFiles, Special:AbuseFilter, etc. use this class.
+ */
+table.mw-datatable th, table.mw-datatable tr:hover td, table.mw-datatable td {
+ background-color: transparent;
}
\ No newline at end of file
diff --git a/vector/dark.css b/vector/dark.css
index fe133ea..9d0d7ac 100644
--- a/vector/dark.css
+++ b/vector/dark.css
@@ -178,10 +178,17 @@
}
/* OVERRIDDEN BY COMPLIANT BROWSERS */
+/* ashley 21 June 2015: maybe not? anyway, this was breaking the little arrow
+icon next to the "More" menu, hence why it's now commented out
div.vectorMenu h3 a,
div.vectorMenu h5 a {
- /* @embed */
background-image: url('dark/tab-break.png');
+}
+*/
+
+/* Make the text for the "More [actions]" menu more readable */
+div.vectorMenu h3 span {
+ color: inherit;
}
/* Search */
@@ -192,6 +199,21 @@
}
div#simpleSearch input#searchInput {
+ color: #e0e0e0;
+}
+
+/**
+ * Make the search box placeholder text a tad bit lighter
+ * It's beyond stupid that these rules cannot be combined into one...browsers,
+ * why must you be so random?!
+ */
+div#simpleSearch #searchInput.placeholder {
+ color: #e0e0e0;
+}
+div#simpleSearch :-ms-input-placeholder#searchInput {
+ color: #e0e0e0;
+}
+div#simpleSearch :-moz-placeholder#searchInput {
color: #e0e0e0;
}
@@ -218,10 +240,11 @@
padding: 0;
}
+/* ashley 21 June 2015: this doesn't look good anymore, so removing it
div#mw-panel div.portal div.body {
- /* @embed */
background-image: url('dark/portal-break.png');
}
+*/
div#mw-panel div.portal div.body ul li a {
color: #F4F26B;
--
To view, visit https://gerrit.wikimedia.org/r/224961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0e21ca2e18268b4b5d77d5f95e3f0b698bd80ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: Paladox
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Update module name usage - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Update module name usage
..
Hygiene: Update module name usage
mobile.contentOverlays/PointerOverlay is the new
modules/tutorials/PageActionOverlay
Change-Id: I54f3d8dde7fe8d8c485f8fa072c1d9436ffd4f1b
---
M resources/ext.gather.init/init.js
M resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Robmoen: 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 4adf3a4..b0ebb28 100644
--- a/resources/ext.gather.init/init.js
+++ b/resources/ext.gather.init/init.js
@@ -5,7 +5,7 @@
bucket, useGatherStar,
CollectionsWatchstar = M.require(
'ext.gather.watchstar/CollectionsWatchstar' ),
Watchstar = M.require( 'mobile.watchstar/Watchstar' ),
- PageActionOverlay = M.require(
'modules/tutorials/PageActionOverlay' ),
+ PageActionOverlay = M.require(
'mobile.contentOverlays/PointerOverlay' ),
WatchstarPageActionOverlay = M.require(
'ext.gather.watchstar/WatchstarPageActionOverlay' ),
Tag = M.require( 'ext.gather.watchstar/Tag' ),
settings = M.require( 'settings' ),
diff --git a/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
b/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
index 2210478..283a2f7 100644
--- a/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
+++ b/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
@@ -2,7 +2,7 @@
var
SchemaGather = M.require( 'ext.gather.logging/SchemaGather' ),
schema = new SchemaGather(),
- PageActionOverlay = M.require(
'modules/tutorials/PageActionOverlay' ),
+ PageActionOverlay = M.require(
'mobile.contentOverlays/PointerOverlay' ),
WatchstarPageActionOverlay;
WatchstarPageActionOverlay = PageActionOverlay.extend( {
--
To view, visit https://gerrit.wikimedia.org/r/223310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I54f3d8dde7fe8d8c485f8fa072c1d9436ffd4f1b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: BarryTheBrowserTestBot
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change to less in vector - change (mediawiki...Theme)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224960
Change subject: Change to less in vector
..
Change to less in vector
* Since mediawiki 1.22 vector has been using less which makes it easer to
change the css.
* Update some of the code to use some newer code from vector.
* Update code to use less.
Change-Id: Ib2a808e62aad7f6d29f7992a314d864669e9ddf7
---
M Theme.php
M monobook/dark.css
R vector/dark.less
M vector/dark/arrow-down-icon.png
A vector/dark/arrow-down-icon.svg
M vector/dark/bullet-icon.png
A vector/dark/bullet-icon.svg
M vector/dark/page-base.png
M vector/dark/page-fade.png
M vector/dark/portal-break.png
M vector/dark/preferences-break.png
M vector/dark/preferences-fade.png
M vector/dark/search-fade.png
M vector/dark/search-ltr.png
A vector/dark/search-ltr.svg
A vector/dark/search-rtl.png
A vector/dark/search-rtl.svg
M vector/dark/tab-break.png
M vector/dark/tab-current-fade.png
M vector/dark/tab-normal-fade.png
20 files changed, 138 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme
refs/changes/60/224960/1
diff --git a/Theme.php b/Theme.php
index 6216fc1..cbd7165 100644
--- a/Theme.php
+++ b/Theme.php
@@ -4,7 +4,7 @@
*
* @file
* @ingroup Extensions
- * @version 1.7
+ * @version 1.7.1
* @author Ryan Schmidt
* @author Jack Phoenix
* @license https://en.wikipedia.org/wiki/Public_domain Public domain
@@ -18,7 +18,7 @@
// Extension credits that will show up on Special:Version
$wgExtensionCredits['other'][] = array(
'name' => 'Theme',
- 'version' => '1.7',
+ 'version' => '1.7.1',
'author' => array( 'Ryan Schmidt', 'Jack Phoenix' ),
'description' => 'Theme loader extension for skins',
'url' => 'https://www.mediawiki.org/wiki/Extension:Theme'
@@ -64,13 +64,12 @@
'styles' => array(
'extensions/Theme/monobook/stellarbook.css' => array( 'media'
=> 'screen' )
)
-
);
// Vector
$wgResourceModules['themeloader.skins.vector.dark'] = array(
'styles' => array(
- 'extensions/Theme/vector/dark.css' => array( 'media' =>
'screen' )
+ 'extensions/Theme/vector/dark.less' => array( 'media' =>
'screen' )
)
);
diff --git a/monobook/dark.css b/monobook/dark.css
index 9c8a82d..293c2ab 100644
--- a/monobook/dark.css
+++ b/monobook/dark.css
@@ -2,7 +2,7 @@
** Dark theme for MonoBook
** Originally from ZeldaWiki.org and modified by Skizzerz
for ShoutWiki
**
-** @date 14 September 2011
+** @date 1 November 2014
*/
div#content {
background: #1c3855;
@@ -313,7 +313,7 @@
/* also used on Special:Version */
table.wikitable {
- background-color: transparent;
+ background-color: transparent !important;
color: #d2d2d2;
}
@@ -424,4 +424,14 @@
td.diff-context {
background-color: transparent !important;
color: #d2d2d2;
+}
+
+/**
+ * This class appears to be the new version of TablePager, I guess?
+ * Everywhere where I see that this is used, the element also has the
TablePager
+ * class, but all CSS definitions are on this class and its children.
+ * Anyway, Special:ListFiles, Special:AbuseFilter, etc. use this class.
+ */
+table.mw-datatable th, table.mw-datatable tr:hover td, table.mw-datatable td {
+ background-color: transparent;
}
\ No newline at end of file
diff --git a/vector/dark.css b/vector/dark.less
similarity index 89%
rename from vector/dark.css
rename to vector/dark.less
index fe133ea..ded656b 100644
--- a/vector/dark.css
+++ b/vector/dark.less
@@ -5,13 +5,16 @@
** @date 14 January 2014
** @see
http://zeldawiki.org/index.php?title=MediaWiki:Vector.css&action=history
*/
+
+@import "mediawiki.mixins";
+
/* Framework */
body {
background-color: #0b284f;
}
/* Content */
-div#content {
+div.mw-body {
border: 1px solid #426787;
border-right-width: 0;
/* The following rule overrides ShoutWikiAds' vector-skyscraper-ad.css
*/
@@ -28,9 +31,9 @@
/* Head */
div#mw-page-base {
- background-color: #17456E;
+ background-color: #17456E !important;
/* @embed */
- background-image: url(dark/page-fade.png);
+ background-image: url('dark/page-fade.png') !important;
}
/* Link colors */
@@ -178,10 +181,17 @@
}
/* OVERRIDDEN BY COMPLIANT BROWSERS */
+/* ashley 21 June 2015: maybe not? anyway, this was breaking the little arrow
+icon next to the "More" menu, hence why it's now commented out
div.vectorMenu h3 a,
div.vectorMenu h5 a {
- /* @embed */
background-image: url('dark/tab-break.png');
+}
+*/
+
+/* Make the text for the "More [actions]" menu more readable */
+div.vectorMenu h3 span {
+ color: inherit;
}
/* Search */
@@ -195,6 +205,21 @@
color: #e0e0e0;
}
+/**
+ * Make the search box placeholder text a tad bit lighter
+ * It's beyond stupid that th
[MediaWiki-commits] [Gerrit] Render collections via template - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Render collections via template
..
Render collections via template
Move logic into templates
Bug: T104737
Change-Id: I043ecbbeb745dd175e1e47747010f926fd4f768f
---
M includes/views/CollectionItemCard.php
A templates/CollectionItemCard.mustache
A templates/compiled/CollectionItemCard.mustache.php
3 files changed, 81 insertions(+), 42 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/views/CollectionItemCard.php
b/includes/views/CollectionItemCard.php
index 8098592..6afb67d 100644
--- a/includes/views/CollectionItemCard.php
+++ b/includes/views/CollectionItemCard.php
@@ -9,6 +9,7 @@
use Gather\views\helpers\CSS;
use Html;
use Linker;
+use Gather\views\helpers\Template;
/**
* View for an item card in a mobile collection.
@@ -52,50 +53,27 @@
$pageUrl = $title->getLocalUrl();
$isMissing = $item->isMissing();
- if ( $img ) {
- $img = Html::openElement( 'a', array( 'href' =>
$title->getLocalUrl() ) ) .
- $img .
- Html::closeElement( 'a' );
- }
- $html = Html::openElement( 'div', array( 'class' =>
'collection-card' ) ) .
- $img .
- Html::openElement( 'h2', array( 'class' =>
'collection-card-title', 'dir' => $dir ) ) .
- Html::element( 'a', array( 'href' => $pageUrl, 'class'
=> $isMissing ? 'new' : '' ),
- $title->getPrefixedText() ) .
- Html::closeElement( 'h2' );
+ $data = array(
+ 'dir' => $dir,
+ 'page' => array(
+ 'url' => $pageUrl,
+ 'displayTitle' => $title->getPrefixedText(),
+ ),
+ 'msgMissing' => wfMessage( 'gather-page-not-found'
)->escaped(),
+ 'isMissing' => $isMissing,
+ 'progressiveAnchorClass' => CSS::anchorClass(
'progressive' ),
+ 'iconClass' => CSS::iconClass(
+ 'collections-read-more', 'element',
'collections-read-more-arrow'
+ ),
+ );
+
// Handle excerpt for titles with an extract or unknown pages
- if ( $item->hasExtract() || $isMissing ) {
- if ( $item->hasExtract() ) {
- $itemExcerpt = $item->getExtract();
- } elseif ( $isMissing ) {
- $itemExcerpt = wfMessage(
'gather-page-not-found' )->escaped();
- }
- $html .= Html::element(
- 'p', array( 'class' =>
'collection-card-excerpt', 'dir' => $dir ), $itemExcerpt
- );
+ if ( $item->hasExtract() ) {
+ $data['extract'] = $item->getExtract();
}
-
- if ( !$isMissing ) {
- $html .= Html::openElement( 'div', array( 'class' =>
'collection-card-footer' ) )
- . Html::openElement( 'a',
- array(
- 'href' => $pageUrl,
- 'class' => CSS::anchorClass(
'progressive' )
- )
- )
- . wfMessage( 'gather-read-more' )->escaped()
- . Html::element(
- 'span',
- array( 'class' => CSS::iconClass(
- 'collections-read-more',
'element', 'collections-read-more-arrow'
- ) ),
- ''
- )
- . Html::closeElement( 'a' )
- . Html::closeElement( 'div' );
+ if ( $img ) {
+ $data['cardImage'] = $img;
}
- $html .= Html::closeElement( 'div' );
-
- return $html;
+ return Template::render( 'CollectionItemCard', $data );
}
}
diff --git a/templates/CollectionItemCard.mustache
b/templates/CollectionItemCard.mustache
new file mode 100644
index 000..0f41869
--- /dev/null
+++ b/templates/CollectionItemCard.mustache
@@ -0,0 +1,23 @@
+
+ {{#cardImage}}
+ {{{cardImage}}}
+ {{/cardImage}}
+
+ {{#page}}
+ {{displayTitle}}
+ {{/page}}
+
+ {{#extract}}
+ {
