[MediaWiki-commits] [Gerrit] Fix xml dump gen to use textlib correctly - change (pywikibot/core)
Eranroz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206355
Change subject: Fix xml dump gen to use textlib correctly
..
Fix xml dump gen to use textlib correctly
Addressing the following issues:
* sending correct parameters to replaceExcept in
the correct order (e.g site)
* using the exceptions of the replacement to avoid generation of
non putative replacements
Change-Id: I5262878d096dd0b25dc22d77337aa5e351e0cbda
---
M scripts/replace.py
1 file changed, 16 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/55/206355/1
diff --git a/scripts/replace.py b/scripts/replace.py
index 19a7855..f78ba77 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -343,23 +343,28 @@
def __iter__(self):
Iterator method.
+def get_exceptions(exceptions):
+return exceptions.get('inside-tags', []) +
exceptions.get('inside', [])
try:
for entry in self.parser:
if self.skipping:
if entry.title != self.xmlStart:
continue
self.skipping = False
-if not self.isTitleExcepted(entry.title) \
-and not self.isTextExcepted(entry.text):
-new_text = entry.text
-for replacement in self.replacements:
-# This doesn't do an actual replacement but just
-# checks if at least one does apply
-new_text = textlib.replaceExcept(
-new_text, replacement.old_regex, replacement.new,
-self.excsInside, self.site)
-if new_text != entry.text:
-yield pywikibot.Page(self.site, entry.title)
+if self.isTitleExcepted(entry.title) \
+or self.isTextExcepted(entry.text):
+continue
+new_text = entry.text
+for replacement in self.replacements:
+# This doesn't do an actual replacement but just
+# checks if at least one does apply
+new_text = textlib.replaceExcept(
+new_text, replacement.old_regex, replacement.new,
+self.excsInside +
get_exceptions(replacement.exceptions or {}),
+site=self.site)
+if new_text != entry.text:
+yield pywikibot.Page(self.site, entry.title)
+
except KeyboardInterrupt:
try:
if not self.skipping:
--
To view, visit https://gerrit.wikimedia.org/r/206355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5262878d096dd0b25dc22d77337aa5e351e0cbda
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Eranroz eranro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix UnboundLocalError - change (pywikibot/core)
Eranroz has uploaded a new change for review. https://gerrit.wikimedia.org/r/206356 Change subject: Fix UnboundLocalError .. Fix UnboundLocalError In python3 there may be UnboundLocalError in case of exception during save Change-Id: I8ae74d00b63bc20b2eed511687a4feb3bc2e58ca --- M pywikibot/page.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/56/206356/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index e089fc2..6e45c69 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1057,7 +1057,8 @@ else: pywikibot.output(uPage %s saved % link) # TODO: other expected error types to catch? -except pywikibot.Error as err: +except pywikibot.Error as edit_err: +err = edit_err pywikibot.log(uError saving page %s (%s)\n % (link, err), exc_info=True) if not callback and not async: -- To view, visit https://gerrit.wikimedia.org/r/206356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ae74d00b63bc20b2eed511687a4feb3bc2e58ca Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Eranroz eranro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve Makefile.py for zhtable - change (mediawiki/core)
Nikerabbit has submitted this change and it was merged. Change subject: Improve Makefile.py for zhtable .. Improve Makefile.py for zhtable * Fix incorrect parsing of phrases with spaces in them by using tabs as separators only in *.manual * Make the order of items in PHP array output more stable, so contribs from different people don't conflict with each other * Include version number in file name of Unihan database, so existing old file doesn't prevent downloading of a newer version of Unihan Change-Id: Ifb6b33b937a7b82218172e3fdd937bda4ea4cc6c --- M includes/ZhConversion.php M maintenance/language/zhtable/Makefile.py M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/toTrad.manual M maintenance/language/zhtable/trad2simp.manual 7 files changed, 397 insertions(+), 396 deletions(-) Approvals: Nikerabbit: Looks good to me, approved Chiefwei: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index b05c219..ba9f448 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -3000,10 +3000,10 @@ '뛢' = '鸋', '뛶' = '鶒', '뛸' = '鶗', -'0出現' = '0出現', '0出现' = '0出現', -'0出线' = '0出線', +'0出現' = '0出現', '0出線' = '0出線', +'0出线' = '0出線', '0只支持' = '0只支持', '0只支援' = '0只支援', '0周后' = '0周後', @@ -3219,8 +3219,8 @@ '不吊' = '不弔', '不卷' = '不捲', '不采' = '不採', -'不斗膽' = '不斗膽', '不斗胆' = '不斗膽', +'不斗膽' = '不斗膽', '不断发' = '不斷發', '不每只' = '不每只', '不谷' = '不穀', @@ -3281,16 +3281,15 @@ '丰南' = '丰南', '丰姿' = '丰姿', '丰容' = '丰容', -'丰度' = '丰度', '丰情' = '丰情', '丰标' = '丰標', -'丰標不凡' = '丰標不凡', '丰标不凡' = '丰標不凡', +'丰標不凡' = '丰標不凡', '丰神' = '丰神', '丰茸' = '丰茸', '丰采' = '丰采', -'丰韻' = '丰韻', '丰韵' = '丰韻', +'丰韻' = '丰韻', '丹棱' = '丹稜', '主仆' = '主僕', '主干' = '主幹', @@ -3328,12 +3327,10 @@ '九扎' = '九紮', '九只' = '九隻', '九余' = '九餘', -'干上' = '乾上', '干干' = '乾乾', '干干净净' = '乾乾淨淨', -'干了' = '乾了', '干井' = '乾井', -'干个' = '乾個', +'干个够' = '乾個夠', '干儿' = '乾兒', '干冰' = '乾冰', '干冷' = '乾冷', @@ -3368,7 +3365,6 @@ '干巴' = '乾巴', '干式' = '乾式', '干弟' = '乾弟', -'干得' = '乾得', '干急' = '乾急', '干性' = '乾性', '干打雷' = '乾打雷', @@ -3500,8 +3496,8 @@ '二缶钟惑' = '二缶鐘惑', '二老板' = '二老板', '二虎相斗' = '二虎相鬥', -'二里頭' = '二里頭', '二里头' = '二里頭', +'二里頭' = '二里頭', '二只' = '二隻', '二余' = '二餘', '于丹' = '于丹', @@ -3510,13 +3506,13 @@ '于仲文' = '于仲文', '于佳卉' = '于佳卉', '于来山' = '于來山', -'于偉國' = '于偉國', '于伟国' = '于偉國', +'于偉國' = '于偉國', '于光新' = '于光新', '于光远' = '于光遠', '于光遠' = '于光遠', -'于克-蘭多縣' = '于克-蘭多縣', '于克-兰多县' = '于克-蘭多縣', +'于克-蘭多縣' = '于克-蘭多縣', '于克勒' = '于克勒', '于再清' = '于再清', '于冕' = '于冕', @@ -3527,18 +3523,18 @@ '于化虎' = '于化虎', '于占元' = '于占元', '于友泽' = '于友澤', -'于台煙' = '于台煙', '于台烟' = '于台煙', +'于台煙' = '于台煙', '于右任' = '于右任', '于吉' = '于吉', '于和伟' = '于和偉', '于品海' = '于品海', '于国桢' = '于國楨', '于國楨' = '于國楨', -'于國治' = '于國治', '于国治' = '于國治', -'于堅' = '于堅', +'于國治' = '于國治', '于坚' = '于堅', +'于堅' = '于堅', '于大宝' = '于大寶', '于大寶' = '于大寶', '于天仁' = '于天仁', @@ -3550,8 +3546,8 @@ '于娟' = '于娟', '于子千' = '于子千', '于孔兼' = '于孔兼', -'于學忠' = '于學忠', '于学忠' = '于學忠', +'于學忠' = '于學忠', '于家堡' = '于家堡', '于寘' = '于寘', '于宝轩' = '于寶軒', @@ -3561,10 +3557,10 @@ '于小惠' = '于小惠', '于少保' = '于少保', '于山' = '于山', -'于山國' = '于山國', '于山国' = '于山國', -'于帥' = '于帥', +'于山國' = '于山國', '于帅' = '于帥', +'于帥' = '于帥', '于幼军' = '于幼軍', '于幼軍' = '于幼軍', '于康震' = '于康震', @@ -3580,16 +3576,16 @@ '于思' = '于思', '于慎行' = '于慎行', '于慧' = '于慧', -'于成龙' = '于成龍', '于成龍' = '于成龍', +'于成龙' = '于成龍', '于振' = '于振', '于振武' = '于振武', '于敏' = '于敏', '于敏中' = '于敏中', '于斌' = '于斌', '于斯塔德' = '于斯塔德', -'于斯纳尔斯贝里' = '于斯納爾斯貝里', '于斯納爾斯貝里' = '于斯納爾斯貝里', +'于斯纳尔斯贝里' = '于斯納爾斯貝里', '于斯达尔' = '于斯達爾', '于斯達爾' = '于斯達爾', '于明涛' = '于明濤', @@ -3597,8 +3593,8 @@ '于是之' = '于是之', '于晨楠' = '于晨楠', '于晴' = '于晴', -'于會泳' = '于會泳', '于会泳' = '于會泳', +'于會泳' = '于會泳', '于根伟' = '于根偉', '于根偉' = '于根偉', '于格' = '于格', @@ -3606,8 +3602,8 @@ '于楓' = '于楓', '于荣光' = '于榮光', '于樂' = '于樂', -'于樹潔' = '于樹潔', '于树洁' = '于樹潔', +'于樹潔' = '于樹潔', '于欣' = '于欣', '于欣源' = '于欣源', '于正昇' = '于正昇', @@ -3618,25 +3614,25 @@ '于江震' = '于江震', '于波' = '于波', '于洋' = '于洋', -'于洪區' = '于洪區', '于洪区' = '于洪區', +'于洪區' = '于洪區', '于浩威' = '于浩威', '于海' = '于海', '于海洋' = '于海洋', '于湘兰' = '于湘蘭', '于湘蘭' = '于湘蘭', -'于漢超' = '于漢超', '于汉超' = '于漢超', +'于漢超' = '于漢超', '于澄' = '于澄', -'于澤爾' = '于澤爾', '于泽尔' = '于澤爾', -'于濤' = '于濤', +'于澤爾' = '于澤爾', '于涛' = '于濤', +'于濤' = '于濤', '于熙珍' = '于熙珍', '于尔岑' = '于爾岑', '于爾岑' = '于爾岑', -'于爾根' = '于爾根', '于尔根' = '于爾根', +'于爾根' = '于爾根', '于尔里克' = '于爾里克', '于爾里克' = '于爾里克', '于特森' = '于特森', @@ -3656,8 +3652,8 @@ '于謙' = '于謙', '于谦' = '于謙', '于谨' = '于謹', -'于贝尔' = '于貝爾', '于貝爾' = '于貝爾', +'于贝尔' = '于貝爾', '于贈' = '于贈', '于赠' = '于贈', '于越' = '于越', @@ -3666,8 +3662,8 @@ '于道泉' = '于道泉', '于远伟' = '于遠偉', '于遠偉' = '于遠偉', -'于都縣' = '于都縣', '于都县' = '于都縣', +'于都縣' = '于都縣', '于里察' = '于里察', '于阗' = '于闐', '于双戈' = '于雙戈', @@ -3680,10 +3676,10 @@ '于靖' = '于靖', '于非暗' = '于非闇', '于非闇' = '于非闇', -'于韦斯屈莱' = '于韋斯屈萊',
[MediaWiki-commits] [Gerrit] Replace deprecated configuration variable $wgSpecialPageGroups - change (mediawiki...ApiSandbox)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated configuration variable $wgSpecialPageGroups
..
Replace deprecated configuration variable $wgSpecialPageGroups
With the getGroupName() method overridden for SpecialApiSandbox.
Change-Id: I9d25930fbce6342eea1ff4589380ba269a0a7f5f
---
M ApiSandbox.php
M SpecialApiSandbox.php
M extension.json
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiSandbox.php b/ApiSandbox.php
index be7bf9f..8774c2e 100644
--- a/ApiSandbox.php
+++ b/ApiSandbox.php
@@ -22,7 +22,6 @@
$wgAutoloadClasses['ApiSandboxHooks'] = __DIR__ . '/ApiSandbox.hooks.php';
$wgSpecialPages['ApiSandbox'] = 'SpecialApiSandbox';
-$wgSpecialPageGroups['ApiSandbox'] = 'wiki';
$wgResourceModules['ext.apiSandbox'] = array(
'scripts' = array(
diff --git a/SpecialApiSandbox.php b/SpecialApiSandbox.php
index 2ee8d63..e0ab433 100644
--- a/SpecialApiSandbox.php
+++ b/SpecialApiSandbox.php
@@ -13,6 +13,10 @@
parent::__construct( 'ApiSandbox' );
}
+ protected function getGroupName() {
+ return 'wiki';
+ }
+
/**
* Main execution function
* @param $par string|null Parameters passed to the page
diff --git a/extension.json b/extension.json
index 17d3457..c79f409 100644
--- a/extension.json
+++ b/extension.json
@@ -57,9 +57,6 @@
localBasePath: resources,
remoteExtPath: ApiSandbox/resources
},
- SpecialPageGroups: {
- ApiSandbox: wiki
- },
SpecialPages: {
ApiSandbox: SpecialApiSandbox
},
--
To view, visit https://gerrit.wikimedia.org/r/205985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d25930fbce6342eea1ff4589380ba269a0a7f5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Add ceb, it and war in source languages - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: CX: Add ceb, it and war in source languages .. CX: Add ceb, it and war in source languages Bug: T97114 Change-Id: I73d9b859784092d4114e997773e6ab6ce67ea31e --- M hieradata/common/cxserver.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index f6b6197..b3dd82f 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -6,6 +6,7 @@ - 'ba' - 'bg' - 'ca' +- 'ceb' - 'cv' - 'da' - 'en' @@ -17,6 +18,7 @@ - 'gl' - 'gu' - 'id' +- 'it' - 'kn' - 'koi' - 'kv' @@ -46,6 +48,7 @@ - 'uk' - 'uz' - 'vi' +- 'war' - 'xh' target: - 'af' -- To view, visit https://gerrit.wikimedia.org/r/206360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73d9b859784092d4114e997773e6ab6ce67ea31e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: add metrics queued to graphite dashboard - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: gdash: add metrics queued to graphite dashboard .. gdash: add metrics queued to graphite dashboard Change-Id: Ie1c1ed47cf036a29b61e851258ec9a7207f9771e --- M files/gdash/dashboards/graphite/carbon_c_relay.graph 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/files/gdash/dashboards/graphite/carbon_c_relay.graph b/files/gdash/dashboards/graphite/carbon_c_relay.graph index 5f982d6..e5ba366 100644 --- a/files/gdash/dashboards/graphite/carbon_c_relay.graph +++ b/files/gdash/dashboards/graphite/carbon_c_relay.graph @@ -10,8 +10,16 @@ field :queue_drops_frontend, :alias = queue drops (frontend), - :data = derivative(carbon.relays.graphite1001_frontend.metricsDropped) + :data = secondYAxis(carbon.relays.graphite1001_frontend.metricsDropped) field :queue_drops_local, :alias = queue drops (local), - :data = derivative(carbon.relays.graphite1001_local.metricsDropped) + :data = secondYAxis(carbon.relays.graphite1001_local.metricsDropped) + +field :metrics_queued_frontend, + :alias = metrics queued (frontend), + :data = carbon.relays.graphite1001_frontend.metricsQueued + +field :metrics_queued_local, + :alias = metrics queued (local), + :data = carbon.relays.graphite1001_local.metricsQueued -- To view, visit https://gerrit.wikimedia.org/r/206370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1c1ed47cf036a29b61e851258ec9a7207f9771e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: add metrics queued to graphite dashboard - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/206370 Change subject: gdash: add metrics queued to graphite dashboard .. gdash: add metrics queued to graphite dashboard Change-Id: Ie1c1ed47cf036a29b61e851258ec9a7207f9771e --- M files/gdash/dashboards/graphite/carbon_c_relay.graph 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/70/206370/1 diff --git a/files/gdash/dashboards/graphite/carbon_c_relay.graph b/files/gdash/dashboards/graphite/carbon_c_relay.graph index 5f982d6..e5ba366 100644 --- a/files/gdash/dashboards/graphite/carbon_c_relay.graph +++ b/files/gdash/dashboards/graphite/carbon_c_relay.graph @@ -10,8 +10,16 @@ field :queue_drops_frontend, :alias = queue drops (frontend), - :data = derivative(carbon.relays.graphite1001_frontend.metricsDropped) + :data = secondYAxis(carbon.relays.graphite1001_frontend.metricsDropped) field :queue_drops_local, :alias = queue drops (local), - :data = derivative(carbon.relays.graphite1001_local.metricsDropped) + :data = secondYAxis(carbon.relays.graphite1001_local.metricsDropped) + +field :metrics_queued_frontend, + :alias = metrics queued (frontend), + :data = carbon.relays.graphite1001_frontend.metricsQueued + +field :metrics_queued_local, + :alias = metrics queued (local), + :data = carbon.relays.graphite1001_local.metricsQueued -- To view, visit https://gerrit.wikimedia.org/r/206370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1c1ed47cf036a29b61e851258ec9a7207f9771e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make OutputPageBeforeHTMLHookHandler an own class, add tests - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206366
Change subject: Make OutputPageBeforeHTMLHookHandler an own class, add tests
..
Make OutputPageBeforeHTMLHookHandler an own class, add tests
Change-Id: I31f3a08da96d2e9ac8d19d53e1a8e47e7495d43e
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
A repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
A repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
4 files changed, 243 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/66/206366/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 56c3769..5ece95c 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -24,15 +24,10 @@
use SpecialSearch;
use Title;
use User;
-use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Repo\BabelUserLanguageLookup;
use Wikibase\Repo\Content\EntityHandler;
use Wikibase\Repo\Hooks\OutputPageEntityIdReader;
use Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\View\EntityViewPlaceholderExpander;
-use Wikibase\View\Template\TemplateFactory;
-use Wikibase\View\TextInjector;
use WikiPage;
/**
@@ -900,53 +895,6 @@
$titleText = $parserOutput-getExtensionData(
'wikibase-titletext' );
if ( $titleText !== null ) {
$out-setProperty( 'wikibase-titletext', $titleText );
- }
-
- return true;
- }
-
- /**
-* Called when pushing HTML from the ParserOutput into OutputPage.
-* Used to expand any placeholders in the OutputPage's
'wb-placeholders' property
-* in the HTML.
-*
-* @param OutputPage $out
-* @param string $html the HTML to mangle
-*
-* @return bool
-*/
- public static function onOutputPageBeforeHTML( OutputPage $out, $html
) {
- $placeholders = $out-getProperty( 'wikibase-view-chunks' );
-
- if ( !empty( $placeholders ) ) {
- $injector = new TextInjector( $placeholders );
- $templateFactory =
TemplateFactory::getDefaultInstance();
- $userLanguageLookup = new BabelUserLanguageLookup();
- $termsLanguages =
WikibaseRepo::getDefaultInstance()-getTermsLanguages();
- $expander = new EntityViewPlaceholderExpander(
- $templateFactory,
- $out-getTitle(),
- $out-getUser(),
- $out-getLanguage(),
-
WikibaseRepo::getDefaultInstance()-getEntityIdParser(),
-
WikibaseRepo::getDefaultInstance()-getEntityRevisionLookup(),
- $userLanguageLookup,
-
WikibaseRepo::getDefaultInstance()-getTermsLanguages(),
- new LanguageNameLookup()
- );
-
- $html = $injector-inject( $html, array( $expander,
'getHtmlForPlaceholder' ) );
-
- $out-addJsConfigVars(
- 'wbUserSpecifiedLanguages',
- // All user-specified languages, that are valid
term languages
- // Reindex the keys so that javascript still
works if an unknown
- // language code in the babel box causes an
index to miss
- array_values( array_intersect(
-
$userLanguageLookup-getUserSpecifiedLanguages( $out-getUser() ),
- $termsLanguages-getLanguages()
- ) )
- );
}
return true;
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 25aea06..9c79129 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -221,7 +221,7 @@
$wgHooks['SpecialPage_reorderPages'][] =
'Wikibase\RepoHooks::onSpecialPage_reorderPages';
$wgHooks['OutputPageParserOutput'][]=
'Wikibase\RepoHooks::onOutputPageParserOutput';
$wgHooks['ContentModelCanBeUsedOn'][] =
'Wikibase\RepoHooks::onContentModelCanBeUsedOn';
- $wgHooks['OutputPageBeforeHTML'][] =
'Wikibase\RepoHooks::onOutputPageBeforeHTML';
+ $wgHooks['OutputPageBeforeHTML'][] =
'Wikibase\Repo\Hooks\OutputPageBeforeHTMLHookHandler::onOutputPageBeforeHTML';
$wgHooks['OutputPageBeforeHTML'][] =
'Wikibase\RepoHooks::onOutputPageBeforeHtmlRegisterConfig';
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-04-24T10:00:02+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/206367 Change subject: New Wikidata Build - 2015-04-24T10:00:02+ .. New Wikidata Build - 2015-04-24T10:00:02+ Change-Id: I8aae4be280401f674904667d2990d69d2e26467c --- M composer.lock M extensions/Wikibase/client/i18n/ast.json M extensions/Wikibase/client/i18n/ckb.json M extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php M extensions/Wikibase/lib/i18n/ckb.json M extensions/Wikibase/repo/config/Wikibase.default.php M extensions/Wikibase/repo/config/Wikibase.example.php M extensions/Wikibase/repo/i18n/es.json M extensions/Wikibase/repo/i18n/it.json M extensions/Wikibase/repo/i18n/ko.json M extensions/Wikibase/repo/i18n/lt.json M extensions/Wikibase/repo/i18n/ta.json M extensions/Wikibase/repo/i18n/yi.json M extensions/Wikibase/repo/i18n/zh-hans.json M extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php M extensions/Wikibase/repo/includes/rdf/ComplexValueRdfBuilder.php M extensions/Wikibase/repo/includes/rdf/FullStatementRdfBuilder.php M extensions/Wikibase/repo/includes/rdf/RdfBuilder.php M extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php M extensions/Wikibase/repo/includes/rdf/TruthyStatementRdfBuilder.php M extensions/Wikibase/repo/includes/specials/SpecialItemByTitle.php M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_minimal.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q6_no_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q6_with_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_all_refs_seen.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_no_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_all_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_claims.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_props.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_resolved.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_truthy_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_values.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q6_no_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q6_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_no_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_references.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q8.json M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q8_baddates.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/TruthyStatementRdfBuilder/Q4_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/dump_entities.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/dump_refs.nt M extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/rdf/SimpleValueRdfBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php M extensions/Wikibase/view/src/EntityViewFactory.php M vendor/composer/installed.json 53 files changed, 737 insertions(+), 625 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/67/206367/1 -- To view, visit https://gerrit.wikimedia.org/r/206367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8aae4be280401f674904667d2990d69d2e26467c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: WikidataBuilder wikidata-servi...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:CXStats - use same full screen layout of Special:CX - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206373
Change subject: Special:CXStats - use same full screen layout of Special:CX
..
Special:CXStats - use same full screen layout of Special:CX
Also add a campaign(id: cxstats) to enable CX beta feature for those
who did not enable it already.
All campaigns are with eventlogging tooling
Change-Id: Ic7eb77b36eb07e98bb10b5d5e883125a7802a1f4
---
M ContentTranslation.php
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/stats/ext.cx.stats.js
M modules/stats/styles/ext.cx.stats.less
M specials/SpecialContentTranslationStats.php
7 files changed, 69 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/73/206373/1
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 149c0a3..9687023 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -146,8 +146,8 @@
*/
$GLOBALS['wgContentTranslationTargetNamespace'] = 'Main';
-// List of campaigns enabled. Available campaigns: 'newarticle'
-$GLOBALS['wgContentTranslationCampaigns'] = array();
+// List of campaigns enabled. Available campaigns: 'newarticle', 'cxstats'
+$GLOBALS['wgContentTranslationCampaigns'] = array('cxstats');
/*
* Whether the Magnus tool to find missing articles to be enabled or not.
diff --git a/Resources.php b/Resources.php
index 906f6a7..268d835 100644
--- a/Resources.php
+++ b/Resources.php
@@ -686,6 +686,7 @@
'cx-stats-published-translators-title',
'cx-trend-all-translations',
'cx-trend-translations-to',
+ 'cx-stats-try-contenttranslation',
)
) + $resourcePaths;
diff --git a/i18n/en.json b/i18n/en.json
index c4ac923..b2edbe8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -173,5 +173,6 @@
cx-campaign-contributionsmenu-mytranslations: Translations,
cx-campaign-contributionsmenu-myuploads: Uploaded media,
cx-trend-all-translations: All translations,
- cx-trend-translations-to: Translations to $1 language
+ cx-trend-translations-to: Translations to $1 language,
+ cx-stats-try-contenttranslation: Content Translation is a tool to
create new pages by translating from other languages. [$1 Try Content
Translation]
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d07b425..499f9b4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -177,5 +177,6 @@
cx-campaign-contributionsmenu-mytranslations: Menu item for menu
shown while hovering the contributions link in personal toolbar. Points to the
Content Translation dashboard\n{{Identical|Translation}},
cx-campaign-contributionsmenu-myuploads: Menu item for menu shown
while hovering the contributions link in personal toolbar. Points to the
Special:MyUploads in commons,
cx-trend-all-translations: Label shown in the legend section Content
translation trends(graph visualization),
- cx-trend-translations-to: Label shown in the legend section Content
translation trends(graph visualization)\n$1 - language name
+ cx-trend-translations-to: Label shown in the legend section Content
translation trends(graph visualization)\n$1 - language name,
+ cx-stats-try-contenttranslation: A message shown in
[[Special:CXStats]] for users not enabled Content Translation . \n$1 - link to
enable Content Translation beta featue and go to Content Translation dashboard
}
diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js
index e9e7121..be6675b 100644
--- a/modules/stats/ext.cx.stats.js
+++ b/modules/stats/ext.cx.stats.js
@@ -257,8 +257,28 @@
}
$( function () {
- var $canvas, ctx,
- $container = $( '#bodyContent' );
+ var $canvas, ctx, cxLink,
+ $header = $( 'div' ).addClass( 'cx-widget__header' ),
+ $container = $( 'div' ).addClass(
'cx-stats-container' );
+
+ // Set the global siteMapper for code which we cannot inject it
+ mw.cx.siteMapper = new mw.cx.SiteMapper( mw.config.get(
'wgContentTranslationSiteTemplates' ) );
+ $( 'body' ).append(
+ $( 'div' ).addClass( 'cx-widget' )
+ .append( $header, $container )
+ );
+ $header.cxHeader( mw.cx.siteMapper );
+
+ if ( mw.user.options.get( 'cx' ) !== '1' ) {
+ cxLink = mw.util.getUrl( 'Special:ContentTranslation', {
+ campaign: 'cxstats',
+ targettitle: mw.config.get( 'wgPageName' ),
+ to: mw.config.get( 'wgContentLanguage' )
+ } );
+
+ $( '.cx-header__bar' ).hide();
+ mw.hook( 'mw.cx.error' ).fire( mw.message(
[MediaWiki-commits] [Gerrit] Enable Browse experiment on labs - change (operations/mediawiki-config)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/206375 Change subject: Enable Browse experiment on labs .. Enable Browse experiment on labs Bug: T94739 Change-Id: I12bf47f934c9bf144b2f8e10c883533e3ae1f0f0 --- M wmf-config/mobile-labs.php 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/75/206375/1 diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php index 0ee675e..442a022 100644 --- a/wmf-config/mobile-labs.php +++ b/wmf-config/mobile-labs.php @@ -26,3 +26,15 @@ $wgMFWikiDataEndpoint = $wmgMFWikiDataEndpoint; $wgWikiBasePropertyConfig = $wmgWikiBasePropertyConfig; $wgMFInfoboxConfig = $wmgMFInfoboxConfig; + +$wgMFIsBrowseEnabled = true; +$wgMFBrowseTags = array( + Category:National_Basketball_Association_All-Stars = NBA All Stars, + Category:20th-century_American_politicians = American Politicians, + Category:Object-oriented_programming_languages = Object-Oriented Programming Languages, + Category:Western_Europe = European States, + Category:American_female_pop_singers = American Female Pop Singers, + Category:American_drama_television_series = American drama TV series, + Category:Modern_painters = Modern Painters, + Category:Landmarks_in_San_Francisco,_California = Landmarks in San Francisco, California, +); -- To view, visit https://gerrit.wikimedia.org/r/206375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12bf47f934c9bf144b2f8e10c883533e3ae1f0f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: partman for dm-cache - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: install-server: partman for dm-cache
..
install-server: partman for dm-cache
this partman recipe provides LVM over two hardware raid (ssd and hdd) to be
used with dm-cache for hybrid caching, see also T88992
Bug: T88994
Change-Id: If14f2dc0fd84347d362e7a958593d34b68b3cb5c
---
M modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
1 file changed, 45 insertions(+), 18 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Faidon Liambotis: Looks good to me, but someone else must approve
diff --git
a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
index 83b1d74..8e896b9 100644
--- a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
+++ b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
@@ -1,25 +1,30 @@
-# Automatic software RAID 10 with LVM partitioning
-# test dm-cache T88992
-#
+# use LVM and dm-cache to speed up read/write to spinning HDDs
+
+# expected hardware:
# * /dev/sda: db-class hw-raid10 spinning disks 1.7TB
# * /dev/sdb: hw-raid raid1 SSD 256GB
# * layout:
# - /boot: ext4 on ssd, no lvm
-# - two VG: data (hdd+ssd) and system (ssd)
+# - two VGs: vg-data (PV: sda+sdb) and vg-sys (PV: sdb)
# - swap: vg-sys 1GB
-# - /: vg-sys 20GB
+# - /: vg-sys 30GB
d-ipartman-auto/method string lvm
d-ipartman-md/device_remove_md boolean true
d-ipartman-lvm/device_remove_lvm boolean true
-d-ipartman-auto/disk string /dev/sda /dev/sdb
+# order is important, if not specified partitions get created on the first disk
+d-ipartman-auto/disk string /dev/sdb /dev/sda
+
+d-ipartman-auto/choose_recipe lvm
# Define physical partitions
+# regular partitions and partitions used in VGs first
+# then LVs
d-ipartman-auto/expert_recipe string \
- multiraid ::\
- 40 300 300 ext3 \
+ lvm :: \
+ 100 300 100 ext4\
$primary{ } \
$bootable{ }\
method{ format }\
@@ -29,12 +34,32 @@
mountpoint{ /boot } \
device{ /dev/sdb } \
. \
- 1000 8000 1000 linux-swap \
+ 4 4 4 ext4 \
+ $defaultignore{ } \
+ $primary{ } \
+ method{ lvm } \
+ device{ /dev/sdb } \
+ vg_name{ vg-sys } \
+ . \
+ 10 30 10 ext4 \
+ $primary{ } \
+ $defaultignore{ } \
+ method{ keep } \
+ device{ /dev/sdb } \
+ . \
+ 50 300 -1 ext4 \
+ $defaultignore{ } \
+ $primary{ } \
+ method{ lvm } \
+ device{ /dev/sda } \
+ vg_name{ vg-data } \
+ . \
+ 1000 1000 1000 linux-swap \
method{ swap } \
$lvmok{ } \
format{ } \
- device{ /dev/sdb } \
- vg_name{ vg-sys } \
+ in_vg{ vg-sys } \
+ lv_name{ swap } \
. \
3 3 3 ext4 \
$lvmok{ } \
@@ -43,20 +68,19 @@
use_filesystem{ } \
filesystem{ ext4 } \
mountpoint{ / } \
- device{ /dev/sdb } \
- vg_name{ vg-sys } \
- 10 3 -1 ext4\
- method{ keep } \
- device{ /dev/sdb } \
- 50 3 -1 ext4\
+ in_vg{ vg-sys } \
+ lv_name{ root } \
+ . \
+ 50 50 -1 ext4 \
$lvmok{ } \
method{ format }\
[MediaWiki-commits] [Gerrit] Provide an unregister method for registries - change (oojs/core)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206371
Change subject: Provide an unregister method for registries
..
Provide an unregister method for registries
Change-Id: Id9a5b3ecd7dc10bcb6d9a2c37a5adfa29810a913
---
M src/Factory.js
M src/Registry.js
M tests/unit/Factory.test.js
M tests/unit/Registry.test.js
4 files changed, 74 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/71/206371/1
diff --git a/src/Factory.js b/src/Factory.js
index 1f23293..e9972ed 100644
--- a/src/Factory.js
+++ b/src/Factory.js
@@ -5,6 +5,7 @@
* @constructor
*/
oo.Factory = function OoFactory() {
+ // Parent constructor
oo.Factory.parent.call( this );
// Properties
@@ -45,10 +46,33 @@
}
this.entries.push( name );
+ // Parent method
oo.Factory.parent.prototype.register.call( this, name, constructor );
};
/**
+ * Unegister a constructor from the factory.
+ *
+ * @param {Function} constructor Constructor to unregister
+ * @throws {Error} Name must be a string and must not be empty
+ * @throws {Error} Constructor must be a function
+ */
+oo.Factory.prototype.unregister = function ( constructor ) {
+ var name;
+
+ if ( typeof constructor !== 'function' ) {
+ throw new Error( 'constructor must be a function, cannot be a '
+ typeof constructor );
+ }
+ name = constructor.static constructor.static.name;
+ if ( typeof name !== 'string' || name === '' ) {
+ throw new Error( 'Name must be a string and must not be empty'
);
+ }
+
+ // Parent method
+ oo.Factory.parent.prototype.unregister.call( this, name, constructor );
+};
+
+/**
* Create an object based on a name.
*
* Name is used to look up the constructor to use, while all additional
arguments are passed to the
diff --git a/src/Registry.js b/src/Registry.js
index fb0a6da..b821bde 100644
--- a/src/Registry.js
+++ b/src/Registry.js
@@ -26,6 +26,12 @@
* @param {Mixed} data
*/
+/**
+ * @event unregister
+ * @param {string} name
+ * @param {Mixed} data Data removed from registry
+ */
+
/* Methods */
/**
@@ -53,6 +59,28 @@
};
/**
+ * Remove one or more symbolic names from the registry
+ *
+ * @param {string|string[]} name Symbolic name or list of symbolic names
+ * @fires unregister
+ * @throws {Error} Name argument must be a string or array
+ */
+oo.Registry.prototype.unregister = function ( name ) {
+ var i, len, data;
+ if ( typeof name === 'string' ) {
+ data = this.lookup( name );
+ delete this.registry[name];
+ this.emit( 'unregister', name, data );
+ } else if ( Array.isArray( name ) ) {
+ for ( i = 0, len = name.length; i len; i++ ) {
+ this.unregister( name[i] );
+ }
+ } else {
+ throw new Error( 'Name must be a string or array, cannot be a '
+ typeof name );
+ }
+};
+
+/**
* Get data for a given symbolic name.
*
* @param {string} name Symbolic name
diff --git a/tests/unit/Factory.test.js b/tests/unit/Factory.test.js
index faa9b23..fc33eb0 100644
--- a/tests/unit/Factory.test.js
+++ b/tests/unit/Factory.test.js
@@ -17,7 +17,7 @@
/* Tests */
- QUnit.test( 'register', 2, function ( assert ) {
+ QUnit.test( 'register/unregister', 4, function ( assert ) {
var factory = new oo.Factory();
assert.throws(
function () {
@@ -29,6 +29,17 @@
factory.register( oo.FactoryObjectStub );
assert.strictEqual( factory.lookup( 'factory-object-stub' ),
oo.FactoryObjectStub );
+
+ assert.throws(
+ function () {
+ factory.unregister( 'not-a-function' );
+ },
+ Error,
+ 'Throws an exception when trying to unregister a
non-function value as a constructor'
+ );
+
+ factory.unregister( oo.FactoryObjectStub );
+ assert.strictEqual( factory.lookup( 'factory-object-stub' ),
undefined );
} );
QUnit.test( 'create', 3, function ( assert ) {
diff --git a/tests/unit/Registry.test.js b/tests/unit/Registry.test.js
index efdca80..91a70c0 100644
--- a/tests/unit/Registry.test.js
+++ b/tests/unit/Registry.test.js
@@ -2,7 +2,7 @@
QUnit.module( 'Registry' );
- QUnit.test( 'register', 3, function ( assert ) {
+ QUnit.test( 'register/unregister', 7, function ( assert ) {
var registry = new oo.Registry();
registry.register( 'registry-item-1', 1 );
@@ -11,6 +11,15 @@
assert.strictEqual( registry.lookup( 'registry-item-1' ), 1 );
assert.strictEqual( registry.lookup(
[MediaWiki-commits] [Gerrit] Bump src to d2135c6b69 for deploy - change (mediawiki...deploy)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/206364 Change subject: Bump src to d2135c6b69 for deploy .. Bump src to d2135c6b69 for deploy Change-Id: I4d55f6d50e47380e8a6ea5515af554d75abfdb09 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/64/206364/1 diff --git a/src b/src index 98766be..d2135c6 16 --- a/src +++ b/src -Subproject commit 98766be6825ec035479d992d57d6ef576c45009e +Subproject commit d2135c6b69197037169bfd9fb4b37d2e6d90740f -- To view, visit https://gerrit.wikimedia.org/r/206364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d55f6d50e47380e8a6ea5515af554d75abfdb09 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] service: Use a package require instead of a class - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: service: Use a package require instead of a class
..
service: Use a package require instead of a class
The packages::package_name puppet class is an internal implementation
detail of require_packages and should not leak into puppet manifests. It
anyway creates the corresponding resource so rely on it for dependency
info.
Change-Id: I692da0fe642c77012a0f5a59d7ee94396ed40bc5
---
M modules/service/manifests/node.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index 6fd6aaa..8a965c0 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -141,7 +141,7 @@
provider = 'upstart',
require= [
Package[${title}/deploy],
-Class['packages::nodejs_legacy']
+Package['nodejs-legacy']
],
}
--
To view, visit https://gerrit.wikimedia.org/r/206363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I692da0fe642c77012a0f5a59d7ee94396ed40bc5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206358
Change subject: fix for required options on api call
..
fix for required options on api call
Change-Id: I16bc1921d79cc92d0e1d4716d156fa5a8658b909
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/58/206358/1
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 01df79f..f82db79 100644
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -279,7 +279,8 @@
public static function onApiCheckCanExecute( $module, $user, $message
){
if (!$module instanceof ApiParse)
return true;
- if
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') ==
false){
+ $oTitle = Title::newFromText( $module-getRequest()-getVal(
'page' ) );
+ if ( !is_null( $oTitle ) $oTitle-userCan( 'read' ) == false
) {
$message = wfMessage('loginreqpagetext',
wfMessage('loginreqlink')-plain())-plain();
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/206358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16bc1921d79cc92d0e1d4716d156fa5a8658b909
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206359
Change subject: fix for required options on api call
..
fix for required options on api call
(need cherry pick to REL1_23)
Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/59/206359/1
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 21b78cd..43b96ba 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -317,7 +317,8 @@
if (!$module instanceof ApiParse) {
return true;
}
- if
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') ==
false){
+ $oTitle = Title::newFromText( $module-getRequest()-getVal(
'page' ) );
+ if ( !is_null( $oTitle ) $oTitle-userCan( 'read' ) == false
) {
$message = wfMessage('loginreqpagetext',
wfMessage('loginreqlink')-plain())-plain();
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/206359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: shrink cassandra raid0 minimum partition size - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: install-server: shrink cassandra raid0 minimum partition size
..
install-server: shrink cassandra raid0 minimum partition size
this should fit also xenon, cerium and praseodymium
Bug: T90955
Change-Id: I307afe971bd04f3c9601504729658d32080e4c24
---
M modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git
a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
index bbd67dd..7aa1056 100644
--- a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
+++ b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
@@ -26,11 +26,11 @@
$primary{ } method{ raid } \
$lvmignore{ } \
. \
- 50 3 -1 raid\
+ 10 3 -1 raid\
$primary{ } method{ raid } \
$lvmignore{ } \
. \
- 50 4 -1 ext4\
+ 10 4 -1 ext4\
$lvmok{ } \
$defaultignore{ } \
lv_name{ var } \
--
To view, visit https://gerrit.wikimedia.org/r/206361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I307afe971bd04f3c9601504729658d32080e4c24
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: shrink cassandra raid0 minimum partition size - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206361
Change subject: install-server: shrink cassandra raid0 minimum partition size
..
install-server: shrink cassandra raid0 minimum partition size
this should fit also xenon, cerium and praseodymium
Bug: T90955
Change-Id: I307afe971bd04f3c9601504729658d32080e4c24
---
M modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/206361/1
diff --git
a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
index bbd67dd..7aa1056 100644
--- a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
+++ b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
@@ -26,11 +26,11 @@
$primary{ } method{ raid } \
$lvmignore{ } \
. \
- 50 3 -1 raid\
+ 10 3 -1 raid\
$primary{ } method{ raid } \
$lvmignore{ } \
. \
- 50 4 -1 ext4\
+ 10 4 -1 ext4\
$lvmok{ } \
$defaultignore{ } \
lv_name{ var } \
--
To view, visit https://gerrit.wikimedia.org/r/206361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I307afe971bd04f3c9601504729658d32080e4c24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce API concurrency and retries - change (mediawiki...parsoid)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206362
Change subject: Reduce API concurrency and retries
..
Reduce API concurrency and retries
8 retries with a concurrency of 50 is a good way to take down the API
cluster semi-permanently. In response to recent API cluster overload,
conclusively traced to Parsoid: reduce retries to 1. Reduce
concurrency to 15 for now, but this probably needs further tuning.
Change-Id: I1c319f0ebc50cefb6f82fea4f7672d35c318ed9d
---
M lib/mediawiki.ApiRequest.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/62/206362/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 3a05ce3..bb98d39 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -5,7 +5,7 @@
var Agent = require('./_http_agent.js').Agent;
var httpAgent = new Agent({
connectTimeout: 5 * 1000,
- maxSockets: 50,
+ maxSockets: 15,
});
require('http').globalAgent = httpAgent;
@@ -99,7 +99,7 @@
// Increase the number of maximum listeners a bit..
this.setMaxListeners( 5 );
- this.retries = 8;
+ this.retries = 1;
this.env = env;
this.title = title;
this.queueKey = title;
--
To view, visit https://gerrit.wikimedia.org/r/206362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c319f0ebc50cefb6f82fea4f7672d35c318ed9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Tim Starling tstarl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move RepoHooks::getEntityIdFromOutputPage into OutputPageEnt... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206365
Change subject: Move RepoHooks::getEntityIdFromOutputPage into
OutputPageEntityIdReader
..
Move RepoHooks::getEntityIdFromOutputPage into OutputPageEntityIdReader
Allows retrieving an EntityId based on a previously
propagated OutputPage, for use in hook handlers.
Change-Id: I36e2aef8bf2ed4440f4bb66d1782378689b1c12e
---
M repo/Wikibase.hooks.php
A repo/includes/Hooks/OutputPageEntityIdReader.php
A repo/tests/phpunit/includes/Hooks/OutputPageEntityIdReaderTest.php
3 files changed, 151 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/206365/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index cbec186..56c3769 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -24,11 +24,10 @@
use SpecialSearch;
use Title;
use User;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Repo\BabelUserLanguageLookup;
use Wikibase\Repo\Content\EntityHandler;
+use Wikibase\Repo\Hooks\OutputPageEntityIdReader;
use Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\View\EntityViewPlaceholderExpander;
@@ -609,7 +608,12 @@
* @return bool
*/
public static function onOutputPageBodyAttributes( OutputPage $out,
Skin $sk, array $bodyAttrs ) {
- $entityId = self::getEntityIdFromOutputPage( $out );
+ $outputPageEntityIdReader = new OutputPageEntityIdReader(
+
WikibaseRepo::getDefaultInstance()-getEntityContentFactory(),
+ WikibaseRepo::getDefaultInstance()-getEntityIdParser()
+ );
+
+ $entityId =
$outputPageEntityIdReader-getEntityIdFromOutputPage( $out );
if ( $entityId === null ) {
return true;
@@ -632,34 +636,6 @@
}
return true;
- }
-
- /**
-* @param OutputPage $out
-*
-* @return EntityId|null
-*/
- private static function getEntityIdFromOutputPage( OutputPage $out ) {
- $wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $entityContentFactory =
$wikibaseRepo-getEntityContentFactory();
-
- if ( !$entityContentFactory-isEntityContentModel(
$out-getTitle()-getContentModel() ) ) {
- return null;
- }
-
- $jsConfigVars = $out-getJsConfigVars();
-
- if ( array_key_exists( 'wbEntityId', $jsConfigVars ) ) {
- $idString = $jsConfigVars['wbEntityId'];
-
- try {
- return
$wikibaseRepo-getEntityIdParser()-parse( $idString );
- } catch ( EntityIdParsingException $ex ) {
- wfLogWarning( 'Failed to parse EntityId config
var: ' . $idString );
- }
- }
-
- return null;
}
/**
diff --git a/repo/includes/Hooks/OutputPageEntityIdReader.php
b/repo/includes/Hooks/OutputPageEntityIdReader.php
new file mode 100644
index 000..fbf9677
--- /dev/null
+++ b/repo/includes/Hooks/OutputPageEntityIdReader.php
@@ -0,0 +1,64 @@
+?php
+
+namespace Wikibase\Repo\Hooks;
+
+use OutputPage;
+use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\Repo\Content\EntityContentFactory;
+
+/**
+ * Allows retrieving an EntityId based on a previously propagated OutputPage.
+ *
+ * @since 0.5
+ *
+ * @author Marius Hoch h...@online.de
+ * @license GNU GPL v2+
+ */
+class OutputPageEntityIdReader {
+
+ /**
+* @var EntityContentFactory
+*/
+ private $entityContentFactory;
+
+ /**
+* @var EntityIdParser
+*/
+ private $entityIdParser;
+
+ /**
+* @param EntityContentFactory $entityContentFactory
+* @param EntityIdParser */
+
+*/
+ public function __construct( EntityContentFactory
$entityContentFactory, EntityIdParser $entityIdParser ) {
+ $this-entityContentFactory = $entityContentFactory;
+ $this-entityIdParser = $entityIdParser;
+ }
+
+ /**
+* @param OutputPage $out
+*
+* @return EntityId|null
+*/
+ public function getEntityIdFromOutputPage( OutputPage $out ) {
+ if ( !$this-entityContentFactory-isEntityContentModel(
$out-getTitle()-getContentModel() ) ) {
+ return null;
+ }
+
+ $jsConfigVars = $out-getJsConfigVars();
+
+ if ( array_key_exists( 'wbEntityId', $jsConfigVars ) ) {
+ $idString = $jsConfigVars['wbEntityId'];
+
+
[MediaWiki-commits] [Gerrit] Remove global scope assumptions in entry point - change (mediawiki...WikidataQualityConstraints)
Andreasburmeister has submitted this change and it was merged.
Change subject: Remove global scope assumptions in entry point
..
Remove global scope assumptions in entry point
See
http://www.bn2vs.com/blog/2013/11/24/introduction-to-composer-for-mediawiki-developers/
Change-Id: I7dc639f7454a1a1e61389d4643c4268dadaa77f0
---
M WikidataQualityConstraints.php
1 file changed, 25 insertions(+), 24 deletions(-)
Approvals:
Andreasburmeister: Verified; Looks good to me, approved
diff --git a/WikidataQualityConstraints.php b/WikidataQualityConstraints.php
index c567a36..cdd4029 100644
--- a/WikidataQualityConstraints.php
+++ b/WikidataQualityConstraints.php
@@ -13,34 +13,35 @@
require_once __DIR__ . '/vendor/autoload.php';
}
-// Set credits
-$wgExtensionCredits[ 'specialpage' ][ ] = array (
- 'path' = __FILE__,
- 'name' = 'WikidataQualityConstraints',
- 'author' = 'BP2014N1',
- 'url' =
'https://www.mediawiki.org/wiki/Extension:WikidataQualityConstraints',
- 'descriptionmsg' = 'wikidataquality-constraints-desc',
- 'version' = '0.0.0'
-);
+call_user_func( function() {
+ // Set credits
+ $GLOBALS['wgExtensionCredits']['specialpage'][] = array(
+ 'path' = __FILE__,
+ 'name' = 'WikidataQualityConstraints',
+ 'author' = 'BP2014N1',
+ 'url' =
'https://www.mediawiki.org/wiki/Extension:WikidataQualityConstraints',
+ 'descriptionmsg' = 'wikidataquality-constraints-desc',
+ 'version' = '0.0.0'
+ );
-// Initialize localization and aliases
-$wgMessagesDirs[ 'WikidataQualityConstraints' ] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles[ 'WikidataQualityConstraintsAlias' ] = __DIR__ .
'/WikidataQualityConstraints.alias.php';
+ // Initialize localization and aliases
+ $GLOBALS['wgMessagesDirs']['WikidataQualityConstraints'] = __DIR__ .
'/i18n';
+ $GLOBALS['wgExtensionMessagesFiles']['WikidataQualityConstraintsAlias']
= __DIR__ . '/WikidataQualityConstraints.alias.php';
-// Initalize hooks for creating database tables
-global $wgHooks;
-$wgHooks[ 'LoadExtensionSchemaUpdates' ][ ] =
'WikidataQualityConstraintsHooks::onCreateSchema';
+ // Initalize hooks for creating database tables
+ $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
'WikidataQualityConstraintsHooks::onCreateSchema';
-// Register hooks for Unit Tests
-$wgHooks[ 'UnitTestsList' ][ ] =
'WikidataQualityConstraintsHooks::onUnitTestsList';
+ // Register hooks for Unit Tests
+ $GLOBALS['wgHooks']['UnitTestsList'][] =
'WikidataQualityConstraintsHooks::onUnitTestsList';
-$wgHooks[ 'NewRevisionFromEditComplete' ][] =
'WikidataQualityConstraintsHooks::onNewRevisionFromEditComplete';
+ $GLOBALS['wgHooks']['NewRevisionFromEditComplete'][] =
'WikidataQualityConstraintsHooks::onNewRevisionFromEditComplete';
-// Initialize special pages
-$wgSpecialPages[ 'ConstraintReport' ] =
'WikidataQuality\ConstraintReport\Specials\SpecialConstraintReport';
+ // Initialize special pages
+ $GLOBALS['wgSpecialPages']['ConstraintReport'] =
'WikidataQuality\ConstraintReport\Specials\SpecialConstraintReport';
-// Define database table names
-define( 'CONSTRAINT_TABLE', 'wdqa_constraints' );
+ // Define database table names
+ define( 'CONSTRAINT_TABLE', 'wdqa_constraints' );
-// Jobs
-$wgJobClasses[ 'checkForConstraintViolations' ] =
'CheckForConstraintViolationsJob';
\ No newline at end of file
+ // Jobs
+ $GLOBALS['wgJobClasses']['checkForConstraintViolations'] =
'CheckForConstraintViolationsJob';
+} );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/206220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7dc639f7454a1a1e61389d4643c4268dadaa77f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated readme - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/206369 Change subject: Updated readme .. Updated readme Change-Id: I88e0033761e34478e2ede699341321bf77d070e7 --- M README.md 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/69/206369/1 diff --git a/README.md b/README.md index 1efbc27..3aa57a7 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ This is the base extension for our Wikidata Quality extensions. To add functionality you need to install at least one Wikidata Quality extension (see [list of extensions below](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality#wikidata-quality-extensions)). +For more information see https://www.mediawiki.org/wiki/WikidataQuality + ## Installation * Clone this repo into Wikidata/extensions -- To view, visit https://gerrit.wikimedia.org/r/206369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88e0033761e34478e2ede699341321bf77d070e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Add ceb, it and war in source languages - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/206360 Change subject: CX: Add ceb, it and war in source languages .. CX: Add ceb, it and war in source languages Change-Id: I73d9b859784092d4114e997773e6ab6ce67ea31e --- M hieradata/common/cxserver.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/60/206360/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index f6b6197..b3dd82f 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -6,6 +6,7 @@ - 'ba' - 'bg' - 'ca' +- 'ceb' - 'cv' - 'da' - 'en' @@ -17,6 +18,7 @@ - 'gl' - 'gu' - 'id' +- 'it' - 'kn' - 'koi' - 'kv' @@ -46,6 +48,7 @@ - 'uk' - 'uz' - 'vi' +- 'war' - 'xh' target: - 'af' -- To view, visit https://gerrit.wikimedia.org/r/206360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73d9b859784092d4114e997773e6ab6ce67ea31e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: service: Use a package require instead of a class - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206363
Change subject: WIP: service: Use a package require instead of a class
..
WIP: service: Use a package require instead of a class
The packages::package_name puppet class is an internal implementation
detail of require_packages and should not leak into puppet manifests. It
anyway creates the corresponding resource so rely on it for dependency
info
Change-Id: I692da0fe642c77012a0f5a59d7ee94396ed40bc5
---
M modules/service/manifests/node.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/206363/1
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index 6fd6aaa..8a965c0 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -141,7 +141,7 @@
provider = 'upstart',
require= [
Package[${title}/deploy],
-Class['packages::nodejs_legacy']
+Package['nodejs-legacy']
],
}
--
To view, visit https://gerrit.wikimedia.org/r/206363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I692da0fe642c77012a0f5a59d7ee94396ed40bc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce API concurrency and retries - change (mediawiki...parsoid)
Ori.livneh has submitted this change and it was merged.
Change subject: Reduce API concurrency and retries
..
Reduce API concurrency and retries
8 retries with a concurrency of 50 is a good way to take down the API
cluster semi-permanently. In response to recent API cluster overload,
conclusively traced to Parsoid: reduce retries to 1. Reduce
concurrency to 15 for now, but this probably needs further tuning.
Change-Id: I1c319f0ebc50cefb6f82fea4f7672d35c318ed9d
---
M lib/mediawiki.ApiRequest.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 3a05ce3..bb98d39 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -5,7 +5,7 @@
var Agent = require('./_http_agent.js').Agent;
var httpAgent = new Agent({
connectTimeout: 5 * 1000,
- maxSockets: 50,
+ maxSockets: 15,
});
require('http').globalAgent = httpAgent;
@@ -99,7 +99,7 @@
// Increase the number of maximum listeners a bit..
this.setMaxListeners( 5 );
- this.retries = 8;
+ this.retries = 1;
this.env = env;
this.title = title;
this.queueKey = title;
--
To view, visit https://gerrit.wikimedia.org/r/206362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c319f0ebc50cefb6f82fea4f7672d35c318ed9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
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 unregister method to ModelRegistry - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206374
Change subject: Add unregister method to ModelRegistry
..
Add unregister method to ModelRegistry
Depends on Id9a5b3ecd7 in oojs core.
Change-Id: I81750e7763109f530a6435dbcd7f74379450a565
---
M src/dm/ve.dm.ModelRegistry.js
M tests/dm/ve.dm.ModelRegistry.test.js
2 files changed, 105 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/74/206374/1
diff --git a/src/dm/ve.dm.ModelRegistry.js b/src/dm/ve.dm.ModelRegistry.js
index 95356ee..2f394b2 100644
--- a/src/dm/ve.dm.ModelRegistry.js
+++ b/src/dm/ve.dm.ModelRegistry.js
@@ -56,31 +56,58 @@
*/
function addType( obj ) {
var i, len,
+ keys = Array.prototype.slice.call( arguments, 1, -1 ),
+ value = arguments[arguments.length - 1],
o = obj;
- for ( i = 1, len = arguments.length - 2; i len; i++ ) {
- if ( o[arguments[i]] === undefined ) {
- o[arguments[i]] = {};
+
+ for ( i = 0, len = keys.length - 1; i len; i++ ) {
+ if ( o[keys[i]] === undefined ) {
+ o[keys[i]] = {};
}
- o = o[arguments[i]];
+ o = o[keys[i]];
}
- if ( o[arguments[i]] === undefined ) {
- o[arguments[i]] = [];
+ o[keys[i]] = o[keys[i]] || [];
+ o[keys[i]].unshift( value );
+ }
+
+ /**
+* Helper function for unregister().
+*
+* Same arguments as addType, except removes the type from the list.
+*
+* @private
+* @param {Object} obj Object the array resides in
+* @param {string...} keys
+* @param {Mixed} value to remove
+*/
+ function removeType( obj ) {
+ var index,
+ keys = Array.prototype.slice.call( arguments, 1, -1 ),
+ value = arguments[arguments.length - 1],
+ arr = ve.getProp.apply( obj, [ obj ].concat( keys ) );
+
+ if ( arr ) {
+ index = arr.indexOf( value );
+ if ( index !== -1 ) {
+ arr.splice( index, 1 );
+ }
}
- o[arguments[i]].unshift( arguments[i + 1] );
}
/* Public methods */
/**
* Register a model type.
-* @param {string} name Symbolic name for the model
+*
* @param {ve.dm.Model} constructor Subclass of ve.dm.Model
+* @throws Model names must be strings and must not be empty
* @throws Models must be subclasses of ve.dm.Model
* @throws No factory associated with this ve.dm.Model subclass
*/
ve.dm.ModelRegistry.prototype.register = function ( constructor ) {
var i, j, tags, types,
name = constructor.static constructor.static.name;
+
if ( typeof name !== 'string' || name === '' ) {
throw new Error( 'Model names must be strings and must
not be empty' );
}
@@ -98,8 +125,9 @@
} else {
throw new Error( 'No factory associated with this
ve.dm.Model subclass' );
}
+
// Parent method
- OO.Registry.prototype.register.call( this, name, constructor );
+ ve.dm.ModelRegistry.super.prototype.register.call( this, name,
constructor );
tags = constructor.static.matchTagNames === null ?
[ '' ] :
@@ -130,6 +158,67 @@
};
/**
+* Unregister a model type.
+*
+* @param {ve.dm.Model} constructor Subclass of ve.dm.Model
+* @throws Model names must be strings and must not be empty
+* @throws Models must be subclasses of ve.dm.Model
+* @throws No factory associated with this ve.dm.Model subclass
+*/
+ ve.dm.ModelRegistry.prototype.unregister = function ( constructor ) {
+ var i, j, tags, types,
+ name = constructor.static constructor.static.name;
+
+ if ( typeof name !== 'string' || name === '' ) {
+ throw new Error( 'Model names must be strings and must
not be empty' );
+ }
+ if ( !( constructor.prototype instanceof ve.dm.Model ) ) {
+ throw new Error( 'Models must be subclasses of
ve.dm.Model' );
+ }
+
+ // Unregister the model from the right factory
+ if ( constructor.prototype instanceof ve.dm.Annotation ) {
+
[MediaWiki-commits] [Gerrit] Updated readme - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/206368 Change subject: Updated readme .. Updated readme Added link to our mediawiki page (more for trying to push to branches). Change-Id: I973bfc1c05d78caee39c0a7e4912fc90bbb0eb1b --- M README.md 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/68/206368/1 diff --git a/README.md b/README.md index 1efbc27..3aa57a7 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ This is the base extension for our Wikidata Quality extensions. To add functionality you need to install at least one Wikidata Quality extension (see [list of extensions below](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality#wikidata-quality-extensions)). +For more information see https://www.mediawiki.org/wiki/WikidataQuality + ## Installation * Clone this repo into Wikidata/extensions -- To view, visit https://gerrit.wikimedia.org/r/206368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I973bfc1c05d78caee39c0a7e4912fc90bbb0eb1b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove global scope assumptions in entry point - change (mediawiki...WikidataQuality)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove global scope assumptions in entry point
..
Remove global scope assumptions in entry point
See
http://www.bn2vs.com/blog/2013/11/24/introduction-to-composer-for-mediawiki-developers/
Change-Id: Ic85973ee7690578110a597cb7bb2dc6d3ccf5a4c
---
M WikidataQuality.php
1 file changed, 24 insertions(+), 23 deletions(-)
Approvals:
Andreasburmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikidataQuality.php b/WikidataQuality.php
index f883f0f..bec172e 100644
--- a/WikidataQuality.php
+++ b/WikidataQuality.php
@@ -13,33 +13,34 @@
require_once __DIR__ . '/vendor/autoload.php';
}
-// Set credits
-$wgExtensionCredits[ 'specialpage' ][ ] = array (
- 'path' = __FILE__,
- 'name' = 'WikidataQuality',
- 'author' = 'BP2014N1',
- 'url' = 'https://www.mediawiki.org/wiki/Extension:WikidataQuality',
- 'descriptionmsg' = 'wikidataquality-desc',
- 'version' = '0.0.0'
-);
+call_user_func( function() {
+ // Set credits
+ $GLOBALS['wgExtensionCredits']['specialpage'][] = array (
+ 'path' = __FILE__,
+ 'name' = 'WikidataQuality',
+ 'author' = 'BP2014N1',
+ 'url' =
'https://www.mediawiki.org/wiki/Extension:WikidataQuality',
+ 'descriptionmsg' = 'wikidataquality-desc',
+ 'version' = '0.0.0'
+ );
-// Initialize localization and aliases
-$wgMessagesDirs[ 'WikidataQuality' ] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles[ 'WikidataQualityAlias' ] = __DIR__ .
'/WikidataQuality.alias.php';
+ // Initialize localization and aliases
+ $GLOBALS['wgMessagesDirs']['WikidataQuality'] = __DIR__ . '/i18n';
+ $GLOBALS['wgExtensionMessagesFiles']['WikidataQualityAlias'] = __DIR__
. '/WikidataQuality.alias.php';
-// Initalize hooks for creating database tables
-global $wgHooks;
-$wgHooks[ 'LoadExtensionSchemaUpdates' ][ ] =
'WikidataQualityHooks::onCreateSchema';
+ // Initalize hooks for creating database tables
+ $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
'WikidataQualityHooks::onCreateSchema';
-// Register hooks for Unit Tests
-$wgHooks[ 'UnitTestsList' ][ ] = 'WikidataQualityHooks::onUnitTestsList';
+ // Register hooks for Unit Tests
+ $GLOBALS['wgHooks']['UnitTestsList'][] =
'WikidataQualityHooks::onUnitTestsList';
-// Define modules
-$wgResourceModules[ 'SpecialCheckResultPage' ] = array (
- 'styles' = '/modules/SpecialCheckResultPage.css',
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'WikidataQuality'
-);
+ // Define modules
+ $GLOBALS['wgResourceModules']['SpecialCheckResultPage'] = array (
+ 'styles' = '/modules/SpecialCheckResultPage.css',
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'WikidataQuality'
+ );
+});
// Define database table names
define( 'VIOLATION_TABLE', 'wdqa_violations' );
--
To view, visit https://gerrit.wikimedia.org/r/206205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic85973ee7690578110a597cb7bb2dc6d3ccf5a4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
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 unused, undocumented 'entries' property from Factory - change (oojs/core)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206372
Change subject: Remove unused, undocumented 'entries' property from Factory
..
Remove unused, undocumented 'entries' property from Factory
Change-Id: Ifc68472fd29f51a412cb9b45b1264ffedca4571e
---
M src/Factory.js
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/72/206372/1
diff --git a/src/Factory.js b/src/Factory.js
index e9972ed..d23bcf6 100644
--- a/src/Factory.js
+++ b/src/Factory.js
@@ -7,9 +7,6 @@
oo.Factory = function OoFactory() {
// Parent constructor
oo.Factory.parent.call( this );
-
- // Properties
- this.entries = [];
};
/* Inheritance */
@@ -44,7 +41,6 @@
if ( typeof name !== 'string' || name === '' ) {
throw new Error( 'Name must be a string and must not be empty'
);
}
- this.entries.push( name );
// Parent method
oo.Factory.parent.prototype.register.call( this, name, constructor );
--
To view, visit https://gerrit.wikimedia.org/r/206372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc68472fd29f51a412cb9b45b1264ffedca4571e
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to d2135c6b69 for deploy - change (mediawiki...deploy)
Ori.livneh has submitted this change and it was merged. Change subject: Bump src to d2135c6b69 for deploy .. Bump src to d2135c6b69 for deploy Change-Id: I4d55f6d50e47380e8a6ea5515af554d75abfdb09 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/src b/src index 98766be..d2135c6 16 --- a/src +++ b/src -Subproject commit 98766be6825ec035479d992d57d6ef576c45009e +Subproject commit d2135c6b69197037169bfd9fb4b37d2e6d90740f -- To view, visit https://gerrit.wikimedia.org/r/206364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d55f6d50e47380e8a6ea5515af554d75abfdb09 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test for branch - change (mediawiki...WikidataQuality)
Jonaskeutel has uploaded a new change for review. https://gerrit.wikimedia.org/r/206377 Change subject: test for branch .. test for branch Change-Id: Id71f4e70342e037e0dc1985978f72e86fcfbddbb --- M WikidataQualityHooks.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/77/206377/1 diff --git a/WikidataQualityHooks.php b/WikidataQualityHooks.php index 98ed20d..644cca9 100644 --- a/WikidataQualityHooks.php +++ b/WikidataQualityHooks.php @@ -19,4 +19,5 @@ glob( __DIR__ . '/tests/phpunit/*Test.php' ) ); return true; } + } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/206377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id71f4e70342e037e0dc1985978f72e86fcfbddbb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted travis file to run on branch v1. - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has submitted this change and it was merged. Change subject: Adopted travis file to run on branch v1. .. Adopted travis file to run on branch v1. Change-Id: Ie2b85aaa0fe473b62c5feb6b02d7b1f1cb680cc9 --- M build/travis/before_script.sh 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jonaskeutel: Verified; Looks good to me, approved diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index fcfcfdf..76091b3 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -21,10 +21,10 @@ mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase # checkout WikidataQuality -wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz -tar -zxf master.tar.gz -rm master.tar.gz -mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikidataQuality +wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz +tar -zxf v1.tar.gz +rm v1.tar.gz +mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikidataQuality cd wiki -- To view, visit https://gerrit.wikimedia.org/r/206379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2b85aaa0fe473b62c5feb6b02d7b1f1cb680cc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove global scope assumptions in entry point - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Remove global scope assumptions in entry point
..
Remove global scope assumptions in entry point
See
http://www.bn2vs.com/blog/2013/11/24/introduction-to-composer-for-mediawiki-developers/
Change-Id: I96c8e05190bff22249afcd788993fb5661ea2c84
---
M WikidataQualityExternalValidation.php
1 file changed, 29 insertions(+), 29 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/WikidataQualityExternalValidation.php
b/WikidataQualityExternalValidation.php
index 92ce1f9..2fa5c2a 100644
--- a/WikidataQualityExternalValidation.php
+++ b/WikidataQualityExternalValidation.php
@@ -13,39 +13,39 @@
require_once __DIR__ . '/vendor/autoload.php';
}
-// Set credits
-$wgExtensionCredits[ 'specialpage' ][ ] = array (
- 'path' = __FILE__,
- 'name' = 'WikidataQualityExternalValidation',
- 'author' = 'BP2014N1',
- 'url' =
'https://www.mediawiki.org/wiki/Extension:WikidataQualityExternalValidation',
- 'descriptionmsg' = 'wikidataquality-external-validation-desc',
- 'version' = '0.0.0'
-);
+call_user_func( function() {
+ // Set credits
+ $GLOBALS['wgExtensionCredits']['specialpage'][] = array(
+ 'path' = __FILE__,
+ 'name' = 'WikidataQualityExternalValidation',
+ 'author' = 'BP2014N1',
+ 'url' =
'https://www.mediawiki.org/wiki/Extension:WikidataQualityExternalValidation',
+ 'descriptionmsg' = 'wikidataquality-external-validation-desc',
+ 'version' = '0.0.0'
+ );
-// Initialize localization and aliases
-$wgMessagesDirs[ 'WikidataQualityExternalValidation' ] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles[ 'WikidataQualityExternalValidationAlias' ] =
__DIR__ . '/WikidataQualityExternalValidation.alias.php';
+ // Initialize localization and aliases
+ $GLOBALS['wgMessagesDirs']['WikidataQualityExternalValidation'] =
__DIR__ . '/i18n';
+
$GLOBALS['wgExtensionMessagesFiles']['WikidataQualityExternalValidationAlias']
= __DIR__ . '/WikidataQualityExternalValidation.alias.php';
-// Initalize hooks for creating database tables
-global $wgHooks;
-$wgHooks[ 'LoadExtensionSchemaUpdates' ][ ] =
'WikidataQualityExternalValidationHooks::onCreateSchema';
+ // Initalize hooks for creating database tables
+ $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
'WikidataQualityExternalValidationHooks::onCreateSchema';
-// Register hooks for Unit Tests
-$wgHooks[ 'UnitTestsList' ][ ] =
'WikidataQualityExternalValidationHooks::onUnitTestsList';
+ // Register hooks for Unit Tests
+ $GLOBALS['wgHooks']['UnitTestsList'][] =
'WikidataQualityExternalValidationHooks::onUnitTestsList';
-// Initialize special pages
-$wgSpecialPages[ 'CrossCheck' ] =
'WikidataQuality\ExternalValidation\Specials\SpecialCrossCheck';
-$wgSpecialPages[ 'ExternalDbs' ] =
'WikidataQuality\ExternalValidation\Specials\SpecialExternalDbs';
+ // Initialize special pages
+ $GLOBALS['wgSpecialPages']['CrossCheck'] =
'WikidataQuality\ExternalValidation\Specials\SpecialCrossCheck';
+ $GLOBALS['wgSpecialPages']['ExternalDbs'] =
'WikidataQuality\ExternalValidation\Specials\SpecialExternalDbs';
-// Define API modules
-global $wgAPIModules;
-$wgAPIModules[ 'wdqacrosscheck' ] =
'WikidataQuality\ExternalValidation\Api\CrossCheck';
+ // Define API modules
+ $GLOBALS['wgAPIModules']['wdqacrosscheck'] =
'WikidataQuality\ExternalValidation\Api\CrossCheck';
-// Define database table names
-define( 'DUMP_DATA_TABLE', 'wdqa_external_data' );
-define( 'DUMP_META_TABLE', 'wdqa_dump_information' );
-define( 'DUMP_IDENTIFIER_PROPERTIES_TABLE', 'wdqa_identifier_properties' );
+ // Define database table names
+ define( 'DUMP_DATA_TABLE', 'wdqa_external_data' );
+ define( 'DUMP_META_TABLE', 'wdqa_dump_information' );
+ define( 'DUMP_IDENTIFIER_PROPERTIES_TABLE',
'wdqa_identifier_properties' );
-// Jobs
-$wgJobClasses[ 'checkForCrossCheckViolations' ] =
'CheckForCrossCheckViolationsJob';
\ No newline at end of file
+ // Jobs
+ $GLOBALS['wgJobClasses']['checkForCrossCheckViolations'] =
'CheckForCrossCheckViolationsJob';
+} );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/206237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96c8e05190bff22249afcd788993fb5661ea2c84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Reduce nesting - change (mediawiki...WikidataQualityConstraints)
Andreasburmeister has submitted this change and it was merged.
Change subject: Reduce nesting
..
Reduce nesting
Change-Id: Ia7022c78ee0f244949f8739eb6e60bf57461da41
---
M includes/ConstraintCheck/Helper/ConstraintReportHelper.php
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Andreasburmeister: Verified; Looks good to me, approved
diff --git a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
index 03ccec2..1c8a281 100644
--- a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
+++ b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
@@ -44,19 +44,19 @@
private function parseParameter( $parameter, $type = 'String' ) {
if ( $parameter === null ) {
return 'null';
- } else {
- if ( $type === 'String' ) {
- return $parameter;
- } else { // ItemId, PropertyId
- $startsWith = strtoupper( substr( $parameter,
0, 1 ) );
- if ( $startsWith === 'Q' || $startsWith === 'P'
) {
- $type = 'Wikibase\\DataModel\\Entity\\'
. $type;
- return new $type( $parameter );
- } else {
- return '';
- }
- }
}
+
+ if ( $type === 'String' ) {
+ return $parameter;
+ }
+
+ $startsWith = strtoupper( substr( $parameter, 0, 1 ) );
+ if ( $startsWith === 'Q' || $startsWith === 'P' ) {
+ $type = 'Wikibase\\DataModel\\Entity\\' . $type;
+ return new $type( $parameter );
+ }
+
+ return '';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/206331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7022c78ee0f244949f8739eb6e60bf57461da41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Another round for Scrutinizer - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has submitted this change and it was merged.
Change subject: Another round for Scrutinizer
..
Another round for Scrutinizer
(code duplication is still an issue, though)
Change-Id: Iff36ed396e29c900bab5813d298c7e5a64136d9d
---
M includes/ConstraintCheck/Checker/ConnectionChecker.php
M includes/ConstraintCheck/Helper/ConstraintReportHelper.php
M specials/SpecialConstraintReport.php
3 files changed, 17 insertions(+), 17 deletions(-)
Approvals:
Jonaskeutel: Verified; Looks good to me, approved
diff --git a/includes/ConstraintCheck/Checker/ConnectionChecker.php
b/includes/ConstraintCheck/Checker/ConnectionChecker.php
index 444bec3..ae370ff 100644
--- a/includes/ConstraintCheck/Checker/ConnectionChecker.php
+++ b/includes/ConstraintCheck/Checker/ConnectionChecker.php
@@ -199,7 +199,7 @@
$message = 'Target entity does not exist.';
return new CheckResult( $statement, 'Target required
claim', $parameters, CheckResult::STATUS_VIOLATION, $message );
}
- $targetEntityStatementsArray = $targetEntity-getStatements();
+ $targetEntityStatementList = $targetEntity-getStatements();
/*
* 'Target required claim' can be defined with
@@ -207,7 +207,7 @@
* b) a property and a number of items (each combination
forming an individual claim)
*/
if ( $itemArray[ 0 ] === '' ) {
- if ( $this-hasProperty( $targetEntityStatementsArray,
$property ) ) {
+ if ( $this-hasProperty( $targetEntityStatementList,
$property ) ) {
$message = '';
$status = CheckResult::STATUS_COMPLIANCE;
} else {
@@ -215,7 +215,7 @@
$status = CheckResult::STATUS_VIOLATION;
}
} else {
- if ( $this-hasClaim( $targetEntityStatementsArray,
$property, $itemArray ) ) {
+ if ( $this-hasClaim( $targetEntityStatementList,
$property, $itemArray ) ) {
$message = '';
$status = CheckResult::STATUS_COMPLIANCE;
} else {
@@ -266,9 +266,9 @@
$message = 'Target item does not exist.';
return new CheckResult( $statement, 'Symmetric',
$parameters, CheckResult::STATUS_VIOLATION, $message );
}
- $targetItemStatementsArray = $targetItem-getStatements();
+ $targetItemStatementList = $targetItem-getStatements();
- if ( $this-hasClaim( $targetItemStatementsArray,
$propertyId-getSerialization(), $entityIdSerialization ) ) {
+ if ( $this-hasClaim( $targetItemStatementList,
$propertyId-getSerialization(), $entityIdSerialization ) ) {
$message = '';
$status = CheckResult::STATUS_COMPLIANCE;
} else {
@@ -325,9 +325,9 @@
$message = 'Target item does not exist.';
return new CheckResult( $statement, 'Inverse',
$parameters, CheckResult::STATUS_VIOLATION, $message );
}
- $targetItemStatementsArray = $targetItem-getStatements();
+ $targetItemStatementList = $targetItem-getStatements();
- if ( $this-hasClaim( $targetItemStatementsArray, $property,
$entityIdSerialization ) ) {
+ if ( $this-hasClaim( $targetItemStatementList, $property,
$entityIdSerialization ) ) {
$message = '';
$status = CheckResult::STATUS_COMPLIANCE;
} else {
@@ -341,13 +341,13 @@
/**
* Checks if there is a statement with a claim using the given property.
*
-* @param array $statementsArray
+* @param StatementList $statementList
* @param string $propertyIdSerialization
*
* @return boolean
*/
- private function hasProperty( $statementsArray,
$propertyIdSerialization ) {
- foreach ( $statementsArray as $statement ) {
+ private function hasProperty( $statementList, $propertyIdSerialization
) {
+ foreach ( $statementList as $statement ) {
if ( $statement-getPropertyId()-getSerialization()
=== $propertyIdSerialization ) {
return true;
}
@@ -358,14 +358,14 @@
/**
* Checks if there is a statement with a claim using the given property
and having one of the given items as its value.
*
-* @param array $statementsArray
+* @param StatementList $statementList
* @param string $propertyIdSerialization
* @param
[MediaWiki-commits] [Gerrit] Special:EnableFlow archives pre-existing talk page - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:EnableFlow archives pre-existing talk page
..
Special:EnableFlow archives pre-existing talk page
Enabling flow on an existing talk page is now accepted.
It tries to archive the talk page to a subpage.
The name of the archive is configurable using a new
form field. The default value is %s/Archive_%d and
it is localized.
It uses a template named Wikitext talk page converted to Flow
to add a reference to the archive page at the top of
the flow board.
It uses a template named Archive for converted wikitext talk page
to add a reference to the flow board at the top of
the archive page.
Bug: T72073
Change-Id: If3b23383e4289290cde1237b74a46bdcb455
---
M autoload.php
M container.php
M i18n/en.json
M i18n/qqq.json
M includes/Import/Converter.php
M includes/Import/Importer.php
M includes/Import/Wikitext/ConversionStrategy.php
M includes/Import/Wikitext/ImportSource.php
A includes/Log/DefaultLogger.php
M includes/Specials/SpecialEnableFlow.php
M maintenance/convertLqt.php
M maintenance/convertLqtPageOnLocalWiki.php
M maintenance/convertNamespaceFromWikitext.php
13 files changed, 170 insertions(+), 57 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index ff9e156..c66d2ac 100644
--- a/autoload.php
+++ b/autoload.php
@@ -216,6 +216,7 @@
'Flow\\Import\\Wikitext\\ImportSource' = __DIR__ .
'/includes/Import/Wikitext/ImportSource.php',
'Flow\\LinksTableUpdater' = __DIR__ .
'/includes/LinksTableUpdater.php',
'Flow\\Log\\ActionFormatter' = __DIR__ .
'/includes/Log/ActionFormatter.php',
+ 'Flow\\Log\\DefaultLogger' = __DIR__ .
'/includes/Log/DefaultLogger.php',
'Flow\\Log\\LogQuery' = __DIR__ . '/includes/Log/Query.php',
'Flow\\Log\\LqtImportFormatter' = __DIR__ .
'/includes/Log/LqtImportFormatter.php',
'Flow\\Log\\ModerationLogger' = __DIR__ .
'/includes/Log/ModerationLogger.php',
diff --git a/container.php b/container.php
index cb286b4..fb590f4 100644
--- a/container.php
+++ b/container.php
@@ -1219,4 +1219,13 @@
);
};
+$c['parser'] = function() {
+ global $wgParser;
+ return $wgParser;
+};
+
+$c['default_logger'] = function() {
+ return new Flow\Log\DefaultLogger();
+};
+
return $c;
diff --git a/i18n/en.json b/i18n/en.json
index 005d542..e9448d9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -392,7 +392,10 @@
flow-special-enableflow-header: Initial description of Flow board
(wikitext),
flow-special-enableflow-board-already-exists: There is already a
Flow board at [[$1]].,
flow-special-enableflow-invalid-title: The provided page is not a
valid page title,
- flow-special-enableflow-page-already-exists: There is already a
non-Flow page at [[$1]]. If you still want to locate a Flow board there, please
move the existing page to an archive, delete the redirect, then use
Special:EnableFlow again. Include the archive name in the description.,
+ flow-special-enableflow-archive-title-format: Where to archive
existing content,
+ flow-special-enableflow-archive-title-format-default-value:
%s/Archive_%d,
+ flow-special-enableflow-board-creation-not-allowed: You are not
allowed to create a Flow board at [[:$1]].,
+ flow-special-enableflow-page-is-liquidthreads: There is a
LiquidThreads page at [[:$1]].,
flow-special-enableflow-confirmation: You have successfully created
a Flow board at [[$1]].,
flow-spam-confirmedit-form: Please confirm you are a human by
solving the below captcha: $1,
flow-embedding-unsupported: Discussions cannot be embedded yet.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e29ac96..7823fd6 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -394,10 +394,13 @@
flow-special-invalid-uuid: Error message shown on the redirector
special page if the specified type / UUID combination is invalid,
flow-special-enableflow-legend: Legend for Special:EnableFlow form,
flow-special-enableflow-page: Label for the page field of
Special:EnableFlow,
+ flow-special-enableflow-archive-title-format: Label for the archive
format field of Special:EnableFlow,
+ flow-special-enableflow-archive-title-format-default-value: Default
value for the archive format field of Special:EnableFlow. This is a format
string. %s and %d should be present. %s represents the title of the page where
Flow is being enabled. %d represents a number that will be incremented if an
archive page with the same name already exist.,
flow-special-enableflow-header: Label for the header field of
Special:EnableFlow,
flow-special-enableflow-board-already-exists: Error given on
Special:EnableFlow if board already exists at requested page name.
Parameters:\n$1 - Page name where user
[MediaWiki-commits] [Gerrit] Enabled the ganglia diskstat plugin for labvirt100X - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206388
Change subject: Enabled the ganglia diskstat plugin for labvirt100X
..
Enabled the ganglia diskstat plugin for labvirt100X
For now in site.pp as we debug an IO issue
Change-Id: I64a026c4e7f86ae4a90caad91cb29806d889c359
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/206388/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 051c108..fda0e94 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2410,6 +2410,7 @@
node /^labvirt100[0-9].eqiad.wmnet/ {
$use_neutron = false
openstack::nova::partition{ '/dev/sdb': }
+ganglia::plugin::python {'diskstat': }
role nova::compute
include standard
--
To view, visit https://gerrit.wikimedia.org/r/206388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64a026c4e7f86ae4a90caad91cb29806d889c359
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enabled the ganglia diskstat plugin for labvirt100X - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Enabled the ganglia diskstat plugin for labvirt100X
..
Enabled the ganglia diskstat plugin for labvirt100X
For now in site.pp as we debug an IO issue
Change-Id: I64a026c4e7f86ae4a90caad91cb29806d889c359
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 051c108..fda0e94 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2410,6 +2410,7 @@
node /^labvirt100[0-9].eqiad.wmnet/ {
$use_neutron = false
openstack::nova::partition{ '/dev/sdb': }
+ganglia::plugin::python {'diskstat': }
role nova::compute
include standard
--
To view, visit https://gerrit.wikimedia.org/r/206388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64a026c4e7f86ae4a90caad91cb29806d889c359
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Readme update - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/206376 Change subject: Readme update .. Readme update Change-Id: I17ecc84c7a2f04594524f6b8283b888636731e18 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/76/206376/1 diff --git a/README.md b/README.md index 1efbc27..63928e4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # WikidataQuality [](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) This is the base extension for our Wikidata Quality extensions. + To add functionality you need to install at least one Wikidata Quality extension (see [list of extensions below](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality#wikidata-quality-extensions)). ## Installation -- To view, visit https://gerrit.wikimedia.org/r/206376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17ecc84c7a2f04594524f6b8283b888636731e18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Better pageprops API example - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Better pageprops API example
..
Better pageprops API example
Change example query from non-existent Category:Foo to querying Main
Page and MediaWiki, which exist on both enwiki and mediawiki.org (and
have really interesting info on enwiki).
To test, visit api.php?action=helpmodules=query+pageprops and try the
example URL.
Change-Id: Ibad1e912bd2fa0f0f627025a60ec137f43a2abe4
---
M includes/api/ApiQueryPageProps.php
M includes/api/i18n/en.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQueryPageProps.php
b/includes/api/ApiQueryPageProps.php
index 269afb1..8c89a60 100644
--- a/includes/api/ApiQueryPageProps.php
+++ b/includes/api/ApiQueryPageProps.php
@@ -136,7 +136,7 @@
protected function getExamplesMessages() {
return array(
- 'action=queryprop=pagepropstitles=Category:Foo'
+
'action=queryprop=pagepropstitles=Main%20Page|MediaWiki'
= 'apihelp-query+pageprops-example-simple',
);
}
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 9d0663c..a6d9d61 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -777,7 +777,7 @@
apihelp-query+pageprops-description: Get various properties defined
in the page content.,
apihelp-query+pageprops-param-prop: Only list these props. Useful
for checking whether a certain page uses a certain page prop.,
- apihelp-query+pageprops-example-simple: Get properties for
kbdCategory:Foo/kbd.,
+ apihelp-query+pageprops-example-simple: Get properties for the pages
kbdMain Page/kbd and kbdMediaWiki/kbd.,
apihelp-query+pageswithprop-description: List all pages using a
given page property.,
apihelp-query+pageswithprop-param-propname: Page prop for which to
enumerate pages.,
--
To view, visit https://gerrit.wikimedia.org/r/202374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibad1e912bd2fa0f0f627025a60ec137f43a2abe4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Spage sp...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix type hint in ViolationLookup - change (mediawiki...WikidataQuality)
jenkins-bot has submitted this change and it was merged. Change subject: Fix type hint in ViolationLookup .. Fix type hint in ViolationLookup Change-Id: I181cbddc8f01fa363d3f82da873efb7374e4aa4a --- M includes/Violations/ViolationLookup.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andreasburmeister: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Violations/ViolationLookup.php b/includes/Violations/ViolationLookup.php index 72ff228..4aa8700 100644 --- a/includes/Violations/ViolationLookup.php +++ b/includes/Violations/ViolationLookup.php @@ -21,7 +21,7 @@ private $db; /** -* @param array $conditions +* @param ViolationQuery $violationQuery * * @return array of Violations|null */ -- To view, visit https://gerrit.wikimedia.org/r/206323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I181cbddc8f01fa363d3f82da873efb7374e4aa4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Add wikis for ContentTranslation - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/206389 Change subject: Beta: Add wikis for ContentTranslation .. Beta: Add wikis for ContentTranslation Also add missing zerowiki Bug: T90683 Change-Id: I469460fc977ad0bae7ac8436f6a8503e728214f4 --- M jjb/beta.yaml 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/89/206389/1 diff --git a/jjb/beta.yaml b/jjb/beta.yaml index 3e7ea89..2e9031d 100644 --- a/jjb/beta.yaml +++ b/jjb/beta.yaml @@ -88,6 +88,7 @@ - arwiki - cawiki - commonswiki + - dawiki - deploymentwiki - dewiki - ee_prototypewiki @@ -104,16 +105,24 @@ - fawiki - hewiki - hiwiki + - idwiki - jawiki - kowiki - loginwiki - metawiki + - minwiki + - mswiki + - nnwiki + - nowiki - ruwiki - simplewiki - sqwiki + - svwiki - testwiki - ukwiki + - uzwiki - wikidatawiki + - zerowiki - zhwiki # The 'wikidb' axis defined above is exported by Jenkins as an -- To view, visit https://gerrit.wikimedia.org/r/206389 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I469460fc977ad0bae7ac8436f6a8503e728214f4 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create missing board pages - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206380
Change subject: Create missing board pages
..
Create missing board pages
Bug: T95594
Change-Id: I67ac1bc3def5cce143b7b08b5d4301fe741df09b
---
M maintenance/FlowUpdateWorkflowPageId.php
1 file changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/80/206380/1
diff --git a/maintenance/FlowUpdateWorkflowPageId.php
b/maintenance/FlowUpdateWorkflowPageId.php
index 5056ecd..a4a61ac 100644
--- a/maintenance/FlowUpdateWorkflowPageId.php
+++ b/maintenance/FlowUpdateWorkflowPageId.php
@@ -2,6 +2,7 @@
use Flow\Container;
use Flow\Model\UUID;
+use Flow\OccupationController;
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
@@ -43,7 +44,6 @@
'workflow_wiki' = wfWikiId(),
'workflow_page_id' = 0,
) );
-
$gen = new WorkflowPageIdUpdateGenerator( $wgLang );
$writer = new EchoBatchRowWriter( $dbw, 'flow_workflow',
$wgFlowCluster );
@@ -87,7 +87,31 @@
) );
}
- if ( $title-getArticleID() !== (int)$row-workflow_page_id ) {
+ // title doesn't exist, so create it
+ if ( $title-getArticleID() === 0 ) {
+ // build workflow object (yes, loading them piecemeal
is suboptimal, but
+ // this is just a one-time script; considering the
alternative is
+ // creating a derivative EchoBatchRowIterator that
returns workflows,
+ // it doesn't really matter)
+ $storage = Container::get( 'storage' );
+ $workflow = $storage-get( 'Workflow', UUID::create(
$row-workflow_id ) );
+
+ try {
+ /** @var OccupationController
$occupationController */
+ $occupationController = Container::get(
'occupation_controller' );
+ $occupationController-allowCreation( $title,
$occupationController-getTalkpageManager() );
+ $occupationController-ensureFlowRevision( new
Article( $title ), $workflow );
+
+ // force article id to be refetched from db
+ $title-getArticleID( Title::GAID_FOR_UPDATE );
+ } catch ( \Exception $e ) {
+ // catch all exception to keep going with the
rest we want to
+ // iterate over, we'll report on the failed
entries at the end
+ $this-failed[] = $row;
+ }
+ }
+
+ if ( $title-getArticleID() !== (int) $row-workflow_page_id ) {
// This makes the assumption the page has not moved or
been deleted?
++$this-fixedCount;
return array(
--
To view, visit https://gerrit.wikimedia.org/r/206380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67ac1bc3def5cce143b7b08b5d4301fe741df09b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make travis run - change (mediawiki...WikidataQualityExternalValidation)
Jonaskeutel has uploaded a new change for review. https://gerrit.wikimedia.org/r/206381 Change subject: make travis run .. make travis run Change-Id: I81971a0535755c8c36afa2bde983ab4e78437848 --- M build/travis/before_script.sh 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/81/206381/1 diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index 37d1094..b5c6bc7 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -21,10 +21,10 @@ mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase # checkout WikidataQuality -wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz -tar -zxf master.tar.gz -rm master.tar.gz -mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikidataQuality +wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz +tar -zxf v1.tar.gz +rm v1.tar.gz +mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikidataQuality cd wiki -- To view, visit https://gerrit.wikimedia.org/r/206381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81971a0535755c8c36afa2bde983ab4e78437848 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] stop writing violations into table - change (mediawiki...WikidataQualityExternalValidation)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206383
Change subject: stop writing violations into table
..
stop writing violations into table
since we decided not to have this feature in the first version
Change-Id: Ic4c536da83d7a4401bc4f95fc12e73985d360bee
---
M specials/SpecialCrossCheck.php
1 file changed, 0 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/83/206383/1
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 4056e83..a1877d5 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -9,8 +9,6 @@
use Wikibase\DataModel\Entity\EntityId;
use WikidataQuality\ExternalValidation\CrossCheck\CrossChecker;
use WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult;
-use
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator;
-use WikidataQuality\Violations\ViolationStore;
use WikidataQuality\Html\HtmlTable;
use WikidataQuality\Html\HtmlTableHeader;
use WikidataQuality\Specials\SpecialCheckResultPage;
@@ -64,8 +62,6 @@
protected function executeCheck( EntityDocument $entity ) {
$crossChecker = new CrossChecker();
$results = $crossChecker-crossCheckEntity( $entity );
-
-$this-saveResultsInViolationsTable( $entity, $results );
return $results;
}
@@ -132,15 +128,4 @@
CrossCheckResult::STATUS_DATA_MISMATCH = 'error'
);
}
-
-/**
- * @param EntityDocument $entity
- * @param array $results
- */
-protected function saveResultsInViolationsTable( $entity, $results ) {
-$translator = new CrossCheckResultToViolationTranslator();
-$violations = $translator-translateToViolation( $entity, $results );
-$violationStore = new ViolationStore();
-$violationStore-insertViolations( $violations );
-}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/206383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c536da83d7a4401bc4f95fc12e73985d360bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass scrubWikitext=true to Parsoid - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Pass scrubWikitext=true to Parsoid
..
Pass scrubWikitext=true to Parsoid
But only in html2wt mode.
Bug: T96949
Change-Id: I59dfc317193e9c43c8cf21fdddf82482e325b8ad
---
M includes/Parsoid/Utils.php
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 7901d31..7f90f94 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -89,14 +89,19 @@
throw new WikitextException( 'Unknown source format: '
. $from, 'process-wikitext' );
}
+ $params = array(
+ $from = $content,
+ 'body' = true,
+ );
+ if ( $from === 'html' ) {
+ $params['scrubWikitext'] = 'true';
+ }
+
$request = \MWHttpRequest::factory(
$parsoidURL . '/' . $parsoidPrefix . '/' .
$title-getPrefixedDBkey(),
array(
'method' = 'POST',
- 'postData' = wfArrayToCgi( array(
- $from = $content,
- 'body' = true,
- ) ),
+ 'postData' = wfArrayToCgi( $params ),
'timeout' = $parsoidTimeout,
'connectTimeout' = 'default',
)
--
To view, visit https://gerrit.wikimedia.org/r/206186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59dfc317193e9c43c8cf21fdddf82482e325b8ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [NEVER MERGE] Local hack for testing link inspector - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206390
Change subject: [NEVER MERGE] Local hack for testing link inspector
..
[NEVER MERGE] Local hack for testing link inspector
Change-Id: I6984723782b8d65994e3a7ef3c2cf09c45ca55cf
---
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/90/206390/1
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index cab3f6f..40c461d 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -33,10 +33,10 @@
// Initialization
this.$element.addClass( 've-ui-mwLinkTargetInputWidget' );
this.lookupMenu.$element.addClass( 've-ui-mwLinkTargetInputWidget-menu'
);
- if ( mw.config.get( 'wgVisualEditor' ).usePageImages ) {
+ if ( mw.config.get( 'wgVisualEditor' ).usePageImages || true ) {
this.lookupMenu.$element.addClass(
've-ui-mwLinkTargetInputWidget-menu-withImages' );
}
- if ( mw.config.get( 'wgVisualEditor' ).usePageDescriptions ) {
+ if ( mw.config.get( 'wgVisualEditor' ).usePageDescriptions || true ) {
this.lookupMenu.$element.addClass(
've-ui-mwLinkTargetInputWidget-menu-withDescriptions' );
}
@@ -135,6 +135,9 @@
pithumbsize: 80,
pilimit: 10,
ppprop: 'disambiguation'
+ }, {
+ url:
'https://en.wikipedia.org/w/api.php',
+ dataType: 'jsonp'
} );
promiseAbortObject.abort = req.abort.bind( req
); // todo: ew
return req;
--
To view, visit https://gerrit.wikimedia.org/r/206390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6984723782b8d65994e3a7ef3c2cf09c45ca55cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix up a[rel=mw:ExtLink] to have class=external and rel=n... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix up a[rel=mw:ExtLink] to have class=external and
rel=nofollow
..
Fix up a[rel=mw:ExtLink] to have class=external and rel=nofollow
Respecting MW's domain exceptions for nofollow.
Bug: T68289
Bug: T96855
Change-Id: I7cfdedb0507f9bb93d941b42c011fe9562d7e274
---
M autoload.php
M container.php
A includes/Parsoid/Fixer/ExtLinkFixer.php
3 files changed, 46 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index ff9e156..5049f53 100644
--- a/autoload.php
+++ b/autoload.php
@@ -248,6 +248,7 @@
'Flow\\Parsoid\\Fixer' = __DIR__ . '/includes/Parsoid/Fixer.php',
'Flow\\Parsoid\\Fixer\\BadImageRemover' = __DIR__ .
'/includes/Parsoid/Fixer/BadImageRemover.php',
'Flow\\Parsoid\\Fixer\\BaseHrefFixer' = __DIR__ .
'/includes/Parsoid/Fixer/BaseHrefFixer.php',
+ 'Flow\\Parsoid\\Fixer\\ExtLinkFixer' = __DIR__ .
'/includes/Parsoid/Fixer/ExtLinkFixer.php',
'Flow\\Parsoid\\Fixer\\WikiLinkFixer' = __DIR__ .
'/includes/Parsoid/Fixer/WikiLinkFixer.php',
'Flow\\Parsoid\\ReferenceExtractor' = __DIR__ .
'/includes/Parsoid/ReferenceExtractor.php',
'Flow\\Parsoid\\ReferenceFactory' = __DIR__ .
'/includes/Parsoid/ReferenceFactory.php',
diff --git a/container.php b/container.php
index cb286b4..0f354b3 100644
--- a/container.php
+++ b/container.php
@@ -73,11 +73,16 @@
return new Flow\Parsoid\Fixer\BaseHrefFixer( $wgArticlePath );
};
+$c['ext_link_fixer'] = function ( $c ) {
+ return new Flow\Parsoid\Fixer\ExtLinkFixer();
+};
+
$c['content_fixer'] = function( $c ) {
return new Flow\Parsoid\ContentFixer(
$c['wiki_link_fixer'],
$c['bad_image_remover'],
- $c['base_href_fixer']
+ $c['base_href_fixer'],
+ $c['ext_link_fixer']
);
};
diff --git a/includes/Parsoid/Fixer/ExtLinkFixer.php
b/includes/Parsoid/Fixer/ExtLinkFixer.php
new file mode 100644
index 000..9562e58
--- /dev/null
+++ b/includes/Parsoid/Fixer/ExtLinkFixer.php
@@ -0,0 +1,39 @@
+?php
+
+namespace Flow\Parsoid\Fixer;
+
+use Flow\Parsoid\Fixer;
+
+/**
+ * Parsoid markup doesn't contain class=external for external links. This is
needed for
+ * correct styling, so we add it here.
+ */
+class ExtLinkFixer implements Fixer {
+ /**
+* Returns XPath matching elements that need to be transformed
+*
+* @return string XPath of elements this acts on
+*/
+ public function getXPath() {
+ return '//a[@rel=mw:ExtLink]';
+ }
+
+ /**
+* Adds class=external rel=nofollow to external links.
+*
+* @param \DOMNode $node Link
+* @param \Title $title
+*/
+ public function apply( \DOMNode $node, \Title $title ) {
+ if ( !$node instanceof \DOMElement ) {
+ return;
+ }
+
+ $node-setAttribute( 'class', 'external' );
+
+ global $wgNoFollowLinks, $wgNoFollowDomainExceptions;
+ if ( $wgNoFollowLinks !wfMatchesDomainList(
$node-getAttribute( 'href' ), $wgNoFollowDomainExceptions ) ) {
+ $node-setAttribute( 'rel', 'nofollow' );
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/206344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cfdedb0507f9bb93d941b42c011fe9562d7e274
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make label/description uniqueness checks case insensitive fo... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206386
Change subject: Make label/description uniqueness checks case insensitive for
properties
..
Make label/description uniqueness checks case insensitive for properties
Bug: T97129
Change-Id: Idfc3cbbc66d00b9ef6fbd010c9edd81213541d00
---
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/store/TermIndexTest.php
2 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/206386/1
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index 0d54f05..8d4c247 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -10,6 +10,7 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\LegacyIdInterpreter;
use Wikibase\DataModel\Term\AliasGroup;
use Wikibase\DataModel\Term\Fingerprint;
@@ -827,13 +828,16 @@
$templates = $this-makeQueryTerms( $labels, Term::TYPE_LABEL );
+ // Property label conflict checks aren't case sensitive.
T73785/T97129
+ // XXX: This knowledge should probably not be here :/
+ $caseSensitive = $entityType !== Property::ENTITY_TYPE;
$labelConflicts = $this-getMatchingTerms(
$templates,
Term::TYPE_LABEL,
$entityType,
array(
'LIMIT' = $this-maxConflicts,
- 'caseSensitive' = false
+ 'caseSensitive' = $caseSensitive
)
);
@@ -891,11 +895,23 @@
$description = $descriptions[$lang];
$matchConditions = array(
- 'L.term_language' = $lang,
- 'L.term_search_key' = $this-getSearchKey(
$label, $lang ),
- 'D.term_search_key' = $this-getSearchKey(
$description, $lang )
+ 'L.term_language' = $lang
);
+ // Property conflict checks aren't case sensitive.
T73785/T97129
+ // XXX: This knowledge should probably not be here :/
+ if ( $entityType === Property::ENTITY_TYPE ) {
+ $matchConditions = array(
+ 'L.term_text' = $label,
+ 'D.term_text' = $description,
+ );
+ } else {
+ $matchConditions = array(
+ 'L.term_search_key' =
$this-getSearchKey( $label, $lang ),
+ 'D.term_search_key' =
$this-getSearchKey( $description, $lang )
+ );
+ }
+
$termConditions[] = $dbr-makeList( $matchConditions,
LIST_AND );
}
diff --git a/lib/tests/phpunit/store/TermIndexTest.php
b/lib/tests/phpunit/store/TermIndexTest.php
index 4090b3b..2b577bc 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -389,7 +389,7 @@
array( 'de' = 'Foo' ),
array( 'P6' ),
),
- 'by label, different case' = array(
+ 'by label, different case (property only)' = array(
$entities,
Property::ENTITY_TYPE,
array( 'de' = 'fOO' ),
@@ -452,16 +452,16 @@
array( 'de' = 'Bar' ),
array( 'Q1' ),
),
- 'by label and description, different label
capitalization' = array(
+ 'by label and description, different label
capitalization (property only)' = array(
$entities,
- Item::ENTITY_TYPE,
+ Property::ENTITY_TYPE,
array( 'de' = 'fOO' ),
array( 'de' = 'Bar' ),
array( 'Q1' ),
),
- 'by label and description, different description
capitalization' = array(
+ 'by label and description, different description
capitalization (property only)' = array(
$entities,
- Item::ENTITY_TYPE,
+
[MediaWiki-commits] [Gerrit] Edited by username timeago should link to the most recent ... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Edited by username timeago should link to the most recent
diff of that post
..
Edited by username timeago should link to the most recent diff of that post
Bug: T94090
Change-Id: Ib8c9d0d09765651329c1f8a273bf5cb640b8c908
---
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post_meta_actions.partial.handlebars
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 36f9007..b5c29ad 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -98,7 +98,7 @@
'.LCRun3::hbch($cx, 'ifCond', array(array(((isset($in['creator']['name'])
is_array($in['creator'])) ? $in['creator']['name'] :
null),'===',((isset($in['lastEditUser']['name'])
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
$in, false, function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n', array(array('flow-edited'),array()), 'encq').'
';}, function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n',
array(array('flow-edited-by',((isset($in['lastEditUser']['name'])
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
'encq').'
';}).' /span
- a
href='.htmlentities((string)((isset($in['links']['topic-history']['url'])
is_array($in['links']['topic-history'])) ? $in['links']['topic-history']['url']
: null), ENT_QUOTES, 'UTF-8').'
class=flow-timestamp-anchor'.LCRun3::ch($cx, 'uuidTimestamp',
array(array(((isset($in['lastEditId']) is_array($in)) ? $in['lastEditId'] :
null)),array()), 'encq').'/a
+ a
href='.htmlentities((string)((isset($in['links']['diff-prev']['url'])
is_array($in['links']['diff-prev'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').' class=flow-timestamp-anchor'.LCRun3::ch($cx,
'uuidTimestamp', array(array(((isset($in['lastEditId']) is_array($in)) ?
$in['lastEditId'] : null)),array()), 'encq').'/a
').' /span
/div
';},'flow_moderation_actions_list' = function ($cx, $in) {return
'section'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderationType']) is_array($in)) ?
$in['moderationType'] : null),'===','topic'),array()), $in, false,
function($cx, $in) {return ''.((LCRun3::ifvar($cx,
((isset($in['actions']['edit']) is_array($in['actions'])) ?
$in['actions']['edit'] : null))) ? 'li
class=flow-js'.htmlentities((string)((isset($in['noop']) is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'a
class='.htmlentities((string)((isset($in['moderationMwUiClass'])
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-quiet
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 7f7ea99..b6939f2 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -98,7 +98,7 @@
'.LCRun3::hbch($cx, 'ifCond', array(array(((isset($in['creator']['name'])
is_array($in['creator'])) ? $in['creator']['name'] :
null),'===',((isset($in['lastEditUser']['name'])
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
$in, false, function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n', array(array('flow-edited'),array()), 'encq').'
';}, function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n',
array(array('flow-edited-by',((isset($in['lastEditUser']['name'])
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
'encq').'
';}).' /span
- a
href='.htmlentities((string)((isset($in['links']['topic-history']['url'])
is_array($in['links']['topic-history'])) ? $in['links']['topic-history']['url']
: null), ENT_QUOTES, 'UTF-8').'
class=flow-timestamp-anchor'.LCRun3::ch($cx, 'uuidTimestamp',
array(array(((isset($in['lastEditId']) is_array($in)) ? $in['lastEditId'] :
null)),array()), 'encq').'/a
+ a
href='.htmlentities((string)((isset($in['links']['diff-prev']['url'])
is_array($in['links']['diff-prev'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').' class=flow-timestamp-anchor'.LCRun3::ch($cx,
'uuidTimestamp', array(array(((isset($in['lastEditId']) is_array($in)) ?
$in['lastEditId'] :
[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206378
Change subject: fix for required options on api call
..
fix for required options on api call
(need cherry pick to REL1_23)
Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
(cherry picked from commit 4e717166da56c72cb9e515da8e242f10cc81be0f)
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/78/206378/1
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 21b78cd..43b96ba 100644
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -317,7 +317,8 @@
if (!$module instanceof ApiParse) {
return true;
}
- if
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') ==
false){
+ $oTitle = Title::newFromText( $module-getRequest()-getVal(
'page' ) );
+ if ( !is_null( $oTitle ) $oTitle-userCan( 'read' ) == false
) {
$message = wfMessage('loginreqpagetext',
wfMessage('loginreqlink')-plain())-plain();
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/206378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted travis file to run on branch v1. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/206379 Change subject: Adopted travis file to run on branch v1. .. Adopted travis file to run on branch v1. Change-Id: Ie2b85aaa0fe473b62c5feb6b02d7b1f1cb680cc9 --- M build/travis/before_script.sh 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints refs/changes/79/206379/1 diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index fcfcfdf..76091b3 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -21,10 +21,10 @@ mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase # checkout WikidataQuality -wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz -tar -zxf master.tar.gz -rm master.tar.gz -mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikidataQuality +wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz +tar -zxf v1.tar.gz +rm v1.tar.gz +mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikidataQuality cd wiki -- To view, visit https://gerrit.wikimedia.org/r/206379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2b85aaa0fe473b62c5feb6b02d7b1f1cb680cc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make FlowUpdateWorkflowPageId a run-once updatescript - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206382
Change subject: Make FlowUpdateWorkflowPageId a run-once updatescript
..
Make FlowUpdateWorkflowPageId a run-once updatescript
We want to include this in update.php so it automatically
runs (well, except for wmf production)
We only want it to run once though, but now our code
shouldn't allow 0 values anymore (guarded by an exception)
so there shouldn't be any need to run this more than once.
Change-Id: I65b730bb622034538918ed47c2945ca6639daa04
---
M Hooks.php
M maintenance/FlowUpdateWorkflowPageId.php
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/82/206382/1
diff --git a/Hooks.php b/Hooks.php
index 7e1daee..621e654 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -196,6 +196,9 @@
require_once __DIR__.'/maintenance/FlowFixLog.php';
$updater-addPostDatabaseUpdateMaintenance( 'FlowFixLog' );
+ require_once
__DIR__.'/maintenance/FlowUpdateWorkflowPageId.php';
+ $updater-addPostDatabaseUpdateMaintenance(
'FlowUpdateWorkflowPageId' );
+
return true;
}
diff --git a/maintenance/FlowUpdateWorkflowPageId.php
b/maintenance/FlowUpdateWorkflowPageId.php
index a4a61ac..6ebf1a9 100644
--- a/maintenance/FlowUpdateWorkflowPageId.php
+++ b/maintenance/FlowUpdateWorkflowPageId.php
@@ -17,7 +17,7 @@
*
* @ingroup Maintenance
*/
-class FlowUpdateWorkflowPageId extends Maintenance {
+class FlowUpdateWorkflowPageId extends LoggedUpdateMaintenance {
public function __construct() {
parent::__construct();
$this-mDescription = Update workflow_page_id with the page id
of its specified ns/title;
@@ -28,7 +28,7 @@
* Assembles the update components, runs them, and reports
* on what they did
*/
- public function execute() {
+ public function doDbUpdates() {
global $wgFlowCluster, $wgLang;
$dbw = Container::get( 'db.factory' )-getDB( DB_MASTER );
@@ -55,6 +55,10 @@
return true;
}
+
+ protected function getUpdateKey() {
+ return __CLASS__;
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/206382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65b730bb622034538918ed47c2945ca6639daa04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make travis run - change (mediawiki...WikidataQualityExternalValidation)
Jonaskeutel has submitted this change and it was merged. Change subject: make travis run .. make travis run Change-Id: I81971a0535755c8c36afa2bde983ab4e78437848 --- M build/travis/before_script.sh 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jonaskeutel: Verified; Looks good to me, approved diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh index 37d1094..b5c6bc7 100644 --- a/build/travis/before_script.sh +++ b/build/travis/before_script.sh @@ -21,10 +21,10 @@ mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase # checkout WikidataQuality -wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz -tar -zxf master.tar.gz -rm master.tar.gz -mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikidataQuality +wget https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz +tar -zxf v1.tar.gz +rm v1.tar.gz +mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikidataQuality cd wiki -- To view, visit https://gerrit.wikimedia.org/r/206381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81971a0535755c8c36afa2bde983ab4e78437848 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de Gerrit-Reviewer: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce complexity in HtmlTable::__construct - change (mediawiki...WikidataQuality)
Andreasburmeister has submitted this change and it was merged.
Change subject: Reduce complexity in HtmlTable::__construct
..
Reduce complexity in HtmlTable::__construct
Change-Id: I8311868d706197566c0181a273f1ef79803edd40
---
M includes/Html/HtmlTable.php
1 file changed, 21 insertions(+), 13 deletions(-)
Approvals:
Andreasburmeister: Looks good to me, approved
diff --git a/includes/Html/HtmlTable.php b/includes/Html/HtmlTable.php
index 4a127a0..07a7842 100644
--- a/includes/Html/HtmlTable.php
+++ b/includes/Html/HtmlTable.php
@@ -38,24 +38,32 @@
/**
* @param array $headers
+* @throws InvalidArgumentException
*/
public function __construct( $headers ) {
- if ( is_array( $headers ) ) {
- foreach ( $headers as $header ) {
- if ( is_string( $header ) ) {
- $this-headers[ ] = new
HtmlTableHeader( $header );
- } else if ( $header instanceof HtmlTableHeader
) {
- $this-headers[ ] = $header;
+ if ( !is_array( $headers ) ) {
+ throw new InvalidArgumentException( '$headers must be
an array of strings or HtmlTableHeader elements.' );
+ }
- if ( $header-getIsSortable() ) {
- $this-isSortable = true;
- }
- } else {
- throw new InvalidArgumentException(
'$headers must be an array of strings or HtmlTableHeader elements.' );
- }
+ foreach ( $headers as $header ) {
+ $this-addHeader( $header );
+ }
+ }
+
+ /**
+* @param string|HtmlTableHeader $header
+*/
+ private function addHeader( $header ) {
+ if ( is_string( $header ) ) {
+ $this-headers[] = new HtmlTableHeader( $header );
+ } else if ( $header instanceof HtmlTableHeader ) {
+ $this-headers[] = $header;
+
+ if ( $header-getIsSortable() ) {
+ $this-isSortable = true;
}
} else {
- throw new InvalidArgumentException( '$headers must be
an array of strings or HtmlTableHeader elements.' );
+ throw new InvalidArgumentException( 'Each element in
$headers must be a string or an HtmlTableHeader' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/206295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8311868d706197566c0181a273f1ef79803edd40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style changes in the Html classes - change (mediawiki...WikidataQuality)
Andreasburmeister has submitted this change and it was merged.
Change subject: Style changes in the Html classes
..
Style changes in the Html classes
Change-Id: I9ca9367701e93067b486acf297ab9475bc318ed4
---
M includes/Html/HtmlTable.php
M includes/Html/HtmlTableCell.php
M includes/Html/HtmlTableHeader.php
3 files changed, 10 insertions(+), 25 deletions(-)
Approvals:
Andreasburmeister: Looks good to me, approved
diff --git a/includes/Html/HtmlTable.php b/includes/Html/HtmlTable.php
index 07a7842..badf488 100644
--- a/includes/Html/HtmlTable.php
+++ b/includes/Html/HtmlTable.php
@@ -5,10 +5,7 @@
use Doctrine\Instantiator\Exception\InvalidArgumentException;
use Html;
-
/**
- * Class HtmlTable
- *
* @package WikidataQuality\Html
* @author BP2014N1
* @license GNU GPL v2+
@@ -16,21 +13,17 @@
class HtmlTable {
/**
-* Headers of the table.
-*
-* @var HtmlTableHeader
+* @var HtmlTableHeader[]
*/
- private $headers = array ();
+ private $headers = array();
/**
-* Rows of the table.
-*
* @var array
*/
- private $rows = array ();
+ private $rows = array();
/**
-* Determines, whether the table is sortable.
+* Determines whether the table is sortable.
*
* @var bool
*/
@@ -75,7 +68,7 @@
}
/**
-* @return array
+* @return array[]
*/
public function getRows() {
return $this-rows;
@@ -94,14 +87,13 @@
* @param $cells
*/
public function appendRow( array $cells ) {
- // Add cells into new row
- $this-appendRows( array ( $cells ) );
+ $this-appendRows( array( $cells ) );
}
/**
* Adds rows with specified cells to table.
*
-* @param array $rows
+* @param array[] $rows
*/
public function appendRows( array $rows ) {
// Check rows
@@ -112,7 +104,7 @@
foreach ( $cells as $cellKey = $cell ) {
if ( is_string( $cell ) ) {
- $rows[ $rowKey ][ $cellKey ] = new
HtmlTableCell( $cell );
+ $rows[$rowKey][$cellKey] = new
HtmlTableCell( $cell );
} else if ( !$cell instanceof HtmlTableCell ) {
throw new InvalidArgumentException(
'$rows must be array of arrays of HtmlTableCell objects.' );
}
diff --git a/includes/Html/HtmlTableCell.php b/includes/Html/HtmlTableCell.php
index 78ca845..875f412 100644
--- a/includes/Html/HtmlTableCell.php
+++ b/includes/Html/HtmlTableCell.php
@@ -5,10 +5,7 @@
use Doctrine\Instantiator\Exception\InvalidArgumentException;
use Html;
-
/**
- * Class HtmlTableCell
- *
* @package WikidataQuality\Html
* @author BP2014N1
* @license GNU GPL v2+
@@ -37,7 +34,7 @@
private $colSpan;
/**
-* @param $content
+* @param string $content
* @param int $rowSpan
* @param int $colSpan
*/
diff --git a/includes/Html/HtmlTableHeader.php
b/includes/Html/HtmlTableHeader.php
index 831a2b3..a9ce853 100644
--- a/includes/Html/HtmlTableHeader.php
+++ b/includes/Html/HtmlTableHeader.php
@@ -5,10 +5,7 @@
use Doctrine\Instantiator\Exception\InvalidArgumentException;
use Html;
-
/**
- * Class HtmlTableHeader
- *
* @package WikidataQuality\Html
* @author BP2014N1
* @license GNU GPL v2+
@@ -34,7 +31,6 @@
* @param bool $isSortable
*/
public function __construct( $content, $isSortable = false ) {
- // Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be
string.' );
}
@@ -70,7 +66,7 @@
'role' = 'columnheader button'
);
if ( !$this-isSortable ) {
- $attributes[ 'class' ] = 'unsortable';
+ $attributes['class'] = 'unsortable';
}
return
--
To view, visit https://gerrit.wikimedia.org/r/206296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ca9367701e93067b486acf297ab9475bc318ed4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Andreasburmeister andreas.burmeis...@student.hpi.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 0.7 - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/206385 Change subject: Version 0.7 .. Version 0.7 Change-Id: Ie18002a91d9d880bb8ecbc96241e4f11b919a41e --- M Cargo.php M README 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/85/206385/1 diff --git a/Cargo.php b/Cargo.php index 4f7e219..ee43bb5 100644 --- a/Cargo.php +++ b/Cargo.php @@ -8,7 +8,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); -define( 'CARGO_VERSION', '0.6.1' ); +define( 'CARGO_VERSION', '0.7' ); $wgExtensionCredits['parserhook'][] = array( 'path' = __FILE__, diff --git a/README b/README index a1fa52d..4d60b33 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Cargo extension -Version 0.6.1 +Version 0.7 Yaron Koren This is free software licensed under the GNU General Public License. Please @@ -50,6 +50,13 @@ require_once( $IP/extensions/Cargo/Cargo.php ); +== Credits == + +Cargo was created, and mostly written by, Yaron Koren. + +Important code contributions were also made by Ad Strack van Schijndel, +Namit Ohri and Vivek Ghaisas. + == Contact == Comments, questions, suggestions and bug reports can be sent to either the -- To view, visit https://gerrit.wikimedia.org/r/206385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie18002a91d9d880bb8ecbc96241e4f11b919a41e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] stop writing violations into table - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206384
Change subject: stop writing violations into table
..
stop writing violations into table
since we decided not to have this feature in version 1
Change-Id: Iffa4944e066dd083ed84332111e21082d0dba2ab
---
M WikidataQualityConstraintsHooks.php
M specials/SpecialConstraintReport.php
2 files changed, 2 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/84/206384/1
diff --git a/WikidataQualityConstraintsHooks.php
b/WikidataQualityConstraintsHooks.php
index d272a20..e57ae9d 100644
--- a/WikidataQualityConstraintsHooks.php
+++ b/WikidataQualityConstraintsHooks.php
@@ -32,4 +32,5 @@
$db = $loadBalancer-getConnection( DB_MASTER );
$db-insert( EVALUATION_TABLE, $accumulator );
}
+
}
\ No newline at end of file
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index 074bd8b..30bd39e 100755
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -14,11 +14,9 @@
use Wikibase\Repo\WikibaseRepo;
use WikidataQuality\ConstraintReport\CheckForConstraintViolationsJob;
use WikidataQuality\ConstraintReport\ConstraintCheck\ConstraintChecker;
-use
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator;
use WikidataQuality\Html\HtmlTable;
use WikidataQuality\Html\HtmlTableHeader;
use WikidataQuality\Specials\SpecialCheckResultPage;
-use WikidataQuality\Violations\ViolationStore;
use JobQueueGroup;
@@ -102,7 +100,6 @@
$constraintChecker = new ConstraintChecker( $this-entityLookup
);
$results = $constraintChecker-execute( $entity );
- $this-saveResultsInViolationsTable( $entity, $results );
$this-doEvaluation( $entity, $results );
return $results;
}
@@ -290,19 +287,8 @@
);
}
- /**
-* @param EntityDocument $entity
-* @param array $results
-*/
- protected function saveResultsInViolationsTable( $entity, $results ) {
- $translator = new CheckResultToViolationTranslator();
- $violations = $translator-translateToViolation( $entity,
$results );
- $violationStore = new ViolationStore();
- $violationStore-insertViolations( $violations );
- }
-
protected function doEvaluation( $entity, $results ) {
- //TODO: Push (deferred) job(s) in queue
+ //TODO: Push (deferred) job(s) in queue (seems to be okay but
not working with mySql)
$checkTimeStamp = wfTimestamp( TS_MW );
$jobs = array ();
$jobs[ ] = CheckForConstraintViolationsJob::newInsertNow(
$entity, $checkTimeStamp, $results );
--
To view, visit https://gerrit.wikimedia.org/r/206384
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffa4944e066dd083ed84332111e21082d0dba2ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into v1 - change (mediawiki...WikidataQualityExternalValidation)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206391
Change subject: Merge branch 'master' into v1
..
Merge branch 'master' into v1
Conflicts:
specials/SpecialCrossCheck.php
Change-Id: I08d6af28ade2d766b34ca171dc14c10eb79c49df
---
M specials/SpecialCrossCheck.php
1 file changed, 0 insertions(+), 28 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/91/206391/1
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 681c202..a41bede 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -9,13 +9,8 @@
use Wikibase\DataModel\Entity\EntityId;
use WikidataQuality\ExternalValidation\CrossCheck\CrossChecker;
use WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult;
- HEAD (01f9b9 stop writing violations into table)
-===
-use
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator;
use WikidataQuality\ExternalValidation\CheckForCrossCheckViolationsJob;
use JobQueueGroup;
-use WikidataQuality\Violations\ViolationStore;
- BRANCH (350084 Localisation updates from https://translatewiki.net.)
use WikidataQuality\Html\HtmlTable;
use WikidataQuality\Html\HtmlTableHeader;
use WikidataQuality\Specials\SpecialCheckResultPage;
@@ -66,19 +61,11 @@
*
* @return string
*/
- HEAD (01f9b9 stop writing violations into table)
- protected function executeCheck( EntityDocument $entity ) {
- $crossChecker = new CrossChecker();
- $results = $crossChecker-crossCheckEntity( $entity );
-===
protected function executeCheck( Entity $entity ) {
$crossChecker = new CrossChecker( $entity );
$results = $crossChecker-crossCheckEntity();
$this-doEvaluation( $entity, $results );
-
- $this-saveResultsInViolationsTable( $entity, $results );
- BRANCH (350084 Localisation updates from https://translatewiki.net.)
return $results;
}
@@ -145,20 +132,6 @@
CrossCheckResult::STATUS_DATA_MISMATCH = 'error'
);
}
- HEAD (01f9b9 stop writing violations into table)
-}
-===
-
- /**
-* @param EntityDocument $entity
-* @param array $results
-*/
- protected function saveResultsInViolationsTable( $entity, $results ) {
- $translator = new CrossCheckResultToViolationTranslator();
- $violations = $translator-translateToViolation( $entity,
$results );
- $violationStore = new ViolationStore();
- $violationStore-insertViolations( $violations );
- }
protected function doEvaluation( $entity, $results ) {
//TODO: Push (deferred) job(s) in queue
@@ -172,4 +145,3 @@
JobQueueGroup::singleton()-push( $jobs );
}
}
- BRANCH (350084 Localisation updates from https://translatewiki.net.)
--
To view, visit https://gerrit.wikimedia.org/r/206391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08d6af28ade2d766b34ca171dc14c10eb79c49df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)
Pwirth has submitted this change and it was merged.
Change subject: fix for required options on api call
..
fix for required options on api call
Change-Id: I16bc1921d79cc92d0e1d4716d156fa5a8658b909
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Pwirth: Verified; Looks good to me, approved
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 01df79f..f82db79 100644
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -279,7 +279,8 @@
public static function onApiCheckCanExecute( $module, $user, $message
){
if (!$module instanceof ApiParse)
return true;
- if
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') ==
false){
+ $oTitle = Title::newFromText( $module-getRequest()-getVal(
'page' ) );
+ if ( !is_null( $oTitle ) $oTitle-userCan( 'read' ) == false
) {
$message = wfMessage('loginreqpagetext',
wfMessage('loginreqlink')-plain())-plain();
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/206358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16bc1921d79cc92d0e1d4716d156fa5a8658b909
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)
Pwirth has submitted this change and it was merged.
Change subject: fix for required options on api call
..
fix for required options on api call
(need cherry pick to REL1_23)
Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Pwirth: Verified; Looks good to me, approved
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 21b78cd..43b96ba 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -317,7 +317,8 @@
if (!$module instanceof ApiParse) {
return true;
}
- if
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') ==
false){
+ $oTitle = Title::newFromText( $module-getRequest()-getVal(
'page' ) );
+ if ( !is_null( $oTitle ) $oTitle-userCan( 'read' ) == false
) {
$message = wfMessage('loginreqpagetext',
wfMessage('loginreqlink')-plain())-plain();
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/206359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-04-24T10:00:02+0000 - change (mediawiki...Wikidata)
JanZerebecki has submitted this change and it was merged. Change subject: New Wikidata Build - 2015-04-24T10:00:02+ .. New Wikidata Build - 2015-04-24T10:00:02+ Change-Id: I8aae4be280401f674904667d2990d69d2e26467c --- M composer.lock M extensions/Wikibase/client/i18n/ast.json M extensions/Wikibase/client/i18n/ckb.json M extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php M extensions/Wikibase/lib/i18n/ckb.json M extensions/Wikibase/repo/config/Wikibase.default.php M extensions/Wikibase/repo/config/Wikibase.example.php M extensions/Wikibase/repo/i18n/es.json M extensions/Wikibase/repo/i18n/it.json M extensions/Wikibase/repo/i18n/ko.json M extensions/Wikibase/repo/i18n/lt.json M extensions/Wikibase/repo/i18n/ta.json M extensions/Wikibase/repo/i18n/yi.json M extensions/Wikibase/repo/i18n/zh-hans.json M extensions/Wikibase/repo/includes/LinkedData/EntityDataSerializationService.php M extensions/Wikibase/repo/includes/rdf/ComplexValueRdfBuilder.php M extensions/Wikibase/repo/includes/rdf/FullStatementRdfBuilder.php M extensions/Wikibase/repo/includes/rdf/RdfBuilder.php M extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php M extensions/Wikibase/repo/includes/rdf/TruthyStatementRdfBuilder.php M extensions/Wikibase/repo/includes/specials/SpecialItemByTitle.php M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_minimal.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q6_no_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q6_with_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_all_refs_seen.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_no_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_all_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_claims.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_props.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_resolved.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_truthy_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q4_values.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q6_no_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q6_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_no_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_references.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q7_refs.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q8.json M extensions/Wikibase/repo/tests/phpunit/data/rdf/Q8_baddates.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/TruthyStatementRdfBuilder/Q4_statements.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/dump_entities.nt M extensions/Wikibase/repo/tests/phpunit/data/rdf/dump_refs.nt M extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/rdf/SimpleValueRdfBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php M extensions/Wikibase/view/src/EntityViewFactory.php M vendor/composer/installed.json 53 files changed, 737 insertions(+), 625 deletions(-) Approvals: JanZerebecki: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/206367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8aae4be280401f674904667d2990d69d2e26467c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: WikidataBuilder wikidata-servi...@wikimedia.de Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 0.7 - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged. Change subject: Version 0.7 .. Version 0.7 Change-Id: Ie18002a91d9d880bb8ecbc96241e4f11b919a41e --- M Cargo.php M README 2 files changed, 9 insertions(+), 2 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/Cargo.php b/Cargo.php index 4f7e219..ee43bb5 100644 --- a/Cargo.php +++ b/Cargo.php @@ -8,7 +8,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); -define( 'CARGO_VERSION', '0.6.1' ); +define( 'CARGO_VERSION', '0.7' ); $wgExtensionCredits['parserhook'][] = array( 'path' = __FILE__, diff --git a/README b/README index a1fa52d..4d60b33 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Cargo extension -Version 0.6.1 +Version 0.7 Yaron Koren This is free software licensed under the GNU General Public License. Please @@ -50,6 +50,13 @@ require_once( $IP/extensions/Cargo/Cargo.php ); +== Credits == + +Cargo was created, and mostly written by, Yaron Koren. + +Important code contributions were also made by Ad Strack van Schijndel, +Namit Ohri and Vivek Ghaisas. + == Contact == Comments, questions, suggestions and bug reports can be sent to either the -- To view, visit https://gerrit.wikimedia.org/r/206385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie18002a91d9d880bb8ecbc96241e4f11b919a41e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added job for WikidataQuality extension. - change (integration/config)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206392
Change subject: Added job for WikidataQuality extension.
..
Added job for WikidataQuality extension.
Change-Id: I16825b41f90c735811b5463e122f302b54cf7bd3
---
M jjb/mediawiki-extensions.yaml
M jjb/wikidata.yaml
2 files changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/92/206392/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b6ad09d..fcd7ced 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -538,7 +538,6 @@
- WikibaseJavaScriptApi
- Wikidata # bug T95897
- WikidataEntitySuggester
- - WikidataQuality
- WikiGrok:
dependencies: 'Echo,MobileFrontend,Mantle,VisualEditor'
- wikihiero:
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index c86a1cb..aa767ec 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -271,3 +271,37 @@
name: wikidata-query-rdf
jobs:
- wikidata-query-rdf
+
+- project:
+name: WikidataQuality
+# By default we do not need any other extensions:
+dependencies:
+
+wrappers:
+ - timeout:
+ timeout: 30
+ fail: true
+ - timestamps
+ - ansicolor
+
+jobs:
+
+ - '{name}-{ext-name}-npm':
+name: 'mwext'
+ext-name: 'WikidataQuality'
+
+ - 'mwext-WikidataQuality-{kind}-tests-{dbflavor}-{phpflavor}':
+ext-name: 'WikidataQuality'
+kind: repo
+repoorclient: 'repo'
+dependencies: 'Wikibase'
+dbflavor:
+ - mysql
+ - sqlite
+phpflavor:
+ - zend
+ - hhvm
+phpunit-params: '--group WikidataQuality'
+
+ - 'mwext-WikidataQuality-qunit':
+ext-name: 'WikidataQuality'
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/206392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16825b41f90c735811b5463e122f302b54cf7bd3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gridengine: Use proper syntax for template variables - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: gridengine: Use proper syntax for template variables .. gridengine: Use proper syntax for template variables Change-Id: I9b9a21a693a6026cfdf94e3419b0f174f5a20872 --- M modules/gridengine/templates/default-gridengine-shadow.erb M modules/gridengine/templates/gridengine.preseed.erb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/gridengine/templates/default-gridengine-shadow.erb b/modules/gridengine/templates/default-gridengine-shadow.erb index 429885a..ab60f5b 100644 --- a/modules/gridengine/templates/default-gridengine-shadow.erb +++ b/modules/gridengine/templates/default-gridengine-shadow.erb @@ -4,5 +4,5 @@ SGE_START_MASTERD=no SGE_START_EXECD=no -SGE_ROOT=%= sgeroot % +SGE_ROOT=%= @sgeroot % SGE_CELL=default diff --git a/modules/gridengine/templates/gridengine.preseed.erb b/modules/gridengine/templates/gridengine.preseed.erb index e41e5fc..aba4069 100644 --- a/modules/gridengine/templates/gridengine.preseed.erb +++ b/modules/gridengine/templates/gridengine.preseed.erb @@ -1,3 +1,3 @@ gridengine-common shared/gridenginecell string default gridengine-common shared/gridengineconfig boolean true -gridengine-common shared/gridenginemaster string %= gridmaster % +gridengine-common shared/gridenginemaster string %= @gridmaster % -- To view, visit https://gerrit.wikimedia.org/r/206417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b9a21a693a6026cfdf94e3419b0f174f5a20872 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com 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 ferm rules for impala daemons - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206420
Change subject: Add ferm rules for impala daemons
..
Add ferm rules for impala daemons
Change-Id: I350e549e04779dd8ef29b36d1c9377f103e3cddd
---
M manifests/role/analytics/impala.pp
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/206420/1
diff --git a/manifests/role/analytics/impala.pp
b/manifests/role/analytics/impala.pp
index de232f8..87323ce 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -18,6 +18,12 @@
class role::analytics::impala::worker {
include role::analytics::impala
include cdh::impala::worker
+
+ferm::service { 'impalad':
+proto = 'tcp',
+port = '(22000 28000)',
+srange = '$ANALYTICS_NETWORKS',
+}
}
# == Class role::analytics::impala::master
@@ -26,4 +32,20 @@
class role::analytics::impala::master {
include role::analytics::impala
include cdh::impala::master
+
+ferm::service { 'impala-state-store':
+proto = 'tcp',
+port = '24000',
+srange = '$ANALYTICS_NETWORKS',
+}
+ferm::service { 'impala-catalog':
+proto = 'tcp',
+port = '25020',
+srange = '$ANALYTICS_NETWORKS',
+}
+ferm::service { 'impala-llama':
+proto = 'tcp',
+port = '(15000 15001 15002)'
+srange = '$ANALYTICS_NETWORKS',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/206420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I350e549e04779dd8ef29b36d1c9377f103e3cddd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contacts: delete Apache template, adjust role - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: contacts: delete Apache template, adjust role
..
contacts: delete Apache template, adjust role
This service has been retired. The Apache site isn't used anymore,
and we just keep the role for the backup for now.
Bug:T90679
Change-Id: I8b8c13dea31703d9cd2a98e0d189009b0b180e02
---
M manifests/role/contacts.pp
D templates/apache/sites/contacts.wikimedia.org.erb
2 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/contacts.pp b/manifests/role/contacts.pp
index efc4c30..a5805f7 100644
--- a/manifests/role/contacts.pp
+++ b/manifests/role/contacts.pp
@@ -1,9 +1,9 @@
-# https://contacts.wikimedia.org | http://en.wikipedia.org/wiki/CiviCRM
+# T90679
class role::contacts {
-system::role { 'role::contacts': description = 'contacts.wikimedia.org -
Drupal/CiviCRM' }
+system::role { 'role::contacts': description = '(retired)
contacts.wikimedia.org - Drupal/CiviCRM' }
-include role::backup::host
-backup::set {'srv-org-wikimedia-contacts': }
+include role::backup::host
+backup::set {'srv-org-wikimedia-contacts': }
}
diff --git a/templates/apache/sites/contacts.wikimedia.org.erb
b/templates/apache/sites/contacts.wikimedia.org.erb
deleted file mode 100644
index 4a575cd..000
--- a/templates/apache/sites/contacts.wikimedia.org.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-VirtualHost *:80
-ServerAdmin n...@wikimedia.org
-ServerName contacts.wikimedia.org
-
-DocumentRoot /srv/org/wikimedia/contacts-disabled/
-
-/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/206421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b8c13dea31703d9cd2a98e0d189009b0b180e02
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix category column count regression - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix category column count regression
..
Fix category column count regression
T55130 redesigned category view to use dynamic CSS-based columns
instead of the old fixed 3-column layout. The design was updated
in I20b68dea8f, setting the column width to 25em.
However, on 1280px screen, this reduces the layout to just 2 columns,
as 3 columns do not fit: With the default 14px font, 25em translates
to 350px of column width, plus 1em of column-gap, therefore, 1078px
of space would be required for three columns. However, a 1280px
screen seems to have only 1038px left for content, so 40px are
missing.
By reducing the column size slightly to 24em, three columns are back.
Bug: T55130
Change-Id: I2dbecf809c54d786579bdf3826efbf85ad822c7c
(cherry picked from commit 7a4cce3fde69512ae17877b20afd464b64ffd3e3)
---
M resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
index f01115b..387b020 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
+++ b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
@@ -2,7 +2,7 @@
.mw-category {
.column-count(3);
- .column-width(25em);
+ .column-width(24em);
.mw-category-group {
li {
.column-break-inside-avoid;
--
To view, visit https://gerrit.wikimedia.org/r/206419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2dbecf809c54d786579bdf3826efbf85ad822c7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Mormegil morme...@centrum.cz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: expose $wmfUdp2logDest to wmfLabsOverrideSettings() - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: beta: expose $wmfUdp2logDest to wmfLabsOverrideSettings()
..
beta: expose $wmfUdp2logDest to wmfLabsOverrideSettings()
Bug: T97138
Change-Id: I264899aad66980f69310f4a8b93165eace5a1b7d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 81d4e6a..a67df9f 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -16,7 +16,7 @@
* Settings are fetched through wmfLabsSettings() defined below.
*/
function wmfLabsOverrideSettings() {
- global $wmfConfigDir, $wgConf;
+ global $wmfConfigDir, $wgConf, $wmfUdp2logDest;
// Override (or add) settings that we need within the labs environment,
// but not in production.
--
To view, visit https://gerrit.wikimedia.org/r/206414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I264899aad66980f69310f4a8b93165eace5a1b7d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org
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 ferm rules for impala daemons - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Add ferm rules for impala daemons
..
Add ferm rules for impala daemons
Bug: T96329
Change-Id: I350e549e04779dd8ef29b36d1c9377f103e3cddd
---
M manifests/role/analytics/impala.pp
1 file changed, 22 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/analytics/impala.pp
b/manifests/role/analytics/impala.pp
index de232f8..31cb6dc 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -18,6 +18,12 @@
class role::analytics::impala::worker {
include role::analytics::impala
include cdh::impala::worker
+
+ferm::service { 'impalad':
+proto = 'tcp',
+port = '(22000 28000)',
+srange = '$ANALYTICS_NETWORKS',
+}
}
# == Class role::analytics::impala::master
@@ -26,4 +32,20 @@
class role::analytics::impala::master {
include role::analytics::impala
include cdh::impala::master
+
+ferm::service { 'impala-state-store':
+proto = 'tcp',
+port = '24000',
+srange = '$ANALYTICS_NETWORKS',
+}
+ferm::service { 'impala-catalog':
+proto = 'tcp',
+port = '25020',
+srange = '$ANALYTICS_NETWORKS',
+}
+ferm::service { 'impala-llama':
+proto = 'tcp',
+port = '(15000 15001 15002)',
+srange = '$ANALYTICS_NETWORKS',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/206420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I350e549e04779dd8ef29b36d1c9377f103e3cddd
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] channels: Continuous-Integration is now Continuous-Integrati... - change (labs...wikibugs2)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/206425 Change subject: channels: Continuous-Integration is now Continuous-Integration-Infrastructure .. channels: Continuous-Integration is now Continuous-Integration-Infrastructure Currently ci-infra is now being sent to #wikimedia-dev instead of #wikimedia-releng. Bug: T96908 Change-Id: I734a894d37caa4200557eae069a536ff12705c3d --- M channels.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/25/206425/1 diff --git a/channels.yaml b/channels.yaml index 0f7d16d..55d7f24 100644 --- a/channels.yaml +++ b/channels.yaml @@ -78,7 +78,7 @@ - Release-Engineering - Blocked-on-RelEng # projects -- Continuous-integration +- Continuous-Integration-Infrastructure - Beta-Cluster - Staging - Deployment-Systems -- To view, visit https://gerrit.wikimedia.org/r/206425 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I734a894d37caa4200557eae069a536ff12705c3d Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contacts: delete Apache template, adjust role - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206421
Change subject: contacts: delete Apache template, adjust role
..
contacts: delete Apache template, adjust role
This service has been retired. The Apache site isn't used anymore,
and we just keep the role for the backup for now.
Bug:T90679
Change-Id: I8b8c13dea31703d9cd2a98e0d189009b0b180e02
---
M manifests/role/contacts.pp
D templates/apache/sites/contacts.wikimedia.org.erb
2 files changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/206421/1
diff --git a/manifests/role/contacts.pp b/manifests/role/contacts.pp
index efc4c30..e549718 100644
--- a/manifests/role/contacts.pp
+++ b/manifests/role/contacts.pp
@@ -1,7 +1,6 @@
-# https://contacts.wikimedia.org | http://en.wikipedia.org/wiki/CiviCRM
class role::contacts {
-system::role { 'role::contacts': description = 'contacts.wikimedia.org -
Drupal/CiviCRM' }
+system::role { 'role::contacts': description = '(retired)
contacts.wikimedia.org - Drupal/CiviCRM' }
include role::backup::host
backup::set {'srv-org-wikimedia-contacts': }
diff --git a/templates/apache/sites/contacts.wikimedia.org.erb
b/templates/apache/sites/contacts.wikimedia.org.erb
deleted file mode 100644
index 4a575cd..000
--- a/templates/apache/sites/contacts.wikimedia.org.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-VirtualHost *:80
-ServerAdmin n...@wikimedia.org
-ServerName contacts.wikimedia.org
-
-DocumentRoot /srv/org/wikimedia/contacts-disabled/
-
-/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/206421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b8c13dea31703d9cd2a98e0d189009b0b180e02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove install-phpunit.sh - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove install-phpunit.sh
..
Remove install-phpunit.sh
The default fetch location is PEAR, which is not where PHPUnit
is distributed from anymore. apt-get and yum tend to ship horribly
outdated versions of PHPUnit that we don't want. Macports? Lol.
Instead one should install PHPUnit via composer. If you use vagrant
for testing, this is done for you. Our composer.json also lists
PHPUnit if you want to do it yourself.
Bug: T96834
Change-Id: I84ae186a9be2595cd594b428a07f3af684c258fe
---
M tests/phpunit/Makefile
D tests/phpunit/install-phpunit.sh
2 files changed, 1 insertion(+), 42 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/tests/phpunit/Makefile b/tests/phpunit/Makefile
index 3f4c6f9..a33b86a 100644
--- a/tests/phpunit/Makefile
+++ b/tests/phpunit/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help test phpunit install coverage warning destructive parser noparser
safe databaseless list-groups
+.PHONY: help test phpunit coverage warning destructive parser noparser safe
databaseless list-groups
.DEFAULT: warning
SHELL = /bin/sh
@@ -34,9 +34,6 @@
phpunit:
${PU}
-
-install:
- ./install-phpunit.sh
tap:
${PU} --tap
diff --git a/tests/phpunit/install-phpunit.sh b/tests/phpunit/install-phpunit.sh
deleted file mode 100755
index 022f998..000
--- a/tests/phpunit/install-phpunit.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-has_binary () {
-if [ -z `which $1` ]; then
-return 1
-fi
-return 0
-}
-
-if [ `id -u` -ne 0 ]; then
-echo '*** ERROR: Must be root to run'
-exit 1
-fi
-
-if ( has_binary phpunit ); then
-echo PHPUnit already installed
-else if ( has_binary pear ); then
-echo Installing phpunit with pear
-pear channel-discover pear.phpunit.de
-pear channel-discover components.ez.no
-pear channel-discover pear.symfony.com
-pear update-channels
-#Temporary fix for 64597
-pear install --alldeps phpunit/PHPUnit-3.7.35
-else if ( has_binary apt-get ); then
-echo Installing phpunit with apt-get
-apt-get install phpunit
-else if ( has_binary yum ); then
-echo Installing phpunit with yum
-yum install phpunit
-else if ( has_binary port ); then
-echo Installing phpunit with macports
-port install php5-unit
-fi
-fi
-fi
-fi
-fi
--
To view, visit https://gerrit.wikimedia.org/r/206412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84ae186a9be2595cd594b428a07f3af684c258fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Copy LocalSettings.php to /log in teardown instead of setup - change (integration/jenkins)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206422
Change subject: Copy LocalSettings.php to /log in teardown instead of setup
..
Copy LocalSettings.php to /log in teardown instead of setup
This way other modifications after mw-apply-settings, such as
mw-apply-wb-settings and macro/qunit, are also reflected in the
file collected by Jenkins build artefacts.
This would've helped figure out where the syntax error was in
the Wikibase build last month. The file uploaded to Jenkins was
from before the error was appended.
Bug: T90613
Change-Id: I52f81eae4d795ca03ccb0882fd012be1841ad061
---
M bin/mw-apply-settings.sh
M bin/mw-teardown.sh
2 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/22/206422/1
diff --git a/bin/mw-apply-settings.sh b/bin/mw-apply-settings.sh
index 01429b8..3f7612c 100755
--- a/bin/mw-apply-settings.sh
+++ b/bin/mw-apply-settings.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -eu
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
@@ -6,9 +6,6 @@
MEDIAWIKI_D=/srv/deployment/integration/slave-scripts/mediawiki/conf.d
php $MEDIAWIKI_D/_join.php $LOCAL_SETTINGS
-
-# Copy LocalSettings under /log for archival purposes
-cp $LOCAL_SETTINGS $LOG_DIR
echo Making sure $LOCAL_SETTINGS is still valid
php -l $LOCAL_SETTINGS
diff --git a/bin/mw-teardown.sh b/bin/mw-teardown.sh
index 2a9411a..a9e4c2f 100755
--- a/bin/mw-teardown.sh
+++ b/bin/mw-teardown.sh
@@ -3,4 +3,5 @@
. /srv/deployment/integration/slave-scripts/bin/global-teardown.sh
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
-# Placeholder
+# Copy LocalSettings to /log so that archive-log-dir collects it
+cp ${MW_INSTALL_PATH}/LocalSettings.php $LOG_DIR
--
To view, visit https://gerrit.wikimedia.org/r/206422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f81eae4d795ca03ccb0882fd012be1841ad061
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Open more ports for impala, include impalad on hadoop worker... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206423
Change subject: Open more ports for impala, include impalad on hadoop worker
nodes
..
Open more ports for impala, include impalad on hadoop worker nodes
Bug: T96329
Change-Id: Id72184bac0de070336d00deda0430c146dba2ada
---
M manifests/role/analytics/impala.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/206423/1
diff --git a/manifests/role/analytics/impala.pp
b/manifests/role/analytics/impala.pp
index 31cb6dc..1a90fc4 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -21,7 +21,7 @@
ferm::service { 'impalad':
proto = 'tcp',
-port = '(22000 28000)',
+port = '(21000 21050 22000 23000 25000 28000)',
srange = '$ANALYTICS_NETWORKS',
}
}
@@ -35,12 +35,12 @@
ferm::service { 'impala-state-store':
proto = 'tcp',
-port = '24000',
+port = '(24000 25010)',
srange = '$ANALYTICS_NETWORKS',
}
ferm::service { 'impala-catalog':
proto = 'tcp',
-port = '25020',
+port = '(23020 25020 26000)',
srange = '$ANALYTICS_NETWORKS',
}
ferm::service { 'impala-llama':
diff --git a/manifests/site.pp b/manifests/site.pp
index 051c108..2abdbfd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -122,14 +122,7 @@
if $::hostname =~ /^analytics101[349]$/ {
$ganglia_aggregator = true
}
-role analytics::hadoop::worker
-
-# For now, I want to test this out on only one node, to be sure that
configs
-# are applied how I expect. If this works, I will include this class via
the
-# role keyword on all workers here.
-if $hostname == 'analytics1041' {
-include role::analytics::impala::worker
-}
+role analytics::hadoop::worker, analytics::impala::worker
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/206423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id72184bac0de070336d00deda0430c146dba2ada
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Open more ports for impala, include impalad on hadoop worker... - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Open more ports for impala, include impalad on hadoop worker
nodes
..
Open more ports for impala, include impalad on hadoop worker nodes
Bug: T96329
Change-Id: Id72184bac0de070336d00deda0430c146dba2ada
---
M manifests/role/analytics/impala.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/impala.pp
b/manifests/role/analytics/impala.pp
index 31cb6dc..1a90fc4 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -21,7 +21,7 @@
ferm::service { 'impalad':
proto = 'tcp',
-port = '(22000 28000)',
+port = '(21000 21050 22000 23000 25000 28000)',
srange = '$ANALYTICS_NETWORKS',
}
}
@@ -35,12 +35,12 @@
ferm::service { 'impala-state-store':
proto = 'tcp',
-port = '24000',
+port = '(24000 25010)',
srange = '$ANALYTICS_NETWORKS',
}
ferm::service { 'impala-catalog':
proto = 'tcp',
-port = '25020',
+port = '(23020 25020 26000)',
srange = '$ANALYTICS_NETWORKS',
}
ferm::service { 'impala-llama':
diff --git a/manifests/site.pp b/manifests/site.pp
index 051c108..2abdbfd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -122,14 +122,7 @@
if $::hostname =~ /^analytics101[349]$/ {
$ganglia_aggregator = true
}
-role analytics::hadoop::worker
-
-# For now, I want to test this out on only one node, to be sure that
configs
-# are applied how I expect. If this works, I will include this class via
the
-# role keyword on all workers here.
-if $hostname == 'analytics1041' {
-include role::analytics::impala::worker
-}
+role analytics::hadoop::worker, analytics::impala::worker
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/206423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id72184bac0de070336d00deda0430c146dba2ada
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: Import $wmfUdp2logDest global in wmfLabsSettings() - change (operations/mediawiki-config)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206424
Change subject: beta: Import $wmfUdp2logDest global in wmfLabsSettings()
..
beta: Import $wmfUdp2logDest global in wmfLabsSettings()
The fix attempted in I264899a doesn't work because the actually beta
cluster only settings array is created inside the wmfLabsSettings()
function rather than the wmfLabsOverrideSettings() function.
I have resisted the temptation to remove that second function entirely,
but I have indented it properly so that it is easier to see what's going
on.
Bug: T95789
Change-Id: I145a3c38a990bcfdc5c021bc89ef4c4002c66d56
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 457 insertions(+), 457 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/24/206424/1
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index a67df9f..a2d9d43 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -16,7 +16,7 @@
* Settings are fetched through wmfLabsSettings() defined below.
*/
function wmfLabsOverrideSettings() {
- global $wmfConfigDir, $wgConf, $wmfUdp2logDest;
+ global $wmfConfigDir, $wgConf;
// Override (or add) settings that we need within the labs environment,
// but not in production.
@@ -50,514 +50,514 @@
* their settings combined with the regular settings.
*/
function wmfLabsSettings() {
-return array(
- 'wgParserCacheType' = array(
- 'default' = CACHE_MEMCACHED,
- ),
-
- 'wgSitename' = array(
- 'deploymentwiki' = 'Deployment',
- 'ee_prototypewiki' = 'Editor Engagement Prototype',
- 'wikivoyage'= 'Wikivoyage',
- ),
-
- 'wgServer' = array(
- 'default' = '//$lang.wikipedia.$variant.wmflabs.org',
- 'wiktionary'= '//$lang.wiktionary.$variant.wmflabs.org',
- 'wikipedia' = '//$lang.wikipedia.$variant.wmflabs.org',
- 'wikiversity' = '//$lang.wikiversity.$variant.wmflabs.org',
- 'wikispecies' = '//$lang.wikispecies.$variant.wmflabs.org',
- 'wikisource'= '//$lang.wikisource.$variant.wmflabs.org',
- 'wikiquote' = '//$lang.wikiquote.$variant.wmflabs.org',
- 'wikinews' = '//$lang.wikinews.$variant.wmflabs.org',
- 'wikibooks' = '//$lang.wikibooks.$variant.wmflabs.org',
- 'wikivoyage'= '//$lang.wikivoyage.$variant.wmflabs.org',
-
- 'commonswiki' = '//commons.wikimedia.$variant.wmflabs.org',
- 'deploymentwiki' =
'//deployment.wikimedia.$variant.wmflabs.org',
- 'ee_prototypewiki' =
'//ee-prototype.wikipedia.$variant.wmflabs.org',
- 'loginwiki' = '//login.wikimedia.$variant.wmflabs.org',
- 'metawiki' = '//meta.wikimedia.$variant.wmflabs.org',
- 'testwiki' = '//test.wikimedia.$variant.wmflabs.org',
- 'zerowiki' = '//zero.wikimedia.$variant.wmflabs.org',
- 'wikidatawiki' = '//wikidata.$variant.wmflabs.org',
- ),
-
- 'wgCanonicalServer' = array(
- 'default' = 'http://$lang.wikipedia.$variant.wmflabs.org',
- 'wikipedia' =
'http://$lang.wikipedia.$variant.wmflabs.org',
- 'wikibooks' =
'http://$lang.wikibooks.$variant.wmflabs.org',
- 'wikiquote' =
'http://$lang.wikiquote.$variant.wmflabs.org',
- 'wikinews' = 'http://$lang.wikinews.$variant.wmflabs.org',
- 'wikisource'=
'http://$lang.wikisource.$variant.wmflabs.org',
- 'wikiversity' =
'http://$lang.wikiversity.$variant.wmflabs.org',
- 'wiktionary' =
'http://$lang.wiktionary.$variant.wmflabs.org',
- 'wikispecies' =
'http://$lang.wikispecies.$variant.wmflabs.org',
- 'wikivoyage'=
'http://$lang.wikivoyage.$variant.wmflabs.org',
-
- 'metawiki' = 'http://meta.wikimedia.$variant.wmflabs.org',
- 'ee_prototypewiki' =
'http://ee-prototype.wikipedia.$variant.wmflabs.org',
- 'commonswiki' =
'http://commons.wikimedia.$variant.wmflabs.org',
- 'deploymentwiki' =
'http://deployment.wikimedia.$variant.wmflabs.org',
- 'loginwiki' =
'http://login.wikimedia.$variant.wmflabs.org',
- 'testwiki' = 'http://test.wikimedia.$variant.wmflabs.org',
- 'wikidatawiki' = 'http://wikidata.$variant.wmflabs.org',
- ),
-
- 'wmgUsabilityPrefSwitch' = array(
- 'default' = ''
- ),
-
- 'wmgUseLiquidThreads' = array(
- 'testwiki' = true,
- ),
-
- '-wgUploadDirectory' = array(
-
[MediaWiki-commits] [Gerrit] Hygiene: Use Button for category button - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use Button for category button
..
Hygiene: Use Button for category button
Change-Id: I8de81d13132bd39bcd08bca6cbb19e50ab5a324f
---
M includes/Resources.php
M javascripts/modules/categories/CategoryLookupInputWidget.js
D templates/modules/categories/CategoryButton.hogan
3 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 076dc4e..3ad32f1 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -771,7 +771,6 @@
'CategoryAddOverlay.hogan' =
'templates/modules/categories/CategoryAddOverlay.hogan',
'CategoryAddOverlayHeader.hogan' =
'templates/modules/categories/CategoryAddOverlayHeader.hogan',
- 'CategoryButton.hogan' =
'templates/modules/categories/CategoryButton.hogan',
),
'messages' = array(
'mobile-frontend-categories-heading',
diff --git a/javascripts/modules/categories/CategoryLookupInputWidget.js
b/javascripts/modules/categories/CategoryLookupInputWidget.js
index 43cb1a4..4af7a4a 100644
--- a/javascripts/modules/categories/CategoryLookupInputWidget.js
+++ b/javascripts/modules/categories/CategoryLookupInputWidget.js
@@ -1,4 +1,7 @@
( function ( M, $, OO ) {
+ var Button = M.require( 'Button' ),
+ Icon = M.require( 'Icon' );
+
/**
* @class CategoryLookupInputWidget
* @extends OO.ui.LookupElement
@@ -21,12 +24,16 @@
* @param {Object} data Data of the clicked element
*/
CategoryLookupInputWidget.prototype.onLookupMenuItemChoose = function (
data ) {
- this.$suggestions.append(
- mw.template.get( 'mobile.categories',
'CategoryButton.hogan' ).render( {
- title: data.data,
- displayname: data.label
- } )
- );
+ var button = new Button( {
+ progressive: true,
+ additionalClassNames: new Icon( {
+ name: 'ok',
+ hasText: true,
+ additionalClassNames: 'suggestion suggested'
+ } ).getClassName(),
+ label: data.label
+ } ).appendTo( this.$suggestions );
+ button.$el.data( 'title', data.data );
this.$saveButton.prop( 'disabled', false );
};
diff --git a/templates/modules/categories/CategoryButton.hogan
b/templates/modules/categories/CategoryButton.hogan
deleted file mode 100644
index ccc3623..000
--- a/templates/modules/categories/CategoryButton.hogan
+++ /dev/null
@@ -1,3 +0,0 @@
-button class=mw-ui-button mw-ui-progressive mw-ui-icon mw-ui-icon-before
mw-ui-icon-ok suggestion suggested data-title={{title}}
- {{displayname}}
-/button
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/206334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8de81d13132bd39bcd08bca6cbb19e50ab5a324f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Copy LocalSettings.php to /log in teardown instead of setup - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: Copy LocalSettings.php to /log in teardown instead of setup
..
Copy LocalSettings.php to /log in teardown instead of setup
This way other modifications after mw-apply-settings, such as
mw-apply-wb-settings and macro/qunit, are also reflected in the
file collected by Jenkins build artefacts.
This would've helped figure out where the syntax error was in
the Wikibase build last month. The file uploaded to Jenkins was
from before the error was appended.
Bug: T90613
Change-Id: I52f81eae4d795ca03ccb0882fd012be1841ad061
---
M bin/mw-apply-settings.sh
M bin/mw-teardown.sh
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-apply-settings.sh b/bin/mw-apply-settings.sh
index 01429b8..3f7612c 100755
--- a/bin/mw-apply-settings.sh
+++ b/bin/mw-apply-settings.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -eu
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
@@ -6,9 +6,6 @@
MEDIAWIKI_D=/srv/deployment/integration/slave-scripts/mediawiki/conf.d
php $MEDIAWIKI_D/_join.php $LOCAL_SETTINGS
-
-# Copy LocalSettings under /log for archival purposes
-cp $LOCAL_SETTINGS $LOG_DIR
echo Making sure $LOCAL_SETTINGS is still valid
php -l $LOCAL_SETTINGS
diff --git a/bin/mw-teardown.sh b/bin/mw-teardown.sh
index 2a9411a..a9e4c2f 100755
--- a/bin/mw-teardown.sh
+++ b/bin/mw-teardown.sh
@@ -3,4 +3,5 @@
. /srv/deployment/integration/slave-scripts/bin/global-teardown.sh
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
-# Placeholder
+# Copy LocalSettings to /log so that archive-log-dir collects it
+cp ${MW_INSTALL_PATH}/LocalSettings.php $LOG_DIR
--
To view, visit https://gerrit.wikimedia.org/r/206422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52f81eae4d795ca03ccb0882fd012be1841ad061
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix category column count regression - change (mediawiki/core)
Mormegil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206394
Change subject: Fix category column count regression
..
Fix category column count regression
T55130 redesigned category view to use dynamic CSS-based columns
instead of the old fixed 3-column layout. The design was updated
in I20b68dea8f, setting the column width to 25em.
However, on 1280px screen, this reduces the layout to just 2 columns,
as 3 columns do not fit: With the default 14px font, 25em translates
to 350px of column width, plus 1em of column-gap, therefore, 1078px
of space would be required for three columns. However, a 1280px
screen seems to have only 1038px left for content, so 40px are
missing.
By reducing the column size slightly to 24em, three columns are back.
Bug: T55130
Change-Id: I2dbecf809c54d786579bdf3826efbf85ad822c7c
---
M resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/94/206394/1
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
index f01115b..387b020 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
+++ b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
@@ -2,7 +2,7 @@
.mw-category {
.column-count(3);
- .column-width(25em);
+ .column-width(24em);
.mw-category-group {
li {
.column-break-inside-avoid;
--
To view, visit https://gerrit.wikimedia.org/r/206394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dbecf809c54d786579bdf3826efbf85ad822c7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mormegil morme...@centrum.cz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove translator (not included in v1) - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206401
Change subject: remove translator (not included in v1)
..
remove translator (not included in v1)
Change-Id: I76ea83e740c359bf0da88b6a711e9f68f8935c46
---
D includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
D tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
3 files changed, 0 insertions(+), 146 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/01/206401/1
diff --git
a/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
b/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
deleted file mode 100755
index f193ec8..000
--- a/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
+++ /dev/null
@@ -1,51 +0,0 @@
-?php
-
-namespace WikidataQuality\ConstraintReport\ConstraintCheck\Result;
-
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Entity\Entity;
-use WikidataQuality\Result\ResultToViolationTranslator;
-use WikidataQuality\Violations\Violation;
-
-
-class CheckResultToViolationTranslator extends ResultToViolationTranslator {
-
- public function translateToViolation( Entity $entity,
$checkResultOrArray ) {
-
- if ( $checkResultOrArray instanceof CheckResult ) {
- $checkResultArray = array ( $checkResultOrArray );
- } elseif ( is_array( $checkResultOrArray ) ) {
- $checkResultArray = $checkResultOrArray;
- } else {
- throw new InvalidArgumentException;
- }
-
- $violationArray = array ();
- foreach ( $checkResultArray as $checkResult ) {
- if ( $checkResult-getStatus() !==
CheckResult::STATUS_VIOLATION ) {
- continue;
- }
-
- $statement = $checkResult-getStatement();
- $entityId = $entity-getId();
-
- //TODO: Use real claimGuid
- $constraintTypeEntityId =
$checkResult-getConstraintName();
- $constraintClaimGuid = $statement-getGuid() .
$constraintTypeEntityId;
- $parameters = $checkResult-getParameters();
- if ( is_array( $parameters ) ) {
- foreach ( $parameters as $par ) {
- $constraintClaimGuid .= implode( ', ',
$par );
- }
- }
- $constraintClaimGuid = md5( $constraintClaimGuid );
- $revisionId = $this-getRevisionIdForEntity( $entityId
);
- $status = CheckResult::STATUS_VIOLATION;
-
- $violationArray[ ] = new Violation( $entityId,
$statement, $constraintClaimGuid, $constraintTypeEntityId, $revisionId, $status
);
- }
-
- return $violationArray;
- }
-}
\ No newline at end of file
diff --git a/tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
b/tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
deleted file mode 100644
index 9184975..000
--- a/tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-?php
-
-namespace
WikidataQuality\ConstraintReport\Test\CheckResultToViolationTranslator;
-
-use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Statement\Statement;
-use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Entity\PropertyId;
-use DataValues\StringValue;
-use WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResult;
-use
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator;
-use Wikibase\Repo\WikibaseRepo;
-
-
-/**
- * @covers
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator
- *
- * @group Database
- * @group medium
- *
- * @uses WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResult
- *
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class CheckResultTestToViolationTranslator extends \MediaWikiTestCase {
-
- private $translator;
- private $statement;
- private $constraintName;
- private $parameters;
- private $message;
- private $entity;
-
- /**
-* @var EntityId[]
-*/
- private static $idMap;
-
- protected function setUp() {
- parent::setUp();
- $this-translator = new CheckResultToViolationTranslator();
- $this-statement = new Statement( new Claim( new
PropertyValueSnak( new PropertyId( 'P1' ), new StringValue(
[MediaWiki-commits] [Gerrit] Remove install-phpunit.sh - change (mediawiki/core)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206412
Change subject: Remove install-phpunit.sh
..
Remove install-phpunit.sh
The default fetch location is PEAR, which is not where PHPUnit
is distributed from anymore. apt-get and yum tend to ship horribly
outdated versions of PHPUnit that we don't want. Macports? Lol.
Instead one should install PHPUnit via composer. If you use vagrant
for testing, this is done for you. Our composer.json also lists
PHPUnit if you want to do it yourself.
Bug: T96834
Change-Id: I84ae186a9be2595cd594b428a07f3af684c258fe
---
M tests/phpunit/Makefile
D tests/phpunit/install-phpunit.sh
2 files changed, 1 insertion(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/12/206412/1
diff --git a/tests/phpunit/Makefile b/tests/phpunit/Makefile
index 3f4c6f9..a33b86a 100644
--- a/tests/phpunit/Makefile
+++ b/tests/phpunit/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help test phpunit install coverage warning destructive parser noparser
safe databaseless list-groups
+.PHONY: help test phpunit coverage warning destructive parser noparser safe
databaseless list-groups
.DEFAULT: warning
SHELL = /bin/sh
@@ -34,9 +34,6 @@
phpunit:
${PU}
-
-install:
- ./install-phpunit.sh
tap:
${PU} --tap
diff --git a/tests/phpunit/install-phpunit.sh b/tests/phpunit/install-phpunit.sh
deleted file mode 100755
index 022f998..000
--- a/tests/phpunit/install-phpunit.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-has_binary () {
-if [ -z `which $1` ]; then
-return 1
-fi
-return 0
-}
-
-if [ `id -u` -ne 0 ]; then
-echo '*** ERROR: Must be root to run'
-exit 1
-fi
-
-if ( has_binary phpunit ); then
-echo PHPUnit already installed
-else if ( has_binary pear ); then
-echo Installing phpunit with pear
-pear channel-discover pear.phpunit.de
-pear channel-discover components.ez.no
-pear channel-discover pear.symfony.com
-pear update-channels
-#Temporary fix for 64597
-pear install --alldeps phpunit/PHPUnit-3.7.35
-else if ( has_binary apt-get ); then
-echo Installing phpunit with apt-get
-apt-get install phpunit
-else if ( has_binary yum ); then
-echo Installing phpunit with yum
-yum install phpunit
-else if ( has_binary port ); then
-echo Installing phpunit with macports
-port install php5-unit
-fi
-fi
-fi
-fi
-fi
--
To view, visit https://gerrit.wikimedia.org/r/206412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84ae186a9be2595cd594b428a07f3af684c258fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] The title can be null for internal API requests. - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged.
Change subject: The title can be null for internal API requests.
..
The title can be null for internal API requests.
See also T92875#1233108 re external API requests.
Fixes T97104
Bug: T97104
Bug: T92875
Change-Id: Iea401983ed7e5202cccb4b9c0bc18b2803d1f386
---
M WikimediaEventsHooks.php
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 5d02356..e777996 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -40,10 +40,12 @@
*/
public static function onXAnalyticsHeader( $out, $headerItems ) {
$title = $out-getTitle();
- $pageId = $title-getArticleId();
- if ( is_int( $pageId ) $pageId 0 ) {
- $headerItems['page_id'] = $pageId;
- $headerItems['ns'] = $title-getNamespace();
+ if ( $title !== null ) {
+ $pageId = $title-getArticleId();
+ if ( is_int( $pageId ) $pageId 0 ) {
+ $headerItems['page_id'] = $pageId;
+ $headerItems['ns'] = $title-getNamespace();
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/206352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea401983ed7e5202cccb4b9c0bc18b2803d1f386
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for lock edit pencil showing alert twice. - change (apps...wikipedia)
Fjalapeno has submitted this change and it was merged.
Change subject: Fix for lock edit pencil showing alert twice.
..
Fix for lock edit pencil showing alert twice.
T96822
Change-Id: Idd157331df387c4b91356147ac13e9ede7569192
---
M Wikipedia/assets/bundle.js
M www/js/bridge.js
2 files changed, 22 insertions(+), 18 deletions(-)
Approvals:
Fjalapeno: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia/assets/bundle.js b/Wikipedia/assets/bundle.js
index 4a429d4..71a91bd 100644
--- a/Wikipedia/assets/bundle.js
+++ b/Wikipedia/assets/bundle.js
@@ -24,16 +24,18 @@
};
Bridge.prototype.sendMessage = function( messageType, payload ) {
-var messagePack = { type: messageType, payload: payload };
-var url = x-wikipedia-bridge: + encodeURIComponent( JSON.stringify(
messagePack ) );
+setTimeout(function() { // See: https://phabricator.wikimedia.org/T96822
and http://stackoverflow.com/a/9782220/135557
+var messagePack = { type: messageType, payload: payload };
+var url = x-wikipedia-bridge: + encodeURIComponent( JSON.stringify(
messagePack ) );
-// quick iframe version based on http://stackoverflow.com/a/6508343/82439
-// fixme can this be an XHR instead? check Cordova current state
-var iframe = document.createElement('iframe');
-iframe.setAttribute(src, url);
-document.documentElement.appendChild(iframe);
-iframe.parentNode.removeChild(iframe);
-iframe = null;
+// quick iframe version based on
http://stackoverflow.com/a/6508343/82439
+// fixme can this be an XHR instead? check Cordova current state
+var iframe = document.createElement('iframe');
+iframe.setAttribute(src, url);
+document.documentElement.appendChild(iframe);
+iframe.parentNode.removeChild(iframe);
+iframe = null;
+}, 0);
};
module.exports = new Bridge();
diff --git a/www/js/bridge.js b/www/js/bridge.js
index 646d2a9..e0c44b4 100644
--- a/www/js/bridge.js
+++ b/www/js/bridge.js
@@ -23,16 +23,18 @@
};
Bridge.prototype.sendMessage = function( messageType, payload ) {
-var messagePack = { type: messageType, payload: payload };
-var url = x-wikipedia-bridge: + encodeURIComponent( JSON.stringify(
messagePack ) );
+setTimeout(function() { // See: https://phabricator.wikimedia.org/T96822
and http://stackoverflow.com/a/9782220/135557
+var messagePack = { type: messageType, payload: payload };
+var url = x-wikipedia-bridge: + encodeURIComponent( JSON.stringify(
messagePack ) );
-// quick iframe version based on http://stackoverflow.com/a/6508343/82439
-// fixme can this be an XHR instead? check Cordova current state
-var iframe = document.createElement('iframe');
-iframe.setAttribute(src, url);
-document.documentElement.appendChild(iframe);
-iframe.parentNode.removeChild(iframe);
-iframe = null;
+// quick iframe version based on
http://stackoverflow.com/a/6508343/82439
+// fixme can this be an XHR instead? check Cordova current state
+var iframe = document.createElement('iframe');
+iframe.setAttribute(src, url);
+document.documentElement.appendChild(iframe);
+iframe.parentNode.removeChild(iframe);
+iframe = null;
+}, 0);
};
module.exports = new Bridge();
--
To view, visit https://gerrit.wikimedia.org/r/206349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd157331df387c4b91356147ac13e9ede7569192
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ircecho: Restart if any of the files involved change - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: ircecho: Restart if any of the files involved change
..
ircecho: Restart if any of the files involved change
Change-Id: I57879c121c5986b74bb91a796b04fcf2a98e70c4
---
M modules/ircecho/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/ircecho/manifests/init.pp
b/modules/ircecho/manifests/init.pp
index d60ba84..f301439 100644
--- a/modules/ircecho/manifests/init.pp
+++ b/modules/ircecho/manifests/init.pp
@@ -39,8 +39,8 @@
}
service { 'ircecho':
-ensure = running,
-require = File[
+ensure= running,
+subscribe = File[
'/usr/local/bin/ircecho',
'/etc/init.d/ircecho',
'/etc/default/ircecho'
--
To view, visit https://gerrit.wikimedia.org/r/201924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57879c121c5986b74bb91a796b04fcf2a98e70c4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return a unique list of channels (remove dupes). - change (labs...grrrit)
jenkins-bot has submitted this change and it was merged.
Change subject: Return a unique list of channels (remove dupes).
..
Return a unique list of channels (remove dupes).
* Should eliminate the duplicate messages seen in
#mediawiki-parsoid right now.
Change-Id: I273f710c5d0203fc01d9079f1a75181731dc7020
---
M src/relay.js
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/relay.js b/src/relay.js
index 6a9c629..d4b9d6a 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -89,7 +89,10 @@
if(typeof config['firehose-channel'] !== undefined) {
channels.push(config['firehose-channel']);
}
-return channels;
+
+// Make the list of channels unique
+// and remove annoying duplicate messaging
+return channels.filter(function(v, i) { return channels.indexOf(v) === i;
});
}
var template = swig.compileFile('template.txt');
--
To view, visit https://gerrit.wikimedia.org/r/205881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I273f710c5d0203fc01d9079f1a75181731dc7020
Gerrit-PatchSet: 4
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: delete contacts from misc-web config - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206413
Change subject: varnish: delete contacts from misc-web config
..
varnish: delete contacts from misc-web config
Bug:T90679
Change-Id: I811f4246198206020617d7f1b2811e0170440655
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/206413/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index d786e73..34b0e9f 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -31,8 +31,6 @@
} elsif (req.http.Host == old-bugzilla.wikimedia.org || req.http.Host
== static-bugzilla.wikimedia.org || req.http.Host ==
bug-attachment.wikimedia.org || req.http.Host ==dev.wikimedia.org) {
set req.backend = zirconium;
return (pass);
- } elsif (req.http.Host == contacts.wikimedia.org) {
- set req.backend = zirconium;
} elsif (req.http.Host == svn.wikimedia.org) {
set req.backend = antimony;
} elsif (req.http.Host == servermon.wikimedia.org) {
--
To view, visit https://gerrit.wikimedia.org/r/206413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I811f4246198206020617d7f1b2811e0170440655
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: expose $wmfUdp2logDest to wmfLabsOverrideSettings() - change (operations/mediawiki-config)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206414
Change subject: beta: expose $wmfUdp2logDest to wmfLabsOverrideSettings()
..
beta: expose $wmfUdp2logDest to wmfLabsOverrideSettings()
Bug: T97138
Change-Id: I264899aad66980f69310f4a8b93165eace5a1b7d
---
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/14/206414/1
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 81d4e6a..a67df9f 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -16,7 +16,7 @@
* Settings are fetched through wmfLabsSettings() defined below.
*/
function wmfLabsOverrideSettings() {
- global $wmfConfigDir, $wgConf;
+ global $wmfConfigDir, $wgConf, $wmfUdp2logDest;
// Override (or add) settings that we need within the labs environment,
// but not in production.
--
To view, visit https://gerrit.wikimedia.org/r/206414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I264899aad66980f69310f4a8b93165eace5a1b7d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] delete contacts.wikimedia.org - change (operations/dns)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/206415 Change subject: delete contacts.wikimedia.org .. delete contacts.wikimedia.org This service has been retired. Bug:T90679 Change-Id: Ie150bb0e9342ea6fba656ce60df11b09a9edeb75 --- M templates/wikimedia.org 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/15/206415/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 87b5691..f9c64cd 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -589,7 +589,6 @@ civicrm-gr.frdev 1H IN CNAMElutetium civicrm2-gr.frdev 1H IN CNAMElutetium coffee 600 IN DYNA geoip!text-addrs -contacts 1H IN CNAMEmisc-web-lb.eqiad cs 600 IN DYNA geoip!text-addrs cz 600 IN DYNA geoip!text-addrs datasets 1H IN CNAMEmisc-web-lb.eqiad -- To view, visit https://gerrit.wikimedia.org/r/206415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie150bb0e9342ea6fba656ce60df11b09a9edeb75 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: delete contacts from misc-web config - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: varnish: delete contacts from misc-web config
..
varnish: delete contacts from misc-web config
Bug:T90679
Change-Id: I811f4246198206020617d7f1b2811e0170440655
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 0 insertions(+), 2 deletions(-)
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 d786e73..34b0e9f 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -31,8 +31,6 @@
} elsif (req.http.Host == old-bugzilla.wikimedia.org || req.http.Host
== static-bugzilla.wikimedia.org || req.http.Host ==
bug-attachment.wikimedia.org || req.http.Host ==dev.wikimedia.org) {
set req.backend = zirconium;
return (pass);
- } elsif (req.http.Host == contacts.wikimedia.org) {
- set req.backend = zirconium;
} elsif (req.http.Host == svn.wikimedia.org) {
set req.backend = antimony;
} elsif (req.http.Host == servermon.wikimedia.org) {
--
To view, visit https://gerrit.wikimedia.org/r/206413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I811f4246198206020617d7f1b2811e0170440655
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Save changes to members of collection only when done clicked - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Save changes to members of collection only when done clicked
..
Save changes to members of collection only when done clicked
* Throw confirm message when you try and exit.
* Add methods for adding/removing multiple titles
Bug: T95776
Bug: T96897
Change-Id: I333466cdc4ba0c838c9585739d311e6b4a35e170
---
M i18n/en.json
M i18n/qqq.json
M resources/Resources.php
M resources/ext.gather.api/CollectionsApi.js
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.page.search/CollectionPageList.js
M resources/ext.gather.page.search/CollectionSearchPanel.js
7 files changed, 131 insertions(+), 40 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 5f2c401..952d6bd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -69,6 +69,7 @@
gather-add-to-collection-confirm: Add to collection,
gather-add-to-collection-cancel: No thanks,
gather-update-collection-success: Collection was successfully
updated.,
+ gather-edit-collection-confirm: You have made changes to your
collection. Do you want to leave without saving them?,
gather-remove-toast: The page has been removed from your \$1\
collection.,
gather-no-such-action: Sorry, the requested action doesn't exist.,
gather-unknown-error: Sorry, there was an unknown error while
processing your request.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 37ee8d5..b5ccb29 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -73,6 +73,7 @@
gather-add-to-collection-confirm: Label for button that user can
click if they would like to add the current page to a collection,
gather-add-to-collection-cancel: Label for button that user can
click if they do not want to add to a collection.\n{{Identical|No thanks}},
gather-update-collection-success: Message that shows when collection
description and/or title changed.,
+ gather-edit-collection-confirm: Confirm message prompting you to
save changes before exiting.,
gather-remove-toast: Message displayed when you remove an item from
a collection. Parameters:\n* $1 - Name of collection.,
gather-no-such-action: Message used, if thse user tried to request a
non-existent action on a collection.,
gather-unknown-error: Used as an error message, if there was an
unknown error.,
diff --git a/resources/Resources.php b/resources/Resources.php
index 8d739fc..2c03aab 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -229,6 +229,7 @@
'gather-delete-button',
'gather-edit-collection-clear-label',
'gather-update-collection-success',
+ 'gather-edit-collection-confirm',
),
'templates' = array(
'header.hogan' =
'ext.gather.collection.editor/header.hogan',
diff --git a/resources/ext.gather.api/CollectionsApi.js
b/resources/ext.gather.api/CollectionsApi.js
index 15583fe..8ff4146 100644
--- a/resources/ext.gather.api/CollectionsApi.js
+++ b/resources/ext.gather.api/CollectionsApi.js
@@ -23,6 +23,20 @@
isPublic: false
},
/**
+* Add a list of titles to existing collection.
+* @method
+* @param {Number} id Identifier of collection
+* @param {String[]} titles array
+* @return {jQuery.Deferred}
+*/
+ addPagesToCollection: function ( id, titles ) {
+ return this.postWithToken( 'watch', {
+ action: 'editlist',
+ id: id,
+ titles: titles
+ } );
+ },
+ /**
* Add page to existing collection.
* @method
* @param {Number} id Identifier of collection
@@ -30,10 +44,21 @@
* @return {jQuery.Deferred}
*/
addPageToCollection: function ( id, page ) {
+ return this.addPagesToCollection( id, [ page.getTitle()
] );
+ },
+ /**
+* Remove a list of pages from existing collection.
+* @method
+* @param {Number} id Identifier of collection
+* @param {String[]} titles
+* @return {jQuery.Deferred}
+*/
+ removePagesFromCollection: function ( id, titles ) {
return this.postWithToken( 'watch', {
action: 'editlist',
id: id,
-
[MediaWiki-commits] [Gerrit] Fix improperly defined const - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206469
Change subject: Fix improperly defined const
..
Fix improperly defined const
Change-Id: I2a6846a35f87dfd1c6679972016b487de5a32e70
---
M Wikipedia/Categories/NSString+WMFHTMLParsing.m
M Wikipedia/Categories/NSURL+WMFRest.h
M Wikipedia/Categories/NSURL+WMFRest.m
M Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
M Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
M Wikipedia/Networking/Fetchers/SearchResultFetcher.h
M Wikipedia/Networking/Fetchers/SearchResultFetcher.m
M Wikipedia/Protocols/WMFLocalizationProtocol.m
M Wikipedia/Session/SessionSingleton.h
M Wikipedia/Session/SessionSingleton.m
M Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
M Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
M Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.h
M Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
M Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
M Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/View Controllers/WebView/WebViewController_Private.h
M Wikipedia/mw-utils/WikipediaAppUtils.m
25 files changed, 94 insertions(+), 96 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/69/206469/1
diff --git a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
index f48ba4c..a89ad8f 100644
--- a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
+++ b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
@@ -2,8 +2,8 @@
#import WikipediaAppUtils.h
#import hpple/TFHpple.h
-static const int kMinimumLengthForPreTransformedHTMLForSnippet = 40;
-static const int kHighestIndexForSubstringAfterHTMLRemoved = 350;
+static int const kMinimumLengthForPreTransformedHTMLForSnippet = 40;
+static int const kHighestIndexForSubstringAfterHTMLRemoved = 350;
@implementation NSString (WMFHTMLParsing)
diff --git a/Wikipedia/Categories/NSURL+WMFRest.h
b/Wikipedia/Categories/NSURL+WMFRest.h
index 91c264e..85a3679 100644
--- a/Wikipedia/Categories/NSURL+WMFRest.h
+++ b/Wikipedia/Categories/NSURL+WMFRest.h
@@ -5,6 +5,6 @@
@interface NSURL (WMFRest)
--(BOOL)wmf_conformsToScheme:(NSString *)scheme andHasKey:(NSString *)key;
+- (BOOL)wmf_conformsToScheme:(NSString*)scheme andHasKey:(NSString*)key;
@end
diff --git a/Wikipedia/Categories/NSURL+WMFRest.m
b/Wikipedia/Categories/NSURL+WMFRest.m
index eed2352..4eb26ac 100644
--- a/Wikipedia/Categories/NSURL+WMFRest.m
+++ b/Wikipedia/Categories/NSURL+WMFRest.m
@@ -6,7 +6,7 @@
@implementation NSURL (WMFRest)
--(BOOL)wmf_conformsToScheme:(NSString *)scheme andHasKey:(NSString *)key {
+- (BOOL)wmf_conformsToScheme:(NSString*)scheme andHasKey:(NSString*)key {
return ([[self scheme] wmf_isEqualToStringIgnoringCase:scheme] [[self
host] wmf_isEqualToStringIgnoringCase:key]);
}
diff --git a/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
b/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
index dccbe30..60f6501 100644
--- a/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
+++ b/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
@@ -5,11 +5,11 @@
#import UIColor+WMFHexColor.h
#import Masonry/Masonry.h
-static const CGFloat kActivityIndicatorWidth = 100.0f;
-static const CGFloat kActivityIndicatorCornerRadius = 10.0f;
-static const NSInteger kActivityIndicatorBackgroundColor = 0x00;
+static CGFloat const kActivityIndicatorWidth = 100.0f;
+static CGFloat const kActivityIndicatorCornerRadius = 10.0f;
+static NSInteger const kActivityIndicatorBackgroundColor = 0x00;
-static const CGFloat kFadeAnimationDuration = 0.33f;
+static CGFloat const kFadeAnimationDuration = 0.33f;
@interface WMFLoadingIndicatorOverlay ()
diff --git a/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
b/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
index 631a896..f9f9057 100644
--- a/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
+++ b/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
@@ -9,7 +9,7 @@
#import WMFSuggestedPagesFunnel.h
static NSString* const kSchemaName = @MobileWikiAppArticleSuggestions;
-static const int kSchemaVersion= 10590869;
+static int const kSchemaVersion= 10590869;
static NSString*
[MediaWiki-commits] [Gerrit] API: Improve queries for prop=revisions in enum mode - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Improve queries for prop=revisions in enum mode
..
API: Improve queries for prop=revisions in enum mode
This reworks the queries to better use the indexes available, and at the
same time sorts results by rev_timestamp like they always should have
been rather than rev_id. See T88084 for details.
This also takes the opportunity to replace !is_null with !== null, since
it was annoying me while writing this.
Bug: T88084
Bug: T91883
Change-Id: Ie175c6014e75848e9dda6b413175c8575d1ef6af
---
M RELEASE-NOTES-1.26
M includes/api/ApiQueryRevisions.php
2 files changed, 70 insertions(+), 43 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 9426635..57166ef 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -23,6 +23,8 @@
tag is meant to be hidden from user interfaces.
* action=import no longer allows both the namespace= and rootpage= parameters
to be set. If they are both set, the value of rootpage= will be ignored.
+* prop=revision output in enum mode is now sorted by timestamp rather than
+ revision ID. This usually won't make any difference.
=== Action API internal changes in 1.26 ===
diff --git a/includes/api/ApiQueryRevisions.php
b/includes/api/ApiQueryRevisions.php
index 552ca3b..1a65fe3 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -91,10 +91,10 @@
// Enum mode can only be used when exactly one page is provided.
// Enumerating revisions on multiple pages make it extremely
// difficult to manage continuations and require additional SQL
indexes
- $enumRevMode = ( !is_null( $params['user'] ) || !is_null(
$params['excludeuser'] ) ||
- !is_null( $params['limit'] ) || !is_null(
$params['startid'] ) ||
- !is_null( $params['endid'] ) || $params['dir'] ===
'newer' ||
- !is_null( $params['start'] ) || !is_null(
$params['end'] ) );
+ $enumRevMode = ( $params['user'] !== null ||
$params['excludeuser'] !== null ||
+ $params['limit'] !== null || $params['startid'] !==
null ||
+ $params['endid'] !== null || $params['dir'] === 'newer'
||
+ $params['start'] !== null || $params['end'] !== null );
$pageSet = $this-getPageSet();
$pageCount = $pageSet-getGoodTitleCount();
@@ -149,7 +149,7 @@
}
} else {
$this-limit = $this-getParameter( 'limit' ) ?: 10;
- $this-addFields( array( 'rev_id', 'rev_page' ) );
+ $this-addFields( array( 'rev_id', 'rev_timestamp',
'rev_page' ) );
}
if ( $this-fld_tags ) {
@@ -160,7 +160,7 @@
$this-addFields( 'ts_tags' );
}
- if ( !is_null( $params['tag'] ) ) {
+ if ( $params['tag'] !== null ) {
$this-addTables( 'change_tag' );
$this-addJoinConds(
array( 'change_tag' = array( 'INNER JOIN',
array( 'rev_id=ct_rev_id' ) ) )
@@ -196,58 +196,77 @@
}
if ( $enumRevMode ) {
+ // Indexes targeted:
+ // page_timestamp if we don't have rvuser
+ // page_user_timestamp if we have a logged-in rvuser
+ // page_timestamp or usertext_timestamp if we have an
IP rvuser
+
// This is mostly to prevent parameter errors (and
optimize SQL?)
- if ( !is_null( $params['startid'] ) !is_null(
$params['start'] ) ) {
+ if ( $params['startid'] !== null $params['start']
!== null ) {
$this-dieUsage( 'start and startid cannot be
used together', 'badparams' );
}
- if ( !is_null( $params['endid'] ) !is_null(
$params['end'] ) ) {
+ if ( $params['endid'] !== null $params['end'] !==
null ) {
$this-dieUsage( 'end and endid cannot be used
together', 'badparams' );
}
- if ( !is_null( $params['user'] ) !is_null(
$params['excludeuser'] ) ) {
+ if ( $params['user'] !== null $params['excludeuser']
!== null ) {
$this-dieUsage( 'user and excludeuser cannot
be used together', 'badparams' );
}
- // Continuing effectively uses startid. But we can't
use rvstartid
- // directly, because there is no way
[MediaWiki-commits] [Gerrit] Implement ChangeTagsRegister - change (mediawiki...AbuseFilter)
Cenarium has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206476
Change subject: Implement ChangeTagsRegister
..
Implement ChangeTagsRegister
This implements the ChangeTagsRegister hook introduced by
Change-Id: I4f4b097d660ada77f5cf7b4231925009b27127ea. Special:Tags
now indicates when a filter is defined by AbuseFilter, and which
filter uses it. The default messages are kept pretty basic.
The cache of registered tags is purged whenever filters are edited.
Newly defined non-existing tags are checked with the canCreate
function of the ChangeTag class.
Change-Id: Ibfadd04acfebbedaad1b67c5818dfa5c1b7037b3
---
M AbuseFilter.hooks.php
M AbuseFilter.php
M Views/AbuseFilterViewEdit.php
M i18n/en.json
M i18n/qqq.json
5 files changed, 38 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/76/206476/1
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index 892d901..fc935fb 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -443,32 +443,41 @@
/**
* @param array $tags
-* @param bool $enabled
* @return bool
*/
- private static function fetchAllTags( array $tags, $enabled ) {
+ private static function fetchAllTags( array $tags ) {
# This is a pretty awful hack.
$dbr = wfGetDB( DB_SLAVE );
- $where = array( 'afa_consequence' = 'tag', 'af_deleted' =
false );
- if ( $enabled ) {
- $where['af_enabled'] = true;
- }
+ $where = array( 'afa_consequence' = 'tag', 'af_deleted' = 0 );
+
$res = $dbr-select(
array( 'abuse_filter_action', 'abuse_filter' ),
- 'afa_parameters',
+ array( 'afa_parameters', 'af_enabled', 'af_id' ),
$where,
__METHOD__,
array(),
array( 'abuse_filter' = array( 'INNER JOIN',
'afa_filter=af_id' ) )
);
+ $fetchedTags = array();
foreach ( $res as $row ) {
- $tags = array_filter(
- array_merge( explode( \n,
$row-afa_parameters ), $tags )
- );
+ $afTags = explode( \n, $row-afa_parameters );
+ foreach ( $afTags as $tag ) {
+ if ( !isset( $fetchedTags[$tag] ) ) {
+ $fetchedTags[$tag] = array(
+ 'extName' = 'AbuseFilter',
+ 'descParams' = array()
+ );
+ }
+ $fetchedTags[$tag]['descParams'][] =
$row-af_id;
+ if ( $row-af_enabled ) {
+ $fetchedTags[$tag]['active'] = true;
+ }
+ }
}
+ $tags = array_filter( array_merge( $fetchedTags, $tags ) );
return true;
}
@@ -476,16 +485,8 @@
* @param array $tags
* @return bool
*/
- public static function onListDefinedTags( array $tags ) {
- return self::fetchAllTags( $tags, false );
- }
-
- /**
-* @param array $tags
-* @return bool
-*/
- public static function onChangeTagsListActive( array $tags ) {
- return self::fetchAllTags( $tags, true );
+ public static function onChangeTagsRegister( array $tags ) {
+ return self::fetchAllTags( $tags );
}
/**
diff --git a/AbuseFilter.php b/AbuseFilter.php
index fb3542a..60e5e07 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -95,8 +95,7 @@
$wgHooks['AbortAutoAccount'][] = 'AbuseFilterHooks::onAbortAutoAccount';
$wgHooks['ArticleDelete'][] = 'AbuseFilterHooks::onArticleDelete';
$wgHooks['RecentChange_save'][] = 'AbuseFilterHooks::onRecentChangeSave';
-$wgHooks['ListDefinedTags'][] = 'AbuseFilterHooks::onListDefinedTags';
-$wgHooks['ChangeTagsListActive'][] =
'AbuseFilterHooks::onChangeTagsListActive';
+$wgHooks['ChangeTagsRegister'][] = 'AbuseFilterHooks::onChangeTagsRegister';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'AbuseFilterHooks::onLoadExtensionSchemaUpdates';
$wgHooks['ContributionsToolLinks'][] =
'AbuseFilterHooks::onContributionsToolLinks';
$wgHooks['UploadVerifyFile'][] = 'AbuseFilterHooks::onUploadVerifyFile';
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 7f7c634..3c5ecc9 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -108,13 +108,13 @@
// If we've activated the
[MediaWiki-commits] [Gerrit] tools: Faux enable https for lighttpd by default - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: tools: Faux enable https for lighttpd by default .. tools: Faux enable https for lighttpd by default This makes lighttpd return protocol relative redirects for https as well as http, rather than forcing everything to https. This means that hitting https://tools.wmflabs.org/tool will redirect to /tools/ instead of http://tools.wmflabs.org/tool/, thus being protocol relative. In an ideal world this wouldn't need to happen, and lighttpd would just respect X-Forwarded-Proto from nginx, but alas. Bug: T66627 Change-Id: Ie03c8075a0fb34dc4ca8cc17c76576bb2ae3e077 --- M modules/toollabs/files/lighttpd-starter 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/files/lighttpd-starter b/modules/toollabs/files/lighttpd-starter index 4867097..bf253db 100755 --- a/modules/toollabs/files/lighttpd-starter +++ b/modules/toollabs/files/lighttpd-starter @@ -64,7 +64,7 @@ server.max-connections = 300 server.stat-cache-engine = fam server.event-handler = linux-sysepoll -ssl.engine = disable +ssl.engine = enable # Faux-enable, for https://phabricator.wikimedia.org/T66627 alias.url = ( /$tool = $home/public_html/ ) -- To view, visit https://gerrit.wikimedia.org/r/206488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie03c8075a0fb34dc4ca8cc17c76576bb2ae3e077 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Commence introducing templating to UploadWizard - change (mediawiki...UploadWizard)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/206493 Change subject: WIP: Commence introducing templating to UploadWizard .. WIP: Commence introducing templating to UploadWizard I want to do work on UploadWizard but the code needs lots of love. I think templating is a cheap way to clean this up and make it much more readable and maintable. I've commenced it here starting with lots of smaller templates which I hope over time can be grown into big templates and then into oojs ui components. Will split this patch into smaller ones when I've worked out what's going on. TODO: * Continue refactoring resources/mw.UploadWizardDetails.js * Remove partials that don't need to be partials (are not reused outside file) Dependency: Ic752f52669dbffa21c4a514509c3ea1da8ac5d9c Bug: T96520 Change-Id: I8f2e382498344ccee3dee6c98408ef984d6a1378 --- M UploadWizardHooks.php M resources/jquery/jquery.removeCtrl.js M resources/jquery/jquery.showThumbCtrl.js M resources/mw.ErrorDialog.js M resources/mw.GroupProgressBar.js M resources/mw.LanguageUpWiz.js M resources/mw.UploadWizard.js M resources/mw.UploadWizardDeed.js M resources/mw.UploadWizardDescription.js M resources/mw.UploadWizardDetails.js M resources/mw.UploadWizardUploadInterface.js A resources/templates/categories.mustache A resources/templates/control.mustache A resources/templates/deedInterface.mustache A resources/templates/description.mustache A resources/templates/descriptionAdder.mustache A resources/templates/details.mustache A resources/templates/detailsForm.mustache A resources/templates/dialog.mustache A resources/templates/error.mustache A resources/templates/fieldNameDiv.mustache A resources/templates/form.mustache A resources/templates/languageMenu.mustache A resources/templates/progressBar.mustache A resources/templates/textInput.mustache A resources/templates/textarea.mustache A resources/templates/thirdPartyDiv.mustache A resources/templates/thirdPartyLicense.mustache A resources/templates/titleContainerDiv.mustache A resources/templates/uploadInterface.mustache 30 files changed, 342 insertions(+), 279 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/93/206493/1 diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php index b7c5bde..0b03ba0 100644 --- a/UploadWizardHooks.php +++ b/UploadWizardHooks.php @@ -13,8 +13,33 @@ ), ), + 'ext.uploadWizard.templates' = array( + 'templates' = array( + 'titleContainerDiv.mustache' = 'resources/templates/titleContainerDiv.mustache', + 'detailsForm.mustache' = 'resources/templates/detailsForm.mustache', + 'descriptionAdder.mustache' = 'resources/templates/descriptionAdder.mustache', + 'details.mustache' = 'resources/templates/details.mustache', + 'control.mustache' = 'resources/templates/control.mustache', + 'uploadInterface.mustache' = 'resources/templates/uploadInterface.mustache', + 'description.mustache' = 'resources/templates/description.mustache', + 'progressBar.mustache' = 'resources/templates/progressBar.mustache', + 'deedInterface.mustache' = 'resources/templates/deedInterface.mustache', + 'form.mustache' = 'resources/templates/form.mustache', + 'description.mustache' = 'resources/templates/description.mustache', + 'languageMenu.mustache' = 'resources/templates/languageMenu.mustache', + 'error.mustache' = 'resources/templates/error.mustache', + 'categories.mustache' = 'resources/templates/categories.mustache', + 'fieldNameDiv.mustache' = 'resources/templates/fieldNameDiv.mustache', + 'textarea.mustache' = 'resources/templates/textarea.mustache', + 'thirdPartyLicense.mustache' = 'resources/templates/thirdPartyLicense.mustache', + 'thirdPartyDiv.mustache' = 'resources/templates/thirdPartyDiv.mustache', + 'textInput.mustache' = 'resources/templates/textInput.mustache', + ), + ), + 'ext.uploadWizard' = array( 'dependencies' = array( + 'ext.uploadWizard.templates', 'jquery.arrowSteps', 'jquery.checkboxShiftClick', 'jquery.client', @@ -690,7 +715,7 @@
[MediaWiki-commits] [Gerrit] Fixing icons… again - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Fixing icons… again
..
Fixing icons… again
A few problems to overcome this time:
Archives use symlinks for the app bundle, which can throw monkey wrenches in
the process.
Looks like permissions have changed on build folders - can't reliably save to
the app bundle during the process. So sidestepping.
New solution:
No longer manipulating the build folder, doing everything in the source
directory.
Created a new icon set - source - which will always contain the unmolested
icons.
The other icon set will be overwritten at build time with the overlaid icons.
If release build or if imagemagick is not installed, then the icons are just
copied
Also removed generated icons from source control
Note: only one icons is copied to the app, the other is in the project only.
Change-Id: I39285429803b72d5caeda738fb82bc3d23406317
---
M .gitignore
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@3x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-72.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-76.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small-50.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-small...@2x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-sm...@3x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Spotlight-40.png
R
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x-1.png
R
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x.png
R
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@3x.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/i...@2x.png
R
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_app_icon_iphone.png
R Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_icon.png
R
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_i...@2x.png
M scripts/process-icons.sh
24 files changed, 263 insertions(+), 70 deletions(-)
Approvals:
Mhurd: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 2d2952e..6dbb5fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@
*.ipa
*.xcuserstate
+# Icons
+Wikipedia/Images.xcassets/AppIcon.appiconset/*.png
+
# Fastlane
fastlane/report.xml
fastlane/Error*.png
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index feb2cbd..f302ee2 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -187,6 +187,7 @@
04F27B7818FE0F2E00EDD838 /* PageHistoryViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04F27B7418FE0F2E00EDD838 /*
PageHistoryViewController.m */; };
04F39590186CF80100B0D6FC /* TOCViewController.m in Sources */ =
{isa = PBXBuildFile; fileRef = 04F3958F186CF80100B0D6FC /* TOCViewController.m
*/; };
08D631F71A69B1AB00D87AD0 /* WMFImageGalleryViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 08D631F61A69B1AB00D87AD0 /*
WMFImageGalleryViewController.m */; };
+ 0E36C2271AE0B59D00C58CFF /* Images.xcassets in Resources */ =
{isa = PBXBuildFile; fileRef = D4991453181D51DE00E6073C /* Images.xcassets */;
};
0EA4402E1AA6281200B09DBA /* NSDateFormatter+WMFExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0EA4402D1AA6281200B09DBA /*
NSDateFormatter+WMFExtensions.m */; };
0EBC56681AD3656900E82CDD /* WMFAsyncTestCase.m in Sources */ =
{isa = PBXBuildFile; fileRef = BC7ACB631AB34C9C00791497 /* WMFAsyncTestCase.m
*/; };
0EBC567F1AD442CC00E82CDD /* BITHockeyManager+WMFExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0EBC567E1AD442CC00E82CDD /*
BITHockeyManager+WMFExtensions.m */; };
@@ -325,7 +326,6 @@
D4991445181D51DE00E6073C /* main.m in Sources */ = {isa =
PBXBuildFile; fileRef = D4991444181D51DE00E6073C /* main.m */; };
D4991449181D51DE00E6073C /* AppDelegate.m in Sources */ = {isa
= PBXBuildFile; fileRef = D4991448181D51DE00E6073C /* AppDelegate.m */; };
D499144C181D51DE00E6073C /* Main_iPhone.storyboard in Resources
*/ = {isa = PBXBuildFile; fileRef = D499144A181D51DE00E6073C /*
Main_iPhone.storyboard */; };
-
[MediaWiki-commits] [Gerrit] Fix improperly defined const - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Fix improperly defined const
..
Fix improperly defined const
Change-Id: I2a6846a35f87dfd1c6679972016b487de5a32e70
---
M Wikipedia/Categories/NSString+WMFHTMLParsing.m
M Wikipedia/Categories/NSURL+WMFRest.h
M Wikipedia/Categories/NSURL+WMFRest.m
M Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
M Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
M Wikipedia/Networking/Fetchers/SearchResultFetcher.h
M Wikipedia/Networking/Fetchers/SearchResultFetcher.m
M Wikipedia/Protocols/WMFLocalizationProtocol.m
M Wikipedia/Session/SessionSingleton.h
M Wikipedia/Session/SessionSingleton.m
M Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
M Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
M Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.h
M Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
M Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
M Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/View Controllers/WebView/WebViewController_Private.h
M Wikipedia/mw-utils/WikipediaAppUtils.m
25 files changed, 94 insertions(+), 96 deletions(-)
Approvals:
Mhurd: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
index f48ba4c..a89ad8f 100644
--- a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
+++ b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
@@ -2,8 +2,8 @@
#import WikipediaAppUtils.h
#import hpple/TFHpple.h
-static const int kMinimumLengthForPreTransformedHTMLForSnippet = 40;
-static const int kHighestIndexForSubstringAfterHTMLRemoved = 350;
+static int const kMinimumLengthForPreTransformedHTMLForSnippet = 40;
+static int const kHighestIndexForSubstringAfterHTMLRemoved = 350;
@implementation NSString (WMFHTMLParsing)
diff --git a/Wikipedia/Categories/NSURL+WMFRest.h
b/Wikipedia/Categories/NSURL+WMFRest.h
index 91c264e..85a3679 100644
--- a/Wikipedia/Categories/NSURL+WMFRest.h
+++ b/Wikipedia/Categories/NSURL+WMFRest.h
@@ -5,6 +5,6 @@
@interface NSURL (WMFRest)
--(BOOL)wmf_conformsToScheme:(NSString *)scheme andHasKey:(NSString *)key;
+- (BOOL)wmf_conformsToScheme:(NSString*)scheme andHasKey:(NSString*)key;
@end
diff --git a/Wikipedia/Categories/NSURL+WMFRest.m
b/Wikipedia/Categories/NSURL+WMFRest.m
index eed2352..4eb26ac 100644
--- a/Wikipedia/Categories/NSURL+WMFRest.m
+++ b/Wikipedia/Categories/NSURL+WMFRest.m
@@ -6,7 +6,7 @@
@implementation NSURL (WMFRest)
--(BOOL)wmf_conformsToScheme:(NSString *)scheme andHasKey:(NSString *)key {
+- (BOOL)wmf_conformsToScheme:(NSString*)scheme andHasKey:(NSString*)key {
return ([[self scheme] wmf_isEqualToStringIgnoringCase:scheme] [[self
host] wmf_isEqualToStringIgnoringCase:key]);
}
diff --git a/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
b/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
index dccbe30..60f6501 100644
--- a/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
+++ b/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
@@ -5,11 +5,11 @@
#import UIColor+WMFHexColor.h
#import Masonry/Masonry.h
-static const CGFloat kActivityIndicatorWidth = 100.0f;
-static const CGFloat kActivityIndicatorCornerRadius = 10.0f;
-static const NSInteger kActivityIndicatorBackgroundColor = 0x00;
+static CGFloat const kActivityIndicatorWidth = 100.0f;
+static CGFloat const kActivityIndicatorCornerRadius = 10.0f;
+static NSInteger const kActivityIndicatorBackgroundColor = 0x00;
-static const CGFloat kFadeAnimationDuration = 0.33f;
+static CGFloat const kFadeAnimationDuration = 0.33f;
@interface WMFLoadingIndicatorOverlay ()
diff --git a/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
b/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
index 631a896..f9f9057 100644
--- a/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
+++ b/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
@@ -9,7 +9,7 @@
#import WMFSuggestedPagesFunnel.h
static NSString* const kSchemaName = @MobileWikiAppArticleSuggestions;
-static const int kSchemaVersion= 10590869;
+static int const kSchemaVersion= 10590869;
static NSString* const kActionKey = @action;
static
[MediaWiki-commits] [Gerrit] Fix logic in testing code - wasn't using the passed in param... - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206472
Change subject: Fix logic in testing code - wasn't using the passed in
parameter and the unit test was failing and broke the build
..
Fix logic in testing code - wasn't using the passed in parameter and the unit
test was failing and broke the build
Change-Id: I854eb433ec117f3cadae1ee49e534f8f73f2f882
---
M WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/72/206472/1
diff --git a/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
b/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
index e5d0c0a..2ef5dce 100644
--- a/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
+++ b/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
@@ -12,7 +12,7 @@
- (NSData*)wmf_dataFromContentsOfFile:(NSString *)filename ofType:(NSString
*)type {
NSError* error;
-NSData* data = [NSData dataWithContentsOfFile:[self
pathForResource:filename ofType:@json]
+NSData* data = [NSData dataWithContentsOfFile:[self
pathForResource:filename ofType:type]
options:0
error:error];
NSParameterAssert(!error);
--
To view, visit https://gerrit.wikimedia.org/r/206472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I854eb433ec117f3cadae1ee49e534f8f73f2f882
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
