[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: registry: Add non-default MT support for Amharic and Xhosa
jenkins-bot has submitted this change and it was merged. Change subject: registry: Add non-default MT support for Amharic and Xhosa .. registry: Add non-default MT support for Amharic and Xhosa Bug: T150037 Bug: T150038 Change-Id: I63715a099ce49e687609d2e7731430a681cc81aa --- M registry.wikimedia.yaml 1 file changed, 539 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved Arrbee: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml index 25f252d..c09aa8c 100644 --- a/registry.wikimedia.yaml +++ b/registry.wikimedia.yaml @@ -691,6 +691,7 @@ - hi Yandex: af: + - am - ar - ba - be @@ -770,10 +771,96 @@ - ur - uz - vi + - xh + - yi + - zh +am: + - af + - ar + - ba + - be + - bn + - bg + - bs + - ca + - ceb + - cs + - cy + - da + - el + - eo + - es + - et + - eu + - fa + - fi + - fr + - ga + - gd + - gl + - gu + - he + - hi + - hr + - ht + - hu + - hy + - id + - is + - ja + - jv + - ka + - kk + - kn + - ko + - ky + - la + - lt + - lv + - mi + - mg + - mhr + - ml + - mk + - mn + - mrj + - mr + - ms + - mt + - nb + - ne + - pa + - pap + - pl + - pt + - ro + - ru + - si + - sk + - sl + - sq + - sr + - su + - sv + - sw + - ta + - te + - tg + - th + - tl + - tr + - tt + - udm + - uk + - ur + - uz + - vi + - xh - yi - zh ar: - af + - am - ba - be - bn @@ -852,10 +939,12 @@ - ur - uz - vi + - xh - yi - zh az: - af + - am - ar - ba - be @@ -935,10 +1024,12 @@ - ur - uz - vi + - xh - yi - zh ba: - af + - am - ar - be - bn @@ -1017,10 +1108,12 @@ - ur - uz - vi + - xh - yi - zh 'be-tarask': - af + - am - ar - ba - be @@ -1100,10 +1193,12 @@ - ur - uz - vi + - xh - yi - zh be: - af + - am - ar - ba - bn @@ -1182,10 +1277,12 @@ - ur - uz - vi + - xh - yi - zh bn: - af + - am - ar - ba - be @@ -1264,10 +1361,12 @@ - ur - uz - vi + - xh - yi - zh bg: - af + - am - ar - ba - be @@ -1346,10 +1445,12 @@ - ur - uz - vi + - xh - yi - zh bs: - af + - am - ar - ba - be @@ -1428,10 +1529,12 @@ - ur - uz - vi + - xh - yi - zh ca: - af + - am - ar - ba - be @@ -1510,10 +1613,12 @@ - ur - uz - vi + - xh - yi - zh ceb: - af + - am - ar - ba - be @@ -1592,10 +1697,12 @@ - ur - uz - vi + - xh - yi - zh cs: - af + - am - ar - ba - be @@ -1674,10 +1781,12 @@ - ur - uz - vi + - xh - yi - zh cy: - af + - am - ar - ba - be @@ -1756,10 +1865,12 @@ - ur - uz - vi + - xh - yi - zh da: - af + - am - ar - ba - be @@ -1838,10 +1949,12 @@ - ur - uz - vi + - xh - yi - zh de: - af + - am - ar - ba - be @@ -1921,10 +2034,12 @@ - ur - uz - vi + - xh - yi - zh el: - af + - am - ar - ba - be @@ -2003,10 +2118,12 @@ - ur - uz - vi + - xh - yi - zh en: - af + - am - ar - ba - be @@ -2086,10 +2203,12 @@ - ur - uz - vi + - xh - yi - zh eo: - af + - am - ar - ba - be @@ -2168,10 +2287,12 @@ - ur - uz - vi + - xh - yi - zh es: - af + - am - ar - ba - be @@ -2250,10 +2371,12 @@ - ur - uz - vi + - xh - yi - zh et: - af + - am - ar - ba - be @@ -2332,10 +2455,12 @@
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Re-run lat/long update to existing addresses.
Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/320564 Change subject: Re-run lat/long update to existing addresses. .. Re-run lat/long update to existing addresses. Bug: T150305 Change-Id: I161f5b35cdedfacecc42ce17cb3bc727628a6784 --- M sites/all/modules/wmf_civicrm/wmf_civicrm.install 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/64/320564/1 diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install b/sites/all/modules/wmf_civicrm/wmf_civicrm.install index 6f0150e..a021ccd 100644 --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install @@ -2375,8 +2375,8 @@ CREATE TEMPORARY TABLE civicrm_address_geocode ( id INT PRIMARY KEY, zip CHAR(5), - latitude DOUBLE, - longitude DOUBLE, + latitude DECIMAL (13,9), + longitude DECIMAL (13,9), timezone VARCHAR(8) )"); @@ -2427,3 +2427,15 @@ "); } + +/** + * Re-run lat/long update to existing addresses. + * + * The above function has been edited to store decimals rather than doubles in the + * temp table. This was (wierdly) adding extra digits. + * + * T150305 + */ +function wmf_civicrm_update_7330() { + wmf_civicrm_update_7320(); +} -- To view, visit https://gerrit.wikimedia.org/r/320564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I161f5b35cdedfacecc42ce17cb3bc727628a6784 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Eileen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Message test for implicit formatting
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/320563 Change subject: Add Message test for implicit formatting .. Add Message test for implicit formatting Change-Id: Ia6ec10d0d6da8c2b323054642e206c722d17f0b0 --- M tests/phpunit/includes/MessageTest.php 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/63/320563/1 diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php index 4c689ab..9b9a73a 100644 --- a/tests/phpunit/includes/MessageTest.php +++ b/tests/phpunit/includes/MessageTest.php @@ -256,6 +256,35 @@ $this->assertEquals( $expect, $msg->__toString() ); } + public static function provideToString_raw() { + return [ + [ 'foo', 'foo', 'parse' ], + [ 'foo', 'spanfoo/span', 'escaped' ], + [ 'foo', 'foo', 'plain' ], + [ 'alert(1)', 'scriptalert(1)/script', 'parse' ], + [ 'alert(1)', 'scriptalert(1)/script', 'escaped' ], + [ 'alert(1)', 'alert(1)', 'plain' ], + ]; + } + + /** +* @covers Message::toString +* @covers Message::__toString +* @dataProvider provideToString_raw +*/ + public function testToString_raw( $key, $expect, $format ) { + // make the message behave like RawMessage and use the key as-is + $msg = $this->getMockBuilder( Message::class )->setMethods( [ 'fetchMessage' ] ) + ->setConstructorArgs( [ $key ] ) + ->getMock(); + $msg->expects( $this->any() )->method( 'fetchMessage' )->willReturn( $key ); + /** @var Message $msg */ + $msg->$format(); + $this->assertEquals( $expect, $msg->toString() ); + $this->assertEquals( $expect, $msg->__toString() ); + $this->assertEquals( $expect, $msg->toString() ); + } + /** * @covers Message::inLanguage */ -- To view, visit https://gerrit.wikimedia.org/r/320563 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6ec10d0d6da8c2b323054642e206c722d17f0b0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove gallium.wikimedia.org, keep gallium.mgmt
Dzahn has submitted this change and it was merged. Change subject: remove gallium.wikimedia.org, keep gallium.mgmt .. remove gallium.wikimedia.org, keep gallium.mgmt gallium, the former Continuous Integration server, has been decom'ed completely and was replaced by contint1001.wikimedia.org. It has been shutdown and as the (almost) last step in the process we are removing the IP from DNS now. "almost" because there is still the mgmt IP and datacenter-ops work coming up now to wipe it and physically remove it from the rack, update racktables etc. Bug: T95757 Change-Id: Ia14cfdf0448ae3ff7f1aabfec096c84beff8dcae --- M templates/154.80.208.in-addr.arpa M templates/wikimedia.org 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Dzahn: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/154.80.208.in-addr.arpa b/templates/154.80.208.in-addr.arpa index 694a74e..742bf92 100644 --- a/templates/154.80.208.in-addr.arpa +++ b/templates/154.80.208.in-addr.arpa @@ -89,7 +89,6 @@ 130 1H IN PTR ae2-1002.cr1-eqiad.wikimedia.org. 131 1H IN PTR ae2-1002.cr2-eqiad.wikimedia.org. -135 1H IN PTR gallium.wikimedia.org. 136 1H IN PTR silver.wikimedia.org. 137 1H IN PTR lvs1004.wikimedia.org. 138 1H IN PTR lvs1005.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 12de625..eb5f3ff 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -128,7 +128,6 @@ frdev-eqiad 1H IN A208.80.155.13 fundraising-eqiad 1H IN A208.80.155.14 -gallium 1H IN A208.80.154.135 labservices1002 1H IN A208.80.154.12 hydrogen1H IN A208.80.154.50 1H IN 2620:0:861:1:208:80:154:50 -- To view, visit https://gerrit.wikimedia.org/r/318250 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia14cfdf0448ae3ff7f1aabfec096c84beff8dcae Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: DzahnGerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Cmjohnson Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Hashar Gerrit-Reviewer: RobH Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Drop sections property, add text property on lead
jenkins-bot has submitted this change and it was merged. Change subject: Drop sections property, add text property on lead .. Drop sections property, add text property on lead Repeating information in the lead should only be possible if generating a table of contents. If this is desired for apps I'd suggest we explore other cleaner ways to do this. Bug: T145006 Change-Id: I5ad3f209547922bd69aa74c2045ea1a706952061 --- M routes/mobile-sections.js M test/features/mobile-sections/pagecontent-v2.js 2 files changed, 15 insertions(+), 9 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js index a8db119..451e22d 100644 --- a/routes/mobile-sections.js +++ b/routes/mobile-sections.js @@ -94,14 +94,19 @@ } var hatnotes = transforms.extractHatnotes(lead, removeNodes); var pronunciation = parse.parsePronunciation(lead, input.meta.displaytitle); -var infobox, text, intro; +var issues = transforms.extractPageIssues(lead, removeNodes); + +var infobox, text, intro, sections; + if ( removeNodes ) { infobox = transforms.extractInfobox(lead); intro = transforms.extractLeadIntroduction(lead); +text = lead.body.innerHTML; +} else { +// update text after extractions have taken place +sections = buildLeadSections(input.page.sections); +input.page.sections[0].text = lead.body.innerHTML; } -var issues = transforms.extractPageIssues(lead, removeNodes); -// update text after extractions have taken place -input.page.sections[0].text = lead.body.innerHTML; return { ns: input.meta.ns, @@ -128,7 +133,8 @@ infobox: infobox, intro: intro, geo: input.page.geo, -sections: buildLeadSections(input.page.sections) +sections: sections, +text: text }; } diff --git a/test/features/mobile-sections/pagecontent-v2.js b/test/features/mobile-sections/pagecontent-v2.js index 54d7ba6..5ce020d 100644 --- a/test/features/mobile-sections/pagecontent-v2.js +++ b/test/features/mobile-sections/pagecontent-v2.js @@ -16,7 +16,7 @@ assert.ok(res.body.hatnotes[0], 'See also: Military order (society)', 'hatnote property should be present on lead.'); -assert.ok(res.body.sections[0].text.indexOf('') === -1, +assert.ok(res.body.text.indexOf('') === -1, 'Hatnote should not appear in lead section html.' ); }); }); @@ -26,7 +26,7 @@ .then(function (res) { assert.deepEqual(res.status, 200); assert.ok(res.body.infobox !== undefined); -assert.ok(res.body.sections[0].text.indexOf('"infobox') === -1, +assert.ok(res.body.text.indexOf('"infobox') === -1, 'The infobox is removed in version 2 of the api.'); }); }); @@ -35,7 +35,7 @@ return preq.get({ uri: server.config.uri + 'en.wikipedia.org/v1/page/formatted-lead/User:Jdlrobson%2Fmcs-tests%2Fissues_bug' }) .then(function (res) { assert.deepEqual(res.status, 200); - assert.ok(res.body.sections[0].text.indexOf('ambox-multiple_issues') === -1, +assert.ok(res.body.text.indexOf('ambox-multiple_issues') === -1, 'No ambox multiple issues class in response.'); }); }); @@ -51,7 +51,7 @@ 'Intro does not come from infobox.'); assert.ok(intro.indexOf( 'undefined' ) === -1, 'No undefined concatenations'); -assert.ok(res.body.sections[0].text.indexOf(intro) === -1, +assert.ok(res.body.text.indexOf(intro) === -1, 'Intro is not present in section text.'); }); }); -- To view, visit https://gerrit.wikimedia.org/r/309219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ad3f209547922bd69aa74c2045ea1a706952061 Gerrit-PatchSet: 11 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: JdlrobsonGerrit-Reviewer: BearND Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Fjalapeno Gerrit-Reviewer: GWicke Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Mhurd Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Niedzielski Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Extract introduction from lead section in new experimental e...
jenkins-bot has submitted this change and it was merged. Change subject: Extract introduction from lead section in new experimental endpoint .. Extract introduction from lead section in new experimental endpoint After detecting the most suitable first paragraph and any associated nodes, move it out of the lead section and into its own property `intro`. This will allow a consumer of the API to control positioning of it. Along with infobox, hatnotes and the intro a consumer can achieve all sorts of arrangements. Bug: T145034 Change-Id: I339b398e67961cda29d12707568d9586916393ae --- A lib/transformations/extractLeadIntroduction.js M lib/transforms.js M routes/mobile-sections.js M test/features/mobile-sections/pagecontent-v2.js 4 files changed, 85 insertions(+), 1 deletion(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/transformations/extractLeadIntroduction.js b/lib/transformations/extractLeadIntroduction.js new file mode 100644 index 000..83dfabe --- /dev/null +++ b/lib/transformations/extractLeadIntroduction.js @@ -0,0 +1,52 @@ +'use strict'; + +/* + * Check whether a node has any content. + * @param {DOMElement} node + * @return {Boolean} whether the node is empty after all whitespace is stripped. + */ +function isEmpty( node ) { +return node.textContent.trim().length === 0; +} + +/* + * Extracts the first non-empty paragraph from an article and any + * nodes that follow it that are not themselves paragraphs. + * Removes the paragraph from the document. + * @param {Document} doc representing article + * @return {String} representing article introduction + */ +function extractLeadIntroduction(doc) { +var p = ''; +var remove = []; +var nodes = doc.querySelectorAll( 'body > p' ); + +Array.prototype.forEach.call( nodes, function ( node ) { +var nextSibling; +if ( !p && node && !isEmpty( node ) ) { +p = node.outerHTML; +remove.push( node ); +nextSibling = node.nextSibling; +// check the next element is a text node or not a P tag +while ( nextSibling && ( nextSibling.nodeType === 3 || nextSibling.tagName !== 'P' ) ) { +// Deal with text nodes +if ( nextSibling.nodeType === 3 ) { +if ( !isEmpty( nextSibling ) ) { +p += nextSibling.textContent; +} +} else { +p += nextSibling.outerHTML; +} +remove.push( nextSibling ); +nextSibling = nextSibling.nextSibling; +} +} +} ); +// cleanup all the nodes. +remove.forEach( function ( node ) { +node.parentNode.removeChild( node ); +} ); +return p; +} + +module.exports = extractLeadIntroduction; diff --git a/lib/transforms.js b/lib/transforms.js index 82557f8..5b4b168 100644 --- a/lib/transforms.js +++ b/lib/transforms.js @@ -15,6 +15,7 @@ var relocateFirstParagraph = require('./transformations/relocateFirstParagraph'); var extractInfobox = require( './transformations/extractInfobox' ); var extractPageIssues = require( './transformations/extractPageIssues' ); +var extractLeadIntroduction = require( './transformations/extractLeadIntroduction' ); var transforms = {}; @@ -265,5 +266,6 @@ transforms.markReferenceSections = markReferenceSections; transforms.extractInfobox = extractInfobox; transforms.extractPageIssues = extractPageIssues; +transforms.extractLeadIntroduction = extractLeadIntroduction; module.exports = transforms; diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js index d3a1ccd..a8db119 100644 --- a/routes/mobile-sections.js +++ b/routes/mobile-sections.js @@ -94,9 +94,10 @@ } var hatnotes = transforms.extractHatnotes(lead, removeNodes); var pronunciation = parse.parsePronunciation(lead, input.meta.displaytitle); -var infobox, text; +var infobox, text, intro; if ( removeNodes ) { infobox = transforms.extractInfobox(lead); +intro = transforms.extractLeadIntroduction(lead); } var issues = transforms.extractPageIssues(lead, removeNodes); // update text after extractions have taken place @@ -125,6 +126,7 @@ spoken: input.page.spoken, hatnotes: hatnotes, infobox: infobox, +intro: intro, geo: input.page.geo, sections: buildLeadSections(input.page.sections) }; diff --git a/test/features/mobile-sections/pagecontent-v2.js b/test/features/mobile-sections/pagecontent-v2.js index ad74515..54d7ba6 100644 --- a/test/features/mobile-sections/pagecontent-v2.js +++ b/test/features/mobile-sections/pagecontent-v2.js @@ -39,4 +39,32 @@ 'No ambox multiple issues class in response.'); }); }); + +it('Barack Obama page lead paragraph', function() { +
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.18.0
jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.18.0 .. Update OOjs UI to v0.18.0 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.0 Change-Id: I2b8ef74e090c10a0abc0938e2f3e51ebe3553a6b --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/.eslintrc.json M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/demo.js M oojs/oojs-ui/demos/demos.php M oojs/oojs-ui/demos/infusion.js M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/pages/widgets.php M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/ar.json M oojs/oojs-ui/i18n/bg.json M oojs/oojs-ui/i18n/da.json M oojs/oojs-ui/i18n/mr.json M oojs/oojs-ui/i18n/nds.json M oojs/oojs-ui/i18n/tr.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/Tag.php M oojs/oojs-ui/php/mixins/ButtonElement.php M oojs/oojs-ui/php/widgets/InputWidget.php M oojs/oojs-ui/php/widgets/TextInputWidget.php 23 files changed, 437 insertions(+), 231 deletions(-) Approvals: VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 7e8cc4f..02d8104 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.18.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.17.10", + "oojs/oojs-ui": "0.18.0", "oyejorge/less.php": "1.7.0.10", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index f4e63e9..245 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"hash": "c74fe46f9fdcf3e76526c28d9cc33baf", -"content-hash": "82c8d10ea460b81de3a0b28b36a2e957", +"hash": "b17b7a811c8ff679b7c6d108c1f81e83", +"content-hash": "da2b764402ee804df059aa5368f84c2d", "packages": [ { "name": "composer/semver", @@ -466,16 +466,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.17.10", +"version": "v0.18.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782" +"reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/e4ba87bf92499538128363ffc0213c4055396782;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/9bb664bf24be66b4d887b976fd6e71c460c15ffd;, +"reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd", "shasum": "" }, "require": { @@ -541,7 +541,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;, -"time": "2016-10-03 18:37:58" +"time": "2016-11-08 23:36:02" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 884fd89..bb5d6a4 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1797,87 +1797,6 @@ "homepage": "https://www.mediawiki.org/wiki/Php-session-serializer; }, { -"name": "oojs/oojs-ui", -"version": "v0.17.10", -"version_normalized": "0.17.10.0", -"source": { -"type": "git", -"url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/e4ba87bf92499538128363ffc0213c4055396782;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782", -"shasum": "" -}, -"require": { -"mediawiki/at-ease": "1.1.0", -"php": ">=5.5.9" -}, -"require-dev": { -"jakub-onderka/php-parallel-lint": "0.9.2", -"mediawiki/mediawiki-codesniffer": "0.6.0", -"phpunit/phpunit": "4.8.21" -}, -"time": "2016-10-03 18:37:58", -"type": "library", -"installation-source": "dist", -"autoload": { -"classmap": [ -"php/" -] -}, -"notification-url": "https://packagist.org/downloads/;, -
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Release notes for Id88c8066, Id1ace959, I3c29131e
jenkins-bot has submitted this change and it was merged. Change subject: Release notes for Id88c8066, Id1ace959, I3c29131e .. Release notes for Id88c8066, Id1ace959, I3c29131e * Id88c8066fae3f369e8977b4b7488f67071bdeeb7 * Id1ace9599642a36b333c63eaeebab0537466e7bd * I3c29131ea2041fa7429eae5fab5fae04e39f3da0 Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 (cherry picked from commit 9c12d5dd501a33a54b8b8f62d340cfc425f1d8a4) --- M RELEASE-NOTES-1.28 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index 7521cfa..ae8dd35 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -5,6 +5,20 @@ MediaWiki 1.28 is an alpha-quality branch and is not recommended for use in production. +=== Changes since 1.28.0rc0 === +* (T142210) The changes to move the parser "NewPP limit report" from a HTML + comment to a machine-readable JavaScript config option 'wgPageParseReport' + have been undone. They caused the human-readable limit report to be shown + incompletely or not at all. ParserOutput::setLimitReportData() and + getLimitReportData() behave as they did in MediaWiki 1.27 again. +* (T149510) Value of {{DISPLAYTITLE:}} parser function will not be used for + the text of subheadings on a category page when creating it. This wasn't + working correctly. +* (T106793) MediaWiki will no longer try to perform a HTTP redirect to the + canonical pretty URL when a non-pretty URL is used. It resulted in redirect + loops in some clients and in some server configurations. This undoes a change + made in MediaWiki 1.26. + === Configuration changes in 1.28 === * $wgSend404Code now affects status code of action=history if the page is not there. * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests -- To view, visit https://gerrit.wikimedia.org/r/320562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Release notes for Id88c8066, Id1ace959, I3c29131e
jenkins-bot has submitted this change and it was merged. Change subject: Release notes for Id88c8066, Id1ace959, I3c29131e .. Release notes for Id88c8066, Id1ace959, I3c29131e * Id88c8066fae3f369e8977b4b7488f67071bdeeb7 * Id1ace9599642a36b333c63eaeebab0537466e7bd * I3c29131ea2041fa7429eae5fab5fae04e39f3da0 Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 --- M RELEASE-NOTES-1.28 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index df9feda..557162e 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -5,6 +5,20 @@ MediaWiki 1.28 is an alpha-quality branch and is not recommended for use in production. +=== Changes since 1.28.0rc0 === +* (T142210) The changes to move the parser "NewPP limit report" from a HTML + comment to a machine-readable JavaScript config option 'wgPageParseReport' + have been undone. They caused the human-readable limit report to be shown + incompletely or not at all. ParserOutput::setLimitReportData() and + getLimitReportData() behave as they did in MediaWiki 1.27 again. +* (T149510) Value of {{DISPLAYTITLE:}} parser function will not be used for + the text of subheadings on a category page when creating it. This wasn't + working correctly. +* (T106793) MediaWiki will no longer try to perform a HTTP redirect to the + canonical pretty URL when a non-pretty URL is used. It resulted in redirect + loops in some clients and in some server configurations. This undoes a change + made in MediaWiki 1.26. + === Configuration changes in 1.28 === * $wgSend404Code now affects status code of action=history if the page is not there. * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests -- To view, visit https://gerrit.wikimedia.org/r/320561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Release notes for Id88c8066, Id1ace959, I3c29131e
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320562 Change subject: Release notes for Id88c8066, Id1ace959, I3c29131e .. Release notes for Id88c8066, Id1ace959, I3c29131e * Id88c8066fae3f369e8977b4b7488f67071bdeeb7 * Id1ace9599642a36b333c63eaeebab0537466e7bd * I3c29131ea2041fa7429eae5fab5fae04e39f3da0 Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 (cherry picked from commit 9c12d5dd501a33a54b8b8f62d340cfc425f1d8a4) --- M RELEASE-NOTES-1.28 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/320562/1 diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index 7521cfa..ae8dd35 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -5,6 +5,20 @@ MediaWiki 1.28 is an alpha-quality branch and is not recommended for use in production. +=== Changes since 1.28.0rc0 === +* (T142210) The changes to move the parser "NewPP limit report" from a HTML + comment to a machine-readable JavaScript config option 'wgPageParseReport' + have been undone. They caused the human-readable limit report to be shown + incompletely or not at all. ParserOutput::setLimitReportData() and + getLimitReportData() behave as they did in MediaWiki 1.27 again. +* (T149510) Value of {{DISPLAYTITLE:}} parser function will not be used for + the text of subheadings on a category page when creating it. This wasn't + working correctly. +* (T106793) MediaWiki will no longer try to perform a HTTP redirect to the + canonical pretty URL when a non-pretty URL is used. It resulted in redirect + loops in some clients and in some server configurations. This undoes a change + made in MediaWiki 1.26. + === Configuration changes in 1.28 === * $wgSend404Code now affects status code of action=history if the page is not there. * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests -- To view, visit https://gerrit.wikimedia.org/r/320562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Release notes for Id88c8066, Id1ace959, I3c29131e
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320561 Change subject: Release notes for Id88c8066, Id1ace959, I3c29131e .. Release notes for Id88c8066, Id1ace959, I3c29131e * Id88c8066fae3f369e8977b4b7488f67071bdeeb7 * Id1ace9599642a36b333c63eaeebab0537466e7bd * I3c29131ea2041fa7429eae5fab5fae04e39f3da0 Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 --- M RELEASE-NOTES-1.28 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/320561/1 diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index df9feda..557162e 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -5,6 +5,20 @@ MediaWiki 1.28 is an alpha-quality branch and is not recommended for use in production. +=== Changes since 1.28.0rc0 === +* (T142210) The changes to move the parser "NewPP limit report" from a HTML + comment to a machine-readable JavaScript config option 'wgPageParseReport' + have been undone. They caused the human-readable limit report to be shown + incompletely or not at all. ParserOutput::setLimitReportData() and + getLimitReportData() behave as they did in MediaWiki 1.27 again. +* (T149510) Value of {{DISPLAYTITLE:}} parser function will not be used for + the text of subheadings on a category page when creating it. This wasn't + working correctly. +* (T106793) MediaWiki will no longer try to perform a HTTP redirect to the + canonical pretty URL when a non-pretty URL is used. It resulted in redirect + loops in some clients and in some server configurations. This undoes a change + made in MediaWiki 1.26. + === Configuration changes in 1.28 === * $wgSend404Code now affects status code of action=history if the page is not there. * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests -- To view, visit https://gerrit.wikimedia.org/r/320561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd21c5bdd0601ec302cd774488822064ced6b906 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Adding help command to grrrit-wm
Zppix has submitted this change and it was merged. Change subject: Adding help command to grrrit-wm .. Adding help command to grrrit-wm Change-Id: I9caf7978d0346e698de79b1aa047bb1a9c5c4e98 --- M src/relay.js 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Paladox: Looks good to me, approved Zppix: Verified diff --git a/src/relay.js b/src/relay.js index 341c027..ca389aa 100644 --- a/src/relay.js +++ b/src/relay.js @@ -255,5 +255,9 @@ ) { ircClient.say(to, "Permission is denied."); } + + if (text.indexOf(ircClient.nick + ': ' + 'help') === 0) { + ircClient.say(to, "My current commands are: " + ircClient.nick + ": restart" + ", " + ircClient.nick + ": force-restart" + ", " + " and " + ircClient.nick + ": nick"); + } }); }); -- To view, visit https://gerrit.wikimedia.org/r/320541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9caf7978d0346e698de79b1aa047bb1a9c5c4e98 Gerrit-PatchSet: 6 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: ZppixGerrit-Reviewer: MarkTraceur Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Paladox Gerrit-Reviewer: Zppix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Improve import to allow downloading of ALL non imported rows...
Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/320560 Change subject: Improve import to allow downloading of ALL non imported rows and add tests .. Improve import to allow downloading of ALL non imported rows and add tests Bug: T88460 Change-Id: If7525f1c81d1f49837dd9a5f0404dd39d23f9c3c --- M sites/all/modules/offline2civicrm/ChecksFile.php M sites/all/modules/offline2civicrm/offline2civicrm.module M sites/all/modules/offline2civicrm/test_data/engage.csv A sites/all/modules/offline2civicrm/test_data/engage_reduced.csv M sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php 5 files changed, 244 insertions(+), 1,000 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/60/320560/1 -- To view, visit https://gerrit.wikimedia.org/r/320560 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7525f1c81d1f49837dd9a5f0404dd39d23f9c3c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Eileen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Revert "MediaWiki.php: Redirect non-standard title urls to c...
Bartosz Dziewoński has submitted this change and it was merged. Change subject: Revert "MediaWiki.php: Redirect non-standard title urls to canonical" .. Revert "MediaWiki.php: Redirect non-standard title urls to canonical" This reverts commit 155d555b83eca6403e07d2094b074a8ed2f301ae. Bug: T106793 Change-Id: I3c29131ea2041fa7429eae5fab5fae04e39f3da0 (cherry picked from commit 799eb213d5a3f7148083934e9c359066c3f1abe8) --- M includes/MediaWiki.php M tests/phpunit/includes/MediaWikiTest.php 2 files changed, 11 insertions(+), 21 deletions(-) Approvals: Bartosz Dziewoński: Verified; Looks good to me, approved diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index f21128e..aabaf30 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -313,8 +313,6 @@ * - Normalise empty title: * /wiki/ -> /wiki/Main * /w/index.php?title= -> /wiki/Main -* - Normalise non-standard title urls: -* /w/index.php?title=Foo_Bar -> /wiki/Foo_Bar * - Don't redirect anything with query parameters other than 'title' or 'action=view'. * * @param Title $title @@ -327,6 +325,8 @@ if ( $request->getVal( 'action', 'view' ) != 'view' || $request->wasPosted() + || ( $request->getVal( 'title' ) !== null + && $title->getPrefixedDBkey() == $request->getVal( 'title' ) ) || count( $request->getValueNames( [ 'action', 'title' ] ) ) || !Hooks::run( 'TestCanonicalRedirect', [ $request, $title, $output ] ) ) { @@ -341,19 +341,7 @@ } // Redirect to canonical url, make it a 301 to allow caching $targetUrl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT ); - - if ( $targetUrl != $request->getFullRequestURL() ) { - $output->setCdnMaxage( 1200 ); - $output->redirect( $targetUrl, '301' ); - return true; - } - - // If there is no title, or the title is in a non-standard encoding, we demand - // a redirect. If cgi somehow changed the 'title' query to be non-standard while - // the url is standard, the server is misconfigured. - if ( $request->getVal( 'title' ) === null - || $title->getPrefixedDBkey() != $request->getVal( 'title' ) - ) { + if ( $targetUrl == $request->getFullRequestURL() ) { $message = "Redirect loop detected!\n\n" . "This means the wiki got confused about what page was " . "requested; this sometimes happens when moving a wiki " . @@ -375,7 +363,9 @@ } throw new HttpError( 500, $message ); } - return false; + $output->setSquidMaxage( 1200 ); + $output->redirect( $targetUrl, '301' ); + return true; } /** diff --git a/tests/phpunit/includes/MediaWikiTest.php b/tests/phpunit/includes/MediaWikiTest.php index df92012..a8d1e33 100644 --- a/tests/phpunit/includes/MediaWikiTest.php +++ b/tests/phpunit/includes/MediaWikiTest.php @@ -34,7 +34,7 @@ 'url' => 'http://example.org/w/index.php?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Script path with implicit title from page id @@ -76,21 +76,21 @@ 'url' => 'http://example.org/w/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Root path with escaped title 'url' => 'http://example.org/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Canonical with redundant query 'url' => 'http://example.org/wiki/Foo_Bar?action=view',
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "MediaWiki.php: Redirect non-standard title urls to c...
jenkins-bot has submitted this change and it was merged. Change subject: Revert "MediaWiki.php: Redirect non-standard title urls to canonical" .. Revert "MediaWiki.php: Redirect non-standard title urls to canonical" This reverts commit 155d555b83eca6403e07d2094b074a8ed2f301ae. Bug: T106793 Change-Id: I3c29131ea2041fa7429eae5fab5fae04e39f3da0 --- M includes/MediaWiki.php M tests/phpunit/includes/MediaWikiTest.php 2 files changed, 11 insertions(+), 21 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified Objections: Krinkle: There's a problem with this change, please improve Jforrester: There's a problem with this change, please improve diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index bca7a21..7d8232c 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -313,8 +313,6 @@ * - Normalise empty title: * /wiki/ -> /wiki/Main * /w/index.php?title= -> /wiki/Main -* - Normalise non-standard title urls: -* /w/index.php?title=Foo_Bar -> /wiki/Foo_Bar * - Don't redirect anything with query parameters other than 'title' or 'action=view'. * * @param Title $title @@ -327,6 +325,8 @@ if ( $request->getVal( 'action', 'view' ) != 'view' || $request->wasPosted() + || ( $request->getVal( 'title' ) !== null + && $title->getPrefixedDBkey() == $request->getVal( 'title' ) ) || count( $request->getValueNames( [ 'action', 'title' ] ) ) || !Hooks::run( 'TestCanonicalRedirect', [ $request, $title, $output ] ) ) { @@ -341,19 +341,7 @@ } // Redirect to canonical url, make it a 301 to allow caching $targetUrl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT ); - - if ( $targetUrl != $request->getFullRequestURL() ) { - $output->setCdnMaxage( 1200 ); - $output->redirect( $targetUrl, '301' ); - return true; - } - - // If there is no title, or the title is in a non-standard encoding, we demand - // a redirect. If cgi somehow changed the 'title' query to be non-standard while - // the url is standard, the server is misconfigured. - if ( $request->getVal( 'title' ) === null - || $title->getPrefixedDBkey() != $request->getVal( 'title' ) - ) { + if ( $targetUrl == $request->getFullRequestURL() ) { $message = "Redirect loop detected!\n\n" . "This means the wiki got confused about what page was " . "requested; this sometimes happens when moving a wiki " . @@ -375,7 +363,9 @@ } throw new HttpError( 500, $message ); } - return false; + $output->setSquidMaxage( 1200 ); + $output->redirect( $targetUrl, '301' ); + return true; } /** diff --git a/tests/phpunit/includes/MediaWikiTest.php b/tests/phpunit/includes/MediaWikiTest.php index df92012..a8d1e33 100644 --- a/tests/phpunit/includes/MediaWikiTest.php +++ b/tests/phpunit/includes/MediaWikiTest.php @@ -34,7 +34,7 @@ 'url' => 'http://example.org/w/index.php?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Script path with implicit title from page id @@ -76,21 +76,21 @@ 'url' => 'http://example.org/w/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Root path with escaped title 'url' => 'http://example.org/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Canonical with redundant query
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Revert "MediaWiki.php: Redirect non-standard title urls to c...
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320559 Change subject: Revert "MediaWiki.php: Redirect non-standard title urls to canonical" .. Revert "MediaWiki.php: Redirect non-standard title urls to canonical" This reverts commit 155d555b83eca6403e07d2094b074a8ed2f301ae. Bug: T106793 Change-Id: I3c29131ea2041fa7429eae5fab5fae04e39f3da0 (cherry picked from commit 799eb213d5a3f7148083934e9c359066c3f1abe8) --- M includes/MediaWiki.php M tests/phpunit/includes/MediaWikiTest.php 2 files changed, 11 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/59/320559/1 diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index f21128e..aabaf30 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -313,8 +313,6 @@ * - Normalise empty title: * /wiki/ -> /wiki/Main * /w/index.php?title= -> /wiki/Main -* - Normalise non-standard title urls: -* /w/index.php?title=Foo_Bar -> /wiki/Foo_Bar * - Don't redirect anything with query parameters other than 'title' or 'action=view'. * * @param Title $title @@ -327,6 +325,8 @@ if ( $request->getVal( 'action', 'view' ) != 'view' || $request->wasPosted() + || ( $request->getVal( 'title' ) !== null + && $title->getPrefixedDBkey() == $request->getVal( 'title' ) ) || count( $request->getValueNames( [ 'action', 'title' ] ) ) || !Hooks::run( 'TestCanonicalRedirect', [ $request, $title, $output ] ) ) { @@ -341,19 +341,7 @@ } // Redirect to canonical url, make it a 301 to allow caching $targetUrl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT ); - - if ( $targetUrl != $request->getFullRequestURL() ) { - $output->setCdnMaxage( 1200 ); - $output->redirect( $targetUrl, '301' ); - return true; - } - - // If there is no title, or the title is in a non-standard encoding, we demand - // a redirect. If cgi somehow changed the 'title' query to be non-standard while - // the url is standard, the server is misconfigured. - if ( $request->getVal( 'title' ) === null - || $title->getPrefixedDBkey() != $request->getVal( 'title' ) - ) { + if ( $targetUrl == $request->getFullRequestURL() ) { $message = "Redirect loop detected!\n\n" . "This means the wiki got confused about what page was " . "requested; this sometimes happens when moving a wiki " . @@ -375,7 +363,9 @@ } throw new HttpError( 500, $message ); } - return false; + $output->setSquidMaxage( 1200 ); + $output->redirect( $targetUrl, '301' ); + return true; } /** diff --git a/tests/phpunit/includes/MediaWikiTest.php b/tests/phpunit/includes/MediaWikiTest.php index df92012..a8d1e33 100644 --- a/tests/phpunit/includes/MediaWikiTest.php +++ b/tests/phpunit/includes/MediaWikiTest.php @@ -34,7 +34,7 @@ 'url' => 'http://example.org/w/index.php?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Script path with implicit title from page id @@ -76,21 +76,21 @@ 'url' => 'http://example.org/w/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Root path with escaped title 'url' => 'http://example.org/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Canonical with redundant query 'url' =>
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.18.0
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/320558 Change subject: Update OOjs UI to v0.18.0 .. Update OOjs UI to v0.18.0 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.0 Change-Id: I2b8ef74e090c10a0abc0938e2f3e51ebe3553a6b --- M composer.json M resources/lib/oojs-ui/i18n/ar.json M resources/lib/oojs-ui/i18n/bg.json M resources/lib/oojs-ui/i18n/da.json M resources/lib/oojs-ui/i18n/mr.json M resources/lib/oojs-ui/i18n/nds.json M resources/lib/oojs-ui/i18n/tr.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/themes/apex/icons-media.json M resources/lib/oojs-ui/themes/apex/images/icons/bigger-ltr.png M resources/lib/oojs-ui/themes/apex/images/icons/bigger-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/bigger-rtl.png M resources/lib/oojs-ui/themes/apex/images/icons/bigger-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/smaller-ltr.png M resources/lib/oojs-ui/themes/apex/images/icons/smaller-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/smaller-rtl.png M resources/lib/oojs-ui/themes/apex/images/icons/smaller-rtl.svg M resources/lib/oojs-ui/themes/mediawiki/icons-media.json M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-invert.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-progressive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl-invert.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl-progressive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-ltr-invert.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-ltr-progressive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-ltr-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-ltr.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-ltr.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-rtl-invert.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-rtl-progressive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-rtl-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-rtl.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/smaller-rtl.svg 55 files changed, 3,924 insertions(+), 3,686 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/58/320558/1 -- To view, visit https://gerrit.wikimedia.org/r/320558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b8ef74e090c10a0abc0938e2f3e51ebe3553a6b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.18.0
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/320557 Change subject: Update OOjs UI to v0.18.0 .. Update OOjs UI to v0.18.0 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.0 Change-Id: I2b8ef74e090c10a0abc0938e2f3e51ebe3553a6b --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/.eslintrc.json M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/demo.js M oojs/oojs-ui/demos/demos.php M oojs/oojs-ui/demos/infusion.js M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/pages/widgets.php M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/ar.json M oojs/oojs-ui/i18n/bg.json M oojs/oojs-ui/i18n/da.json M oojs/oojs-ui/i18n/mr.json M oojs/oojs-ui/i18n/nds.json M oojs/oojs-ui/i18n/tr.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/Tag.php M oojs/oojs-ui/php/mixins/ButtonElement.php M oojs/oojs-ui/php/widgets/InputWidget.php M oojs/oojs-ui/php/widgets/TextInputWidget.php 23 files changed, 437 insertions(+), 231 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/57/320557/1 diff --git a/composer.json b/composer.json index 7e8cc4f..02d8104 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.18.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.17.10", + "oojs/oojs-ui": "0.18.0", "oyejorge/less.php": "1.7.0.10", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index f4e63e9..245 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"hash": "c74fe46f9fdcf3e76526c28d9cc33baf", -"content-hash": "82c8d10ea460b81de3a0b28b36a2e957", +"hash": "b17b7a811c8ff679b7c6d108c1f81e83", +"content-hash": "da2b764402ee804df059aa5368f84c2d", "packages": [ { "name": "composer/semver", @@ -466,16 +466,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.17.10", +"version": "v0.18.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782" +"reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/e4ba87bf92499538128363ffc0213c4055396782;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/9bb664bf24be66b4d887b976fd6e71c460c15ffd;, +"reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd", "shasum": "" }, "require": { @@ -541,7 +541,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;, -"time": "2016-10-03 18:37:58" +"time": "2016-11-08 23:36:02" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 884fd89..bb5d6a4 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1797,87 +1797,6 @@ "homepage": "https://www.mediawiki.org/wiki/Php-session-serializer; }, { -"name": "oojs/oojs-ui", -"version": "v0.17.10", -"version_normalized": "0.17.10.0", -"source": { -"type": "git", -"url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/e4ba87bf92499538128363ffc0213c4055396782;, -"reference": "e4ba87bf92499538128363ffc0213c4055396782", -"shasum": "" -}, -"require": { -"mediawiki/at-ease": "1.1.0", -"php": ">=5.5.9" -}, -"require-dev": { -"jakub-onderka/php-parallel-lint": "0.9.2", -"mediawiki/mediawiki-codesniffer": "0.6.0", -"phpunit/phpunit": "4.8.21" -}, -"time": "2016-10-03 18:37:58", -"type": "library", -"installation-source": "dist", -"autoload": { -"classmap": [ -"php/" -] -}, -
[MediaWiki-commits] [Gerrit] operations/puppet[production]: ssh_pybal: Restrict to production networks
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/320556 Change subject: ssh_pybal: Restrict to production networks .. ssh_pybal: Restrict to production networks SSH health checks are only coming from production hosts, restrict to production networks. Change-Id: I439c36f001df4a785aac73635349c2c8a77fb749 --- M modules/role/manifests/mediawiki/common.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/320556/1 diff --git a/modules/role/manifests/mediawiki/common.pp b/modules/role/manifests/mediawiki/common.pp index 26dec47..10f46c1 100644 --- a/modules/role/manifests/mediawiki/common.pp +++ b/modules/role/manifests/mediawiki/common.pp @@ -22,7 +22,7 @@ ferm::service{ 'ssh_pybal': proto => 'tcp', port => '22', -srange => '$INTERNAL', +srange => '$PRODUCTION_NETWORKS', desc => 'Allow incoming SSH for pybal health checks', } -- To view, visit https://gerrit.wikimedia.org/r/320556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I439c36f001df4a785aac73635349c2c8a77fb749 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.28.0-wmf.23]: Track visibilitychange events to statsd
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/320555 Change subject: Track visibilitychange events to statsd .. Track visibilitychange events to statsd Track whether the page was hidden at some point while the page is loading. This may help correlate performance regressions to cases where performance is intentionally deminished by browsers when the page is not visible to the user (e.g. in a background tab, background window, or minimized window). Bug: T146510 Change-Id: I86601b41a3cf813077730bb0a28588cc4d391292 (cherry picked from commit b20df90dac0269058bbc62ba61519f50c793a5e2) --- M extension.json A modules/ext.wikimediaEvents.visibilitychange.js 2 files changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/55/320555/1 diff --git a/extension.json b/extension.json index be79cbe..6f4fadb 100644 --- a/extension.json +++ b/extension.json @@ -126,6 +126,7 @@ "ext.wikimediaEvents.events.js", "ext.wikimediaEvents.statsd.js", "ext.wikimediaEvents.rlfeature.js", + "ext.wikimediaEvents.visibilitychange.js", "ext.wikimediaEvents.searchSatisfaction.js", "ext.wikimediaEvents.geoFeatures.js" ], diff --git a/modules/ext.wikimediaEvents.visibilitychange.js b/modules/ext.wikimediaEvents.visibilitychange.js new file mode 100644 index 000..473cebd --- /dev/null +++ b/modules/ext.wikimediaEvents.visibilitychange.js @@ -0,0 +1,77 @@ +/*! + * Track hiding and showing of pages to help investigate performance regressions + * that may be the result of the browser intentionally lowering the load priority + * of a page that is in a background tab or hidden window. + * + * - All page loads in the sample will record one of 'supported' or 'unsupported'. + * - A subset of 'supported' may also record 'vendor' and/or 'hidden'. + * - Each event will only be recorded at most once from a single page view. + * - 'hidden' is recorded if document.hidden was true at any point before + * window.onload and mwLoadEnd. Once these are both done, visibility changes + * are ignored. + * + * Inspiration: + * - https://github.com/SOASTA/boomerang/blob/d49b90d6d1/boomerang.js + * - https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API + * + * Supported browsers per MDN: + * - Chrome 13+ + * - Firefox 18+ + * - MSIE 10 + * - Opera 12.10 + * - Safari 7+ + */ +( function ( mw ) { + var hidden, vendor, eventName, mwLoadEnd, + tracked = {}; + + function trackOnce( state ) { + if ( tracked[ state ] !== true ) { + tracked[ state ] = true; + mw.track( 'counter.mw.js.visibility.' + state, 1 ); + } + + } + + function check() { + if ( document[ hidden ] === true && !( mwLoadEnd && document.readyState === 'complete' ) ) { + trackOnce( 'hidden' ); + } + } + + // Filter: Sample 1 in 1000 page views + if ( !mw.eventLog.inSample( 1000 ) ) { + return; + } + + if ( typeof document.hidden !== 'undefined' ) { + hidden = 'hidden'; + eventName = 'visibilitychange'; + } else if ( typeof document.mozHidden !== 'undefined' ) { + hidden = 'mozHidden'; + eventName = 'mozvisibilitychange'; + vendor = true; + } else if ( typeof document.msHidden !== 'undefined' ) { + hidden = 'msHidden'; + eventName = 'msvisibilitychange'; + vendor = true; + } else if ( typeof document.webkitHidden !== 'undefined' ) { + hidden = 'webkitHidden'; + eventName = 'webkitvisibilitychange'; + vendor = true; + } else { + trackOnce( 'unsupported' ); + return; + } + + check(); + document.addEventListener( eventName, check, false ); + trackOnce( 'supported' ); + if ( vendor ) { + trackOnce( 'vendor' ); + } + mw.hook( 'resourceloader.loadEnd' ).add( function () { + mwLoadEnd = true; + } ); + +}( mediaWiki ) ); -- To view, visit https://gerrit.wikimedia.org/r/320555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86601b41a3cf813077730bb0a28588cc4d391292 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: wmf/1.28.0-wmf.23 Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Only return Status objects from CirrusSearch::searchText
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/320554 Change subject: Only return Status objects from CirrusSearch::searchText .. Only return Status objects from CirrusSearch::searchText There are times when elasticsearch can return partial results, such as timeouts. To be able to tell users about these we need to be able to pass back a Status object that contains both the result set and some warnings. Depends on a core patch which changes the assumptions around using SearchEngine::searchText() to allow for Status objects that are 'OK' rather than only 'Good'. There are also patches in Flow and ProofreadPages extensions that will need to be deployed in the same train. Change-Id: I34a522bee18d14137d4640b7d5cf2893985b6eea Depends-On: Ic5e0db727790f4fd189caa54ea5f01672d6a8ea4 Bug: T134157 --- M i18n/en.json M i18n/qqq.json M includes/CirrusSearch.php M includes/Searcher.php 4 files changed, 29 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/54/320554/1 diff --git a/i18n/en.json b/i18n/en.json index baa7479..8acbc2a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -52,5 +52,7 @@ "cirrussearch-pref-completion-legacy-section-desc": "Prefix search", "cirrussearch-pref-completion-legacy-section-legend": "The legacy search-as-you-type suggestion algorithm.", "cirrussearch-completion-profile-classic-pref-name": "Classic prefix search", - "cirrussearch-completion-profile-classic-pref-desc": "No typo correction. Matches the beginning of titles." + "cirrussearch-completion-profile-classic-pref-desc": "No typo correction. Matches the beginning of titles.", + "cirrussearch-timed-out": "The search timed out, only partial results are available.", + "cirrussearch-regex-timed-out": "The regex search timed out, only partial results are available. Try simplifying your regular expression to get complete results." } diff --git a/i18n/qqq.json b/i18n/qqq.json index 6eeabb2..fdb9102 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -61,5 +61,7 @@ "cirrussearch-pref-completion-legacy-section-desc": "Name of the subsection Prefix search in the user preferences", "cirrussearch-pref-completion-legacy-section-legend": "Legend of the subsection Prefix search in the user preferences.", "cirrussearch-completion-profile-classic-pref-name": "Name of the completion profile classic.", - "cirrussearch-completion-profile-classic-pref-desc": "Description of the completion profile classic." + "cirrussearch-completion-profile-classic-pref-desc": "Description of the completion profile classic.", + "cirrussearch-timed-out": "Message displayed to user when the search query gave up due to timeout before completing.", + "cirrussearch-regex-timed-out": "Message displayed to user when the regex search query gave up due to timeout before completing." } diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php index 4681375..adf51f6 100644 --- a/includes/CirrusSearch.php +++ b/includes/CirrusSearch.php @@ -152,25 +152,26 @@ /** * Overridden to delegate prefix searching to Searcher. * @param string $term text to search -* @return ResultSet|null|Status results, no results, or error respectively +* @return Status Value is either SearchResultSet, or null on error. */ public function searchText( $term ) { $config = $this->config; if ( $this->request && $this->request->getVal( 'cirrusLang' ) ) { $config = new SearchConfig( $this->request->getVal( 'cirrusLang' ) ); } - $matches = $this->searchTextReal( $term, $config ); - if (!$matches instanceof ResultSet) { - return $matches; + $status = $this->searchTextReal( $term, $config ); + $matches = $status->getValue(); + if ( !$status->isOK() || !$matches instanceof ResultSet ) { + return $status; } if ( $this->isFeatureEnabled( 'rewrite' ) && $matches->isQueryRewriteAllowed( $GLOBALS['wgCirrusSearchInterwikiThreshold'] ) ) { - $matches = $this->searchTextSecondTry( $term, $matches ); + $status = $this->searchTextSecondTry( $term, $status ); } - ElasticsearchIntermediary::setResultPages( [ $matches ] ); + ElasticsearchIntermediary::setResultPages( [ $status->getValue() ] ); - return $matches; + return $status; } /** @@ -263,11 +264,12 @@ /** * @param string $term -* @param ResultSet $oldResult -* @return ResultSet +* @param
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.18.0
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/320553 Change subject: Update OOjs UI to v0.18.0 .. Update OOjs UI to v0.18.0 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.0 Change-Id: I2b8ef74e090c10a0abc0938e2f3e51ebe3553a6b --- M lib/oojs-ui/i18n/ar.json M lib/oojs-ui/i18n/bg.json M lib/oojs-ui/i18n/da.json M lib/oojs-ui/i18n/mr.json M lib/oojs-ui/i18n/nds.json M lib/oojs-ui/i18n/tr.json M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-mediawiki.css M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-windows-apex.css M lib/oojs-ui/oojs-ui-windows-apex.rtl.css M lib/oojs-ui/oojs-ui-windows-mediawiki.css M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-windows.js A lib/oojs-ui/oojs-ui.js M lib/oojs-ui/themes/apex/images/icons/bigger-ltr.png M lib/oojs-ui/themes/apex/images/icons/bigger-ltr.svg M lib/oojs-ui/themes/apex/images/icons/bigger-rtl.png M lib/oojs-ui/themes/apex/images/icons/bigger-rtl.svg M lib/oojs-ui/themes/apex/images/icons/smaller-ltr.png M lib/oojs-ui/themes/apex/images/icons/smaller-ltr.svg M lib/oojs-ui/themes/apex/images/icons/smaller-rtl.png M lib/oojs-ui/themes/apex/images/icons/smaller-rtl.svg M lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-invert.png M lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-invert.svg M
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add PageViewInfo log channel
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/320552 Change subject: Add PageViewInfo log channel .. Add PageViewInfo log channel Bug: T129602 Change-Id: I6e5889911aeb383da00991ee71e0f8d7d532bf56 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/52/320552/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 09bd4c0..32de0f4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4584,6 +4584,7 @@ 'oai' => 'debug', 'OAuth' => 'debug', 'OutputBuffer' => 'debug', + 'PageViewInfo' => 'info', 'poolcounter' => 'debug', 'purge' => 'debug', 'query' => 'debug', -- To view, visit https://gerrit.wikimedia.org/r/320552 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e5889911aeb383da00991ee71e0f8d7d532bf56 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Accept 'OK' status results from search engine
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/320551 Change subject: Accept 'OK' status results from search engine .. Accept 'OK' status results from search engine Historically code that talks to the SearchEngine has been treating anything other than a 'Good' result, such as results but with a warning (perhaps the query timed out and only gave partial results) as a complete failure. Adjust the handling to report results from an 'OK' status response while attaching any warnings to the api response, or in a notiable red box on Special:Search. Bug: T134157 Change-Id: Ic5e0db727790f4fd189caa54ea5f01672d6a8ea4 --- M includes/api/ApiQuerySearch.php M includes/specials/SpecialSearch.php 2 files changed, 31 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/320551/1 diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php index 6be5198..488d7db 100644 --- a/includes/api/ApiQuerySearch.php +++ b/includes/api/ApiQuerySearch.php @@ -107,10 +107,25 @@ $matches = $search->searchText( $query ); } } - if ( is_null( $matches ) ) { + + if ( $matches instanceof Status ) { + $status = $matches; + $matches = $status->getValue(); + } else { + $status = null; + } + + if ( $status ) { + if ( $status->isOK() ) { + $this->getMain()->getErrorFormatter()->addMessagesFromStatus( + $this->getModuleName(), + $status + ); + } else { + $this->dieUsage( $matches->getWikiText( false, false, 'en' ), 'search-error' ); + } + } elseif ( is_null( $matches ) ) { $this->dieUsage( "{$what} search is disabled", "search-{$what}-disabled" ); - } elseif ( $matches instanceof Status && !$matches->isGood() ) { - $this->dieUsage( $matches->getWikiText( false, false, 'en' ), 'search-error' ); } if ( $resultPageSet === null ) { diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 9280b04..add2abb 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -295,12 +295,12 @@ $textStatus = null; if ( $textMatches instanceof Status ) { $textStatus = $textMatches; - $textMatches = null; + $textMatches = $textStatus->getValue(); } // did you mean... suggestions $didYouMeanHtml = ''; - if ( $showSuggestion && $textMatches && !$textStatus ) { + if ( $showSuggestion && $textMatches ) { if ( $textMatches->hasRewrittenQuery() ) { $didYouMeanHtml = $this->getDidYouMeanRewrittenHtml( $term, $textMatches ); } elseif ( $textMatches->hasSuggestion() ) { @@ -360,6 +360,14 @@ $out->addHTML( "" ); + if ( $textStatus && $textStatus->getErrors() ) { + $out->addHTML( Html::rawElement( + 'div', + [ 'class' => 'errorbox' ], + $textStatus->getHTML( 'search-error' ) + ) ); + } + // prev/next links $prevnext = null; if ( $num || $this->offset ) { @@ -388,7 +396,8 @@ } $titleMatches->free(); } - if ( $textMatches && !$textStatus ) { + + if ( $textMatches ) { // output appropriate heading if ( $numTextMatches > 0 && $numTitleMatches > 0 ) { $out->addHTML( '' ); @@ -413,7 +422,7 @@ $textMatches->hasInterwikiResults( SearchResultSet::INLINE_RESULTS ); if ( $num === 0 ) { - if ( $textStatus ) { + if ( !$textStatus->isOK() ) { $out->addHTML( '' . $textStatus->getMessage( 'search-error' ) . '' ); } else { -- To view, visit https://gerrit.wikimedia.org/r/320551 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5e0db727790f4fd189caa54ea5f01672d6a8ea4 Gerrit-PatchSet: 1 Gerrit-Project:
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Rename methods used for setting up multiple edit tabs
jenkins-bot has submitted this change and it was merged. Change subject: Rename methods used for setting up multiple edit tabs .. Rename methods used for setting up multiple edit tabs Change-Id: I71d6dd0848e9cc3ee8531b0b914c29219b4697bd --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Alex Monk: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js index 553d3e9..50d3c29 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js @@ -395,12 +395,12 @@ plugins.push( plugin ); }, - setupSkin: function () { - init.setupTabs(); - init.setupSectionLinks(); + setupMultiTabSkin: function () { + init.setupMultiTabs(); + init.setupMultiSectionLinks(); }, - setupTabs: function () { + setupMultiTabs: function () { var caVeEdit, action = pageExists ? 'edit' : 'create', pTabsId = $( '#p-views' ).length ? 'p-views' : 'p-cactions', @@ -498,7 +498,7 @@ } }, - setupSectionLinks: function () { + setupMultiSectionLinks: function () { var $editsections = $( '#mw-content-text .mw-editsection' ), bodyDir = $( 'body' ).css( 'direction' ); @@ -1008,7 +1008,7 @@ // … on two-edit-tab wikis, or single-edit-tab wikis, where the user wants both … if ( !conf.singleEditTab || tabPreference === 'multi-tab' ) { // … set the skin up with both tabs and both section edit links. - init.setupSkin(); + init.setupMultiTabSkin(); } else if ( pageCanLoadEditor && ( ( init.isVisualAvailable && isOnlyTabVE() ) || -- To view, visit https://gerrit.wikimedia.org/r/320383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71d6dd0848e9cc3ee8531b0b914c29219b4697bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Always use parse in Message::__toString()
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/320550 Change subject: Always use parse in Message::__toString() .. Always use parse in Message::__toString() Bug: T146416 Change-Id: Ia9b2a1dcf09d52348b2c6d8299fd849b809f6e74 --- M includes/Message.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/320550/1 diff --git a/includes/Message.php b/includes/Message.php index c1a12aa..e177858 100644 --- a/includes/Message.php +++ b/includes/Message.php @@ -853,9 +853,10 @@ */ public function __toString() { if ( $this->format !== 'parse' ) { - $ex = new LogicException( __METHOD__ . ' using implicit format: ' . $this->format ); + $ex = new LogicException( __METHOD__ . ' ignoring implicit format: ' . $this->format ); \MediaWiki\Logger\LoggerFactory::getInstance( 'message-format' )->warning( $ex->getMessage(), [ 'exception' => $ex, 'format' => $this->format, 'key' => $this->key ] ); + $this->format = 'parse'; } // PHP doesn't allow __toString to throw exceptions and will -- To view, visit https://gerrit.wikimedia.org/r/320550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9b2a1dcf09d52348b2c6d8299fd849b809f6e74 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::mediawiki::jobrunner: Restrict to domain networks
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/320549 Change subject: role::mediawiki::jobrunner: Restrict to domain networks .. role::mediawiki::jobrunner: Restrict to domain networks We're getting rid of $INTERNAL, since it's needlessly broad. Use $DOMAIN_NETWORKS to restrict access in production to production networks, while still allowing using it in labs. Change-Id: I9921adc40c5fc0247f0d32c54fff2c59927b786b --- M modules/role/manifests/mediawiki/jobrunner.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/320549/1 diff --git a/modules/role/manifests/mediawiki/jobrunner.pp b/modules/role/manifests/mediawiki/jobrunner.pp index 74f6c44..686a09e 100644 --- a/modules/role/manifests/mediawiki/jobrunner.pp +++ b/modules/role/manifests/mediawiki/jobrunner.pp @@ -24,6 +24,6 @@ proto => 'tcp', port=> $::mediawiki::jobrunner::port, notrack => true, -srange => '$INTERNAL', +srange => '$DOMAIN_NETWORKS', } } -- To view, visit https://gerrit.wikimedia.org/r/320549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9921adc40c5fc0247f0d32c54fff2c59927b786b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add 'message-format' log channel"
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/320548 Change subject: Revert "Add 'message-format' log channel" .. Revert "Add 'message-format' log channel" It has done its job. This reverts commit bc1d4253bd22d052d8a97804748a03bebbf6f2ba. Bug: T146416 Change-Id: I0d2fd00e431b1503513b6051adbf9617e1ded6e2 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/48/320548/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4cee04a..4a53047 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4562,7 +4562,6 @@ 'MassMessage' => 'debug', // for 59464 -legoktm 2013/12/15 'Math' => 'info', // mobrovac for T121445 'memcached' => 'error', // -aaron 2012/10/24 - 'message-format' => [ 'logstash' => 'warning' ], 'mobile' => 'debug', 'NewUserMessage' => 'debug', 'oai' => 'debug', -- To view, visit https://gerrit.wikimedia.org/r/320548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d2fd00e431b1503513b6051adbf9617e1ded6e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Revert "Use display name in category page subheadings if pro...
jenkins-bot has submitted this change and it was merged. Change subject: Revert "Use display name in category page subheadings if provided" .. Revert "Use display name in category page subheadings if provided" This reverts commit 8ccde8984913896d59a3c2b529768cfe74100afd. For the reason, see T43720#2531092 Bug: T149510 Change-Id: Id1ace9599642a36b333c63eaeebab0537466e7bd (cherry picked from commit 59280c4c929dc9c073e48879d3d44d5e55499c1c) --- M includes/CategoryViewer.php 1 file changed, 6 insertions(+), 19 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php index c858dd7..b95f274 100644 --- a/includes/CategoryViewer.php +++ b/includes/CategoryViewer.php @@ -423,25 +423,10 @@ } /** -* Return pretty name which is display name if given and different from prefix text or -* the unprefixed page name. -* -* @return string HTML safe name. -*/ - function getPrettyPageNameHtml() { - $displayTitle = $this->getOutput()->getPageTitle(); - if ( $displayTitle === $this->getTitle()->getPrefixedText() ) { - return htmlspecialchars( $this->getTitle()->getText() ); - } else { - return $displayTitle; - } - } - - /** * @return string */ function getPagesSection() { - $name = $this->getPrettyPageNameHtml(); + $ti = wfEscapeWikiText( $this->title->getText() ); # Don't show articles section if there are none. $r = ''; @@ -457,7 +442,7 @@ if ( $rescnt > 0 ) { $r = "\n"; - $r .= '' . $this->msg( 'category_header' )->rawParams( $name )->parse() . "\n"; + $r .= '' . $this->msg( 'category_header', $ti )->parse() . "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'page' ); $r .= $this->formatList( $this->articles, $this->articles_start_char ); @@ -471,7 +456,6 @@ * @return string */ function getImageSection() { - $name = $this->getPrettyPageNameHtml(); $r = ''; $rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery ); $dbcnt = $this->cat->getFileCount(); @@ -481,7 +465,10 @@ if ( $rescnt > 0 ) { $r .= "\n"; $r .= '' . - $this->msg( 'category-media-header' )->rawParams( $name )->parse() . + $this->msg( + 'category-media-header', + wfEscapeWikiText( $this->title->getText() ) + )->text() . "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'file' ); -- To view, visit https://gerrit.wikimedia.org/r/320544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1ace9599642a36b333c63eaeebab0537466e7bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Liuxinyu970226 <541329...@qq.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] operations/puppet[production]: role::jsbench: Restrict to production networks
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/320547 Change subject: role::jsbench: Restrict to production networks .. role::jsbench: Restrict to production networks We're getting rid of $INTERNAL, since it's needlessly broad. xvfb is only accessed from production hosts for debugging, so restrict it to production networks. Change-Id: I0a209f803b21d666c8f378c38aa9501a48952230 --- M modules/role/manifests/jsbench.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/47/320547/1 diff --git a/modules/role/manifests/jsbench.pp b/modules/role/manifests/jsbench.pp index 5dbd87d..5a67a90 100644 --- a/modules/role/manifests/jsbench.pp +++ b/modules/role/manifests/jsbench.pp @@ -30,7 +30,7 @@ ferm::service { 've-xvfb': proto => 'tcp', port => '6099', -srange => '$INTERNAL', +srange => '$PRODUCTION_NETWORKS', } user { 'jsbench': -- To view, visit https://gerrit.wikimedia.org/r/320547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a209f803b21d666c8f378c38aa9501a48952230 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CologneBlue[master]: Remove unnecessary z-index on the sidebar
jenkins-bot has submitted this change and it was merged. Change subject: Remove unnecessary z-index on the sidebar .. Remove unnecessary z-index on the sidebar It's not needed here at all, and it causes the sidebar to overlap OOjs UI dialogs. Bug: T150149 Change-Id: Ifafdc06c10ea3cec77ee6e6752053024cc5bc498 --- M resources/screen.css 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: JGirault: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/screen.css b/resources/screen.css index 7bc3c3d..cd5d76d 100644 --- a/resources/screen.css +++ b/resources/screen.css @@ -33,7 +33,6 @@ top: 18ex; padding: 2px; visibility: visible; - z-index: 99; } #article, #article td, #article th, #article p { -- To view, visit https://gerrit.wikimedia.org/r/320353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifafdc06c10ea3cec77ee6e6752053024cc5bc498 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/skins/CologneBlue Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: JGirault Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[REL1_28]: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69
Bartosz Dziewoński has submitted this change and it was merged. Change subject: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 .. Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 Lack of this patch here is currently causing tests for everything to fail. Sorry… Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d (cherry picked from commit a4eb9d749ee5ab6dbdeed6e74645caa53aeb5c10) --- M extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bartosz Dziewoński: Verified; Looks good to me, approved diff --git a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[REL1_28]: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320546 Change subject: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 .. Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 Lack of this patch here is currently causing tests for everything to fail. Sorry… Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d (cherry picked from commit a4eb9d749ee5ab6dbdeed6e74645caa53aeb5c10) --- M extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/46/320546/1 diff --git a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::mariadb::sanitarium: Restrict to production networks
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/320545 Change subject: role::mariadb::sanitarium: Restrict to production networks .. role::mariadb::sanitarium: Restrict to production networks We're getting rid of $INTERNAL, since it's needlessly broad. Restrict to production networks instead. Change-Id: Ie00990d7a28cab0afb9d89c79ee625a7ac937655 --- M modules/role/manifests/mariadb.pp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/320545/1 diff --git a/modules/role/manifests/mariadb.pp b/modules/role/manifests/mariadb.pp index 766e100..c6596b5 100644 --- a/modules/role/manifests/mariadb.pp +++ b/modules/role/manifests/mariadb.pp @@ -713,19 +713,19 @@ ferm::service { 'mysqld_sanitarium': proto => 'tcp', port => '3311:3317', -srange => '$INTERNAL', +srange => '$PRODUCTION_NETWORKS', } ferm::service { 'gmond_udp': proto => 'udp', port => '8649', -srange => '$INTERNAL', +srange => '$PRODUCTION_NETWORKS', } ferm::service { 'gmond_tcp': proto => 'tcp', port => '8649', -srange => '$INTERNAL', +srange => '$PRODUCTION_NETWORKS', } # One instance per shard using mysqld_multi. -- To view, visit https://gerrit.wikimedia.org/r/320545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie00990d7a28cab0afb9d89c79ee625a7ac937655 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.18.0
jenkins-bot has submitted this change and it was merged. Change subject: Tag v0.18.0 .. Tag v0.18.0 Change-Id: I779c1b71b3e868093e3444b3f7d4971b8b0616cf --- M History.md M package.json 2 files changed, 76 insertions(+), 1 deletion(-) Approvals: VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/History.md b/History.md index f1c1e3c..07695a5 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,79 @@ # OOjs UI Release History +## v0.18.0 / 2016-11-08 +### Breaking changes +* [BREAKING CHANGE] ComboBoxWidget: Remove this deprecated alias for ComboBoxInputWidget (James D. Forrester) +* [BREAKING CHANGE] core: Remove {add|remove}CaptureEventListener (James D. Forrester) +* [BREAKING CHANGE] icons: Remove deprecated alias 'photoGallery' (Ed Sanders) +* [BREAKING CHANGE] InputWidget: Remove deprecated #setRTL function (James D. Forrester) +* [BREAKING CHANGE] MediaWiki theme: Remove deprecated `constructive` variables (Volker E) +* [BREAKING CHANGE] TextInputWidget: remove isValid() method, deprecated since v0.12.3 (Ricordisamoa) + +### Deprecations +* [DEPRECATING CHANGE] Break out parts of TextInputWidget into a new SearchInputWidget (Prateek Saxena) + +### Features +* ButtonElement: Add `role="button"` only when needed (Prateek Saxena) +* ButtonWidget: Remove code to not let the button get focus after clicking (Prateek Saxena) +* CapsuleMultiselectWidget: Add placeholder option (Prateek Saxena) +* CapsuleMultiselectWidget: Don't discard current input value when editing an item (Bartosz Dziewoński) +* ComboBoxInputWidget: Hide dropdown indicator when there is no dropdown (Volker E) +* TextInputWidget: Add methods #setRequired / #isRequired (Bartosz Dziewoński) +* TextInputWidget: Allow type="month" (Geoffrey Mon) +* WindowManager: Add a $returnFocusTo property (Prateek Saxena) +* Add OO.ui.warnDeprecation method (Prateek Saxena) + +### Styles +* ButtonElement: Normalize `:focus` appearance in Firefox (Volker E) +* ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-active` (Volker E) +* CapsuleItemWidget: Make interactivity of label clearer (Volker E) +* ComboBoxInputWidget: Align to design specification (Volker E) +* FieldsetLayout: Styling fixes for `` labels (Bartosz Dziewoński) +* FieldsetLayout: Work around positioning problems in Firefox (Bartosz Dziewoński) +* PopupToolGroup: Fix border colour (Ed Sanders) +* MessageDialog: Improve `-actions` buttons by resetting `border-radius` (Volker E) +* SelectFileWidget: Don't show action-indicating cursor on empty state (Volker E) +* MediaWiki theme: Fix border colours in toolbar (Ed Sanders) +* MediaWiki theme: Address subpixel rendering errors in buttoned widgets (Volker E) +* MediaWiki theme: Align readonly TextInputWidget to overhauled color palette (Volker E) +* MediaWiki theme: Fix `:hover` in ComboBoxInput- & CapsuleMultiselectWidget (Volker E) +* MediaWiki theme: Fix ButtonElement's `:active:focus` state visually (Volker E) +* MediaWiki theme: Fix FieldsetLayouts' icon position (Volker E) +* MediaWiki theme: Fix SelectFileWidget's label visibility in IE11 (Volker E) +* MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:active` state (Volker E) +* MediaWiki theme: Fix visual glitch on `:active:focus` widgets state (Volker E) +* MediaWiki theme: Fix wrong colored `box-shadow` on ToggleSwitchWidget (Volker E) +* MediaWiki theme: Make colors follow color palette (Volker E) +* MediaWiki theme: Make placeholder follow WCAG 2.0 level AA contrast ratio (Volker E) +* MediaWiki theme: Replace abandoned color from early palette iteration (Volker E) +* MediaWiki theme: Use `@color-progressive` for progress bar (Volker E) +* MediaWiki theme: Use `color-progressive` for switched-on binary inputs (Volker E) +* icons: Replace bigger/smaller with more obvious forms (Ed Sanders) + +### Code +* CapsuleMultiSelectWidget: Always keep input as wide as placeholder text (Prateek Saxena) +* CapsuleMultiselectWidget: Fix crash on right-click when no input (Moriel Schottlender) +* OutlineOptionWidget: Follow-up de9058299f: don't duplicate parent's logic (Roan Kattouw) +* Toolbar: Defer computation of the narrow threshold (Roan Kattouw) +* Window: Update `-content` CSS so that child elements can give it focus (Prateek Saxena) +* Window#withoutSizeTransitions: Build transition property using sub-properties (Prateek Saxena) +* WindowManager: Warn if .static.name is not defined when adding a window (Bartosz Dziewoński) +* Tag: Generate valid HTML for self-closing tags (Bartosz Dziewoński) +* OO.ui.warnDeprecation: Fix how we use getProp (Prateek Saxena) +* MediaWiki theme: Add W3C Standards Notation for placeholder pseudo class (Volker E) +* MediaWiki theme: Clarify usage of `@max-width-*` Less variables (Volker E) +* MediaWiki theme: Refactor z-index inside ButtonSelectWidget/ButtonGroupWidget (Bartosz Dziewoński) +* demo: Add
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Revert "Use display name in category page subheadings if pro...
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320544 Change subject: Revert "Use display name in category page subheadings if provided" .. Revert "Use display name in category page subheadings if provided" This reverts commit 8ccde8984913896d59a3c2b529768cfe74100afd. For the reason, see T43720#2531092 Bug: T149510 Change-Id: Id1ace9599642a36b333c63eaeebab0537466e7bd (cherry picked from commit 59280c4c929dc9c073e48879d3d44d5e55499c1c) --- M includes/CategoryViewer.php 1 file changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/320544/1 diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php index c858dd7..b95f274 100644 --- a/includes/CategoryViewer.php +++ b/includes/CategoryViewer.php @@ -423,25 +423,10 @@ } /** -* Return pretty name which is display name if given and different from prefix text or -* the unprefixed page name. -* -* @return string HTML safe name. -*/ - function getPrettyPageNameHtml() { - $displayTitle = $this->getOutput()->getPageTitle(); - if ( $displayTitle === $this->getTitle()->getPrefixedText() ) { - return htmlspecialchars( $this->getTitle()->getText() ); - } else { - return $displayTitle; - } - } - - /** * @return string */ function getPagesSection() { - $name = $this->getPrettyPageNameHtml(); + $ti = wfEscapeWikiText( $this->title->getText() ); # Don't show articles section if there are none. $r = ''; @@ -457,7 +442,7 @@ if ( $rescnt > 0 ) { $r = "\n"; - $r .= '' . $this->msg( 'category_header' )->rawParams( $name )->parse() . "\n"; + $r .= '' . $this->msg( 'category_header', $ti )->parse() . "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'page' ); $r .= $this->formatList( $this->articles, $this->articles_start_char ); @@ -471,7 +456,6 @@ * @return string */ function getImageSection() { - $name = $this->getPrettyPageNameHtml(); $r = ''; $rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery ); $dbcnt = $this->cat->getFileCount(); @@ -481,7 +465,10 @@ if ( $rescnt > 0 ) { $r .= "\n"; $r .= '' . - $this->msg( 'category-media-header' )->rawParams( $name )->parse() . + $this->msg( + 'category-media-header', + wfEscapeWikiText( $this->title->getText() ) + )->text() . "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'file' ); -- To view, visit https://gerrit.wikimedia.org/r/320544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1ace9599642a36b333c63eaeebab0537466e7bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Liuxinyu970226 <541329...@qq.com> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Use display name in category page subheadings if pro...
jenkins-bot has submitted this change and it was merged. Change subject: Revert "Use display name in category page subheadings if provided" .. Revert "Use display name in category page subheadings if provided" This reverts commit 8ccde8984913896d59a3c2b529768cfe74100afd. For the reason, see T43720#2531092 Bug: T149510 Change-Id: Id1ace9599642a36b333c63eaeebab0537466e7bd --- M includes/CategoryViewer.php 1 file changed, 6 insertions(+), 19 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved Liuxinyu970226: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php index 490f548..8dd3f5c 100644 --- a/includes/CategoryViewer.php +++ b/includes/CategoryViewer.php @@ -408,25 +408,10 @@ } /** -* Return pretty name which is display name if given and different from prefix text or -* the unprefixed page name. -* -* @return string HTML safe name. -*/ - function getPrettyPageNameHtml() { - $displayTitle = $this->getOutput()->getPageTitle(); - if ( $displayTitle === $this->getTitle()->getPrefixedText() ) { - return htmlspecialchars( $this->getTitle()->getText() ); - } else { - return $displayTitle; - } - } - - /** * @return string */ function getPagesSection() { - $name = $this->getPrettyPageNameHtml(); + $ti = wfEscapeWikiText( $this->title->getText() ); # Don't show articles section if there are none. $r = ''; @@ -442,7 +427,7 @@ if ( $rescnt > 0 ) { $r = "\n"; - $r .= '' . $this->msg( 'category_header' )->rawParams( $name )->parse() . "\n"; + $r .= '' . $this->msg( 'category_header', $ti )->parse() . "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'page' ); $r .= $this->formatList( $this->articles, $this->articles_start_char ); @@ -456,7 +441,6 @@ * @return string */ function getImageSection() { - $name = $this->getPrettyPageNameHtml(); $r = ''; $rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery ); $dbcnt = $this->cat->getFileCount(); @@ -466,7 +450,10 @@ if ( $rescnt > 0 ) { $r .= "\n"; $r .= '' . - $this->msg( 'category-media-header' )->rawParams( $name )->parse() . + $this->msg( + 'category-media-header', + wfEscapeWikiText( $this->title->getText() ) + )->text() . "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'file' ); -- To view, visit https://gerrit.wikimedia.org/r/305432 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1ace9599642a36b333c63eaeebab0537466e7bd Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Liuxinyu970226 <541329...@qq.com> Gerrit-Reviewer: 20after4Gerrit-Reviewer: Antigng <1400011...@pku.edu.cn> Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Liuxinyu970226 <541329...@qq.com> Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Patrick87 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace NullValue with @TestedOnBool
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: replace NullValue with @TestedOnBool .. Hygiene: replace NullValue with @TestedOnBool Change-Id: I5737dd765f8d0ba3726006f7a26079cef34a0e64 --- M app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java M app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java M app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java M app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java M app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java M app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java D app/src/androidTest/java/org/wikipedia/test/view/NullValue.java M app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java 8 files changed, 29 insertions(+), 48 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java index d58358d..e6b8fa9 100644 --- a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java +++ b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java @@ -1,13 +1,10 @@ package android.support.design.widget; -import android.support.annotation.NonNull; - import org.junit.Before; import org.junit.experimental.theories.Theory; import org.wikipedia.test.theories.TestedOnBool; import org.wikipedia.test.view.FontScale; import org.wikipedia.test.view.LayoutDirection; -import org.wikipedia.test.view.NullValue; import org.wikipedia.test.view.ViewTest; import org.wikipedia.theme.Theme; @@ -33,9 +30,9 @@ assertThat(subject.isPasswordVisible(), is(visible)); } -@Theory public void testSetOnShowPasswordListener(@NonNull NullValue nul, +@Theory public void testSetOnShowPasswordListener(@TestedOnBool boolean nul, @TestedOnBool boolean visible) { -OnShowPasswordClickListener listener = nul.isNull() ? null : mock(OnShowPasswordClickListener.class); +OnShowPasswordClickListener listener = nul ? null : mock(OnShowPasswordClickListener.class); if (visible) { subject.passwordVisibilityToggleRequested(); } diff --git a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java index 99b466b..60990d4 100644 --- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java +++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java @@ -76,16 +76,16 @@ } // todo: how can we test popupmenu which requires an activity? -//@Theory public void testSetCallback(@NonNull NullValue nullCallback, -//@NonNull NullValue nullCard) { +//@Theory public void testSetCallback(@TestedOnBool boolean nullCallback, +//@TestedOnBool boolean nullCard) { //setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, Theme.LIGHT, //PrimaryTestImg.NONNULL, PrimaryTestStr.SHORT, SecondaryTestStr.SHORT, BLUE); // -//Card card = nullCard.isNull() ? null : mock(Card.class); -//if (card != null) { +//Card card = nullCard ? null : mock(Card.class); +//if (card != null) { //subject.setCard(card); //} -//Callback callback = nullCallback.isNull() ? null : mock(Callback.class); +//Callback callback = nullCallback ? null : mock(Callback.class); //subject.setCallback(callback); //clickMenu(); //if (callback != null) { diff --git a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java index 2ea1fb0..c7173c8 100644 --- a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java +++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java @@ -7,9 +7,9 @@ import org.junit.experimental.theories.Theory; import org.junit.experimental.theories.suppliers.TestedOn; import org.wikipedia.R; +import org.wikipedia.test.theories.TestedOnBool; import org.wikipedia.test.view.FontScale; import org.wikipedia.test.view.LayoutDirection; -import org.wikipedia.test.view.NullValue; import org.wikipedia.test.view.PrimaryTestImg; import org.wikipedia.test.view.PrimaryTestStr; import org.wikipedia.test.view.SecondaryTestImg; @@ -66,11 +66,11 @@ assertText(subject, R.id.view_card_header_large_title, text); } -@Theory public void testOnClickListener(@NonNull NullValue nul) { +@Theory
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix PasswordTextInput's EditText RTL layout
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/320542 Change subject: Fix PasswordTextInput's EditText RTL layout .. Fix PasswordTextInput's EditText RTL layout Align password entry to the right in right to left languages. The hint does not appear to be adjustable[0]. [0] https://code.google.com/p/android/issues/detail?id=182155 Change-Id: Idf5d524cebdcb1bbab4fa90f6bd3dd1e8eb60084 --- M app/src/main/res/layout/view_password_text_input.xml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/42/320542/1 diff --git a/app/src/main/res/layout/view_password_text_input.xml b/app/src/main/res/layout/view_password_text_input.xml index 9b57e85..b2c7fb7 100644 --- a/app/src/main/res/layout/view_password_text_input.xml +++ b/app/src/main/res/layout/view_password_text_input.xml @@ -6,5 +6,7 @@ android:layout_height="wrap_content" android:inputType="textPassword" android:imeOptions="flagNoExtractUi" +android:textAlignment="viewStart" +android:gravity="start" android:maxLines="1" /> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/320542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf5d524cebdcb1bbab4fa90f6bd3dd1e8eb60084 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Adding help command to grrrit-wm
Zppix has uploaded a new change for review. https://gerrit.wikimedia.org/r/320541 Change subject: Adding help command to grrrit-wm .. Adding help command to grrrit-wm Change-Id: I9caf7978d0346e698de79b1aa047bb1a9c5c4e98 --- M src/relay.js 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit refs/changes/41/320541/1 diff --git a/src/relay.js b/src/relay.js index ccbfea4..4eb602a 100644 --- a/src/relay.js +++ b/src/relay.js @@ -261,5 +261,8 @@ ) { ircClient.say(to, "Permission is denied."); } -}); + if (text.indexOf(ircClient.nick + ': ' + 'help') === 0) { +ircClient.send('to', 'My current commands are: ' + ircClient.nick + ': restart', ircClient.nick + ': force-restart', ' and ' ircClient.nick + ': nick'); +} + }); }); -- To view, visit https://gerrit.wikimedia.org/r/320541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9caf7978d0346e698de79b1aa047bb1a9c5c4e98 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: Zppix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.18.0
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/320540 Change subject: Tag v0.18.0 .. Tag v0.18.0 Change-Id: I779c1b71b3e868093e3444b3f7d4971b8b0616cf --- M History.md M package.json 2 files changed, 76 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/320540/1 diff --git a/History.md b/History.md index f1c1e3c..07695a5 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,79 @@ # OOjs UI Release History +## v0.18.0 / 2016-11-08 +### Breaking changes +* [BREAKING CHANGE] ComboBoxWidget: Remove this deprecated alias for ComboBoxInputWidget (James D. Forrester) +* [BREAKING CHANGE] core: Remove {add|remove}CaptureEventListener (James D. Forrester) +* [BREAKING CHANGE] icons: Remove deprecated alias 'photoGallery' (Ed Sanders) +* [BREAKING CHANGE] InputWidget: Remove deprecated #setRTL function (James D. Forrester) +* [BREAKING CHANGE] MediaWiki theme: Remove deprecated `constructive` variables (Volker E) +* [BREAKING CHANGE] TextInputWidget: remove isValid() method, deprecated since v0.12.3 (Ricordisamoa) + +### Deprecations +* [DEPRECATING CHANGE] Break out parts of TextInputWidget into a new SearchInputWidget (Prateek Saxena) + +### Features +* ButtonElement: Add `role="button"` only when needed (Prateek Saxena) +* ButtonWidget: Remove code to not let the button get focus after clicking (Prateek Saxena) +* CapsuleMultiselectWidget: Add placeholder option (Prateek Saxena) +* CapsuleMultiselectWidget: Don't discard current input value when editing an item (Bartosz Dziewoński) +* ComboBoxInputWidget: Hide dropdown indicator when there is no dropdown (Volker E) +* TextInputWidget: Add methods #setRequired / #isRequired (Bartosz Dziewoński) +* TextInputWidget: Allow type="month" (Geoffrey Mon) +* WindowManager: Add a $returnFocusTo property (Prateek Saxena) +* Add OO.ui.warnDeprecation method (Prateek Saxena) + +### Styles +* ButtonElement: Normalize `:focus` appearance in Firefox (Volker E) +* ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-active` (Volker E) +* CapsuleItemWidget: Make interactivity of label clearer (Volker E) +* ComboBoxInputWidget: Align to design specification (Volker E) +* FieldsetLayout: Styling fixes for `` labels (Bartosz Dziewoński) +* FieldsetLayout: Work around positioning problems in Firefox (Bartosz Dziewoński) +* PopupToolGroup: Fix border colour (Ed Sanders) +* MessageDialog: Improve `-actions` buttons by resetting `border-radius` (Volker E) +* SelectFileWidget: Don't show action-indicating cursor on empty state (Volker E) +* MediaWiki theme: Fix border colours in toolbar (Ed Sanders) +* MediaWiki theme: Address subpixel rendering errors in buttoned widgets (Volker E) +* MediaWiki theme: Align readonly TextInputWidget to overhauled color palette (Volker E) +* MediaWiki theme: Fix `:hover` in ComboBoxInput- & CapsuleMultiselectWidget (Volker E) +* MediaWiki theme: Fix ButtonElement's `:active:focus` state visually (Volker E) +* MediaWiki theme: Fix FieldsetLayouts' icon position (Volker E) +* MediaWiki theme: Fix SelectFileWidget's label visibility in IE11 (Volker E) +* MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:active` state (Volker E) +* MediaWiki theme: Fix visual glitch on `:active:focus` widgets state (Volker E) +* MediaWiki theme: Fix wrong colored `box-shadow` on ToggleSwitchWidget (Volker E) +* MediaWiki theme: Make colors follow color palette (Volker E) +* MediaWiki theme: Make placeholder follow WCAG 2.0 level AA contrast ratio (Volker E) +* MediaWiki theme: Replace abandoned color from early palette iteration (Volker E) +* MediaWiki theme: Use `@color-progressive` for progress bar (Volker E) +* MediaWiki theme: Use `color-progressive` for switched-on binary inputs (Volker E) +* icons: Replace bigger/smaller with more obvious forms (Ed Sanders) + +### Code +* CapsuleMultiSelectWidget: Always keep input as wide as placeholder text (Prateek Saxena) +* CapsuleMultiselectWidget: Fix crash on right-click when no input (Moriel Schottlender) +* OutlineOptionWidget: Follow-up de9058299f: don't duplicate parent's logic (Roan Kattouw) +* Toolbar: Defer computation of the narrow threshold (Roan Kattouw) +* Window: Update `-content` CSS so that child elements can give it focus (Prateek Saxena) +* Window#withoutSizeTransitions: Build transition property using sub-properties (Prateek Saxena) +* WindowManager: Warn if .static.name is not defined when adding a window (Bartosz Dziewoński) +* Tag: Generate valid HTML for self-closing tags (Bartosz Dziewoński) +* OO.ui.warnDeprecation: Fix how we use getProp (Prateek Saxena) +* MediaWiki theme: Add W3C Standards Notation for placeholder pseudo class (Volker E) +* MediaWiki theme: Clarify usage of `@max-width-*` Less variables (Volker E) +* MediaWiki theme: Refactor z-index inside ButtonSelectWidget/ButtonGroupWidget (Bartosz
[MediaWiki-commits] [Gerrit] oojs/ui[master]: ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-...
jenkins-bot has submitted this change and it was merged. Change subject: ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-active` .. ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-active` Bringing `cursor` behaviour in alignment with ButtonSelect/OptionWidget as introduced in Ia8c782c99621b39e48d39d9a389bd024ae231062. Change-Id: Idc2ef8d98312b7182b903215986596f13a696411 --- M src/styles/widgets/ButtonGroupWidget.less 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/styles/widgets/ButtonGroupWidget.less b/src/styles/widgets/ButtonGroupWidget.less index eee220d..f1f3982 100644 --- a/src/styles/widgets/ButtonGroupWidget.less +++ b/src/styles/widgets/ButtonGroupWidget.less @@ -1,5 +1,9 @@ @import '../common'; .oo-ui-buttonGroupWidget { + .oo-ui-buttonElement-active .oo-ui-buttonElement-button { + cursor: default; + } + .theme-oo-ui-buttonGroupWidget(); } -- To view, visit https://gerrit.wikimedia.org/r/313640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc2ef8d98312b7182b903215986596f13a696411 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Jforrester Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69
Bartosz Dziewoński has submitted this change and it was merged. Change subject: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 .. Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 Lack of this patch here is currently causing tests for everything to fail. Sorry… Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d --- M extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bartosz Dziewoński: Verified; Looks good to me, approved diff --git a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320539 Change subject: Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 .. Update for 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69 Lack of this patch here is currently causing tests for everything to fail. Sorry… Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d --- M extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/39/320539/2 diff --git a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/extensions/Wikibase/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib72d5e4012d3c9a9b504331978be7567e1e9be5d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Remove hard coded grrrit-wm: irc command
jenkins-bot has submitted this change and it was merged. Change subject: Remove hard coded grrrit-wm: irc command .. Remove hard coded grrrit-wm: irc command The irc command is based on the bot's nick now. Change-Id: I7f7c8d0e98941faf296ac5e79a6109a79d0749b1 --- M src/relay.js 1 file changed, 11 insertions(+), 17 deletions(-) Approvals: Paladox: Looks good to me, approved jenkins-bot: Verified diff --git a/src/relay.js b/src/relay.js index ccbfea4..341c027 100644 --- a/src/relay.js +++ b/src/relay.js @@ -192,10 +192,8 @@ ircClient.whois(from, function(info){ if ( - (text.indexOf(ircClient.nick + ': ' + 'restart') === 0 || - text.indexOf('grrrit-wm: restart') === 0 - ) && (whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + text.indexOf(ircClient.nick + ': ' + 'restart') === 0 && (whitelist_cloaks.indexOf(info.host) >= 0 || + whitelist_nicks.indexOf(from) >= 0) ) { console.log(from + ' => ' + to + ' ' + text); @@ -208,17 +206,15 @@ } ircClient.say(to, "reconnected to gerrit"); - } else if (text.indexOf('grrrit-wm: restart') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + } else if (text.indexOf(ircClient.nick + ': ' + 'restart') === 0 && + !(whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { ircClient.say(to, "Permission is denied."); } if ( - (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 || - text.indexOf('grrrit-wm: force-restart') === 0 - ) && (whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 && + (whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { console.log(from + ' => ' + to + ' ' + text); @@ -237,17 +233,15 @@ logging.info('re-connected to gerrit.'); setTimeout(function(){ ircClient.say(to, "re-connected to gerrit and irc."); }, 17000); - } else if (text.indexOf('grrrit-wm: force-restart') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + } else if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 && + !(whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { ircClient.say(to, "Permission is denied."); } if ( - (text.indexOf(ircClient.nick + ': ' + 'nick') === 0 || - text.indexOf('grrrit-wm: nick') === 0 - ) && (whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + text.indexOf(ircClient.nick + ': ' + 'nick') === 0 && (whitelist_cloaks.indexOf(info.host) >= 0 || + whitelist_nicks.indexOf(from) >= 0) ) { console.log(from + ' => ' + to + ' ' + text); @@ -256,7 +250,7 @@ ircClient.send('NICK', config.nick); logging.info('changed nick to' + config.nick); - } else if (text.indexOf('grrrit-wm: nick') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || + } else if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { ircClient.say(to, "Permission is denied."); -- To view, visit https://gerrit.wikimedia.org/r/320532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f7c8d0e98941faf296ac5e79a6109a79d0749b1 Gerrit-PatchSet: 3 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: MarkTraceur Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Paladox Gerrit-Reviewer: Zppix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Address subpixel rendering errors in button...
jenkins-bot has submitted this change and it was merged. Change subject: MediaWiki theme: Address subpixel rendering errors in buttoned widgets .. MediaWiki theme: Address subpixel rendering errors in buttoned widgets Adressing subpixel rendering errors in browsers due to `em` to pixel conversion of relative CSS units by specify values that are translating to full pixels at base `font-size`. Affected widgets are NumberInput-, ComboBoxInput-, Dropdown- and SelectFileWidget. Introducing several Less variables for DRY purposes and clarifying calculation of variable values. Bug: T102127 Bug: T142110 Change-Id: I1ecbf767a598704c3913d8853a458f0fe526f5d1 --- M src/themes/mediawiki/common.less M src/themes/mediawiki/elements.less M src/themes/mediawiki/widgets.less 3 files changed, 26 insertions(+), 13 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less index aff7fe5..ec7d6a7 100644 --- a/src/themes/mediawiki/common.less +++ b/src/themes/mediawiki/common.less @@ -1,6 +1,8 @@ // Theme variables @oo-ui-default-image-path: 'themes/mediawiki/images'; +@oo-ui-font-size-browser: 16; // assumed browser default of `16px` +@oo-ui-font-size-default: 0.8em; // equals `12.8px` at browser default of `16px` @background-color-default: #fff; @background-color-default-hover: #eaecf0; @@ -59,10 +61,12 @@ @max-width-default: 50em; @max-width-input: @max-width-default; -@size-icon-min: 24px; +@size-default: 32 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // equals `2.5em`≈`32px` at base `font-size: 12.8px` +@size-button-default: @size-default; +@size-icon-min: 24px; // values used for `min-height` are defined in `px`, see T130691 @size-indicator-min: 12px; -@size-icon: unit( 24 / 16 / 0.8, em ); -@size-indicator: unit( 12 / 16 / 0.8, em ); +@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // equals `1.875em`≈`24px` at base `font-size: 12.8px` +@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // equals `0.9375em`≈`12px` at base `font-size: 12.8px` @size-toggleswitch-grip-min: 16px; @border-default: @border-width-default solid @border-color-default; @@ -88,6 +92,9 @@ @border-width-default: 1px; @border-width-medium: 2px; +@padding-widget-default: 7 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // equals `0.547em`≈`7px` at base `font-size: 12.8px` +@padding-top-input-text: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // equals `0.625em`≈`8px` at base `font-size: 12.8px` + @box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 ); @box-shadow-menu: @box-shadow-dialog; @box-shadow-active: inset 0 0 0 1px @color-progressive-active; diff --git a/src/themes/mediawiki/elements.less b/src/themes/mediawiki/elements.less index 04171b0..1db47ab 100644 --- a/src/themes/mediawiki/elements.less +++ b/src/themes/mediawiki/elements.less @@ -164,8 +164,8 @@ } > .oo-ui-buttonElement-button { - padding: 0.5em 1em; - min-height: 1.2em; + padding: @padding-widget-default 1em; + min-height: 1.25em; min-width: 1em; border-radius: @border-radius-default; position: relative; @@ -174,7 +174,7 @@ // Support `` from ButtonInputWidget > input.oo-ui-buttonElement-button, &.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - line-height: 1.2; + line-height: 1.25; // same as `min-height` in `-button` above } &.oo-ui-iconElement { diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 3753f7a..34a906b 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -127,8 +127,8 @@ .oo-ui-inline-spacing( 0.5em ); &-handle { - padding: 0.5em 0; - height: 2.275em; + padding: @padding-widget-default 0; + height: @size-default; line-height: 1.275; border: @border-default; border-radius: @border-radius-default; @@ -700,7 +700,6 @@ input, textarea { - padding: 0.5em; margin: 0; font-size: inherit; font-family: inherit; @@ -708,6 +707,11 @@ color: @color-emphasized; border: @border-default; border-radius: @border-radius-default; + padding: @padding-top-input-text @padding-widget-default @padding-widget-default; + } + + input { + line-height: 1.172em; // Firefox needs a value, Chrome the
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Gracefully handle broken ExternalData groups, by not crashin...
JGirault has uploaded a new change for review. https://gerrit.wikimedia.org/r/320538 Change subject: Gracefully handle broken ExternalData groups, by not crashing and displaying a user-friendly warning .. Gracefully handle broken ExternalData groups, by not crashing and displaying a user-friendly warning Bug: T148883 Change-Id: I681561e148d3c4a0cdaa9897e8891f4652cb5477 --- M extension.json M i18n/en.json M i18n/qqq.json M modules/box/Map.js M styles/images/COPYING A styles/images/alert.png A styles/images/alert.svg M styles/kartographer.less 8 files changed, 115 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/38/320538/1 diff --git a/extension.json b/extension.json index 6b2729d..7687ff8 100644 --- a/extension.json +++ b/extension.json @@ -188,7 +188,8 @@ "modules/box/index.js" ], "messages": [ - "kartographer-attribution" + "kartographer-attribution", + "kartographer-error-loadgroups" ], "targets": [ "mobile", diff --git a/i18n/en.json b/i18n/en.json index 193add7..eaef032 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -23,6 +23,7 @@ "kartographer-error-context": "$1: $2", "kartographer-error-context-multi": "$1 problems:\n$2", "kartographer-error-json": "Couldn't parse JSON: $1", + "kartographer-error-loadgroups": "An issue happened while loading map data.", "kartographer-error-missing-attr": "Attribute \"$1\" is missing", "kartographer-error-bad_attr": "Attribute \"$1\" has an invalid value", "kartographer-error-bad_data": "The JSON content is not valid GeoJSON+simplestyle", diff --git a/i18n/qqq.json b/i18n/qqq.json index 06a721f..9a3e6de 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -27,6 +27,7 @@ "kartographer-error-context": "{{Optional}}\nGeneral message shown before a single specific error\n\nParameters:\n* $1 - tag name, 'mapframe' or 'maplink'\n* $2 - error message", "kartographer-error-context-multi": "General message shown before multiple errors\n\nParameters:\n* $1 - tag name, 'mapframe', 'maplink' or 'mapdata'\n* $2 - list of errors combined into a bullet list", "kartographer-error-json": "Error message preceding JSON errors\nParameters: $1 - underlying message from JSON parser", + "kartographer-error-loadgroups": "Error message to warn the user that some map data is missing, because an error happened when loading map data.", "kartographer-error-missing-attr": "Error shown instead of a map when required parameter(s) is missing.\n\nParameters:\n* $1 - non-localized attribute name, such as 'height', 'latitude', etc", "kartographer-error-bad_attr": "Error shown instead of a map in case of a problem with parameters.\n\nParameters:\n* $1 - non-localized attribute name, such as 'height', 'latitude', etc", "kartographer-error-bad_data": "This error is shown if the content of the tag is syntactically valid JSON however it does not adhere to GeoJSON and simplestyle specifications", diff --git a/modules/box/Map.js b/modules/box/Map.js index 1fa5c9b..537179b 100644 --- a/modules/box/Map.js +++ b/modules/box/Map.js @@ -304,9 +304,19 @@ } else { ready(); } - } ).then( undefined, function ( err ) { - // console will catch this - throw err; + } ).then( undefined, function () { + // Handle failed groups gracefully. + var $errors = $( '' ), + $error = $( '' ) + .append( '' ) + .append( $( '' ).text( mw.msg( 'kartographer-error-loadgroups' ) ) ); + + map.$container + .append( $errors.append( $error ) ) + .one( 'click', function () { + $errors.remove(); + } ); + ready(); } ); }, @@ -378,11 +388,15 @@ } DataManager.loadGroups( dataGroups ).then( function ( dataGroups ) { - + var containsErrors = !dataGroups.length; $.each( dataGroups, function ( key, group ) { var layerOptions = {
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:a...
jenkins-bot has submitted this change and it was merged. Change subject: MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:active` state .. MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:active` state Fixing visual glitch in CheckboxInputWidget's `:active` state when unchecked. Follow-up to Id29445aa9ad976c09832d660e7a7f0bcbf4cbb67 Change-Id: Ic7f2c990d4c7d8600d5328c7c48295ec6cf709ad --- M src/themes/mediawiki/widgets.less 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 3753f7a..d4a8871 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -461,9 +461,11 @@ border-color: @color-progressive; } - &:active + span { + &:active + span, + &:active:focus + span { background-color: @color-progressive-active; border-color: @border-color-input-binary-active; + box-shadow: @box-shadow-active; } &:focus + span { -- To view, visit https://gerrit.wikimedia.org/r/320537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7f2c990d4c7d8600d5328c7c48295ec6cf709ad Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: operations/software/nginx: non voting debian glue
jenkins-bot has submitted this change and it was merged. Change subject: operations/software/nginx: non voting debian glue .. operations/software/nginx: non voting debian glue Change-Id: Iece8488454cff226a87d946dd6f2698d965708c1 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a79be25..1db5ee1 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2326,6 +2326,10 @@ template: - name: tox-jessie + - name: operations/software/nginx +test: + - debian-glue-non-voting + - name: operations/software/puppet-compiler template: - name: tox-jessie -- To view, visit https://gerrit.wikimedia.org/r/320536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iece8488454cff226a87d946dd6f2698d965708c1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: LinkAnnotationWidget: Don't use deprecated TextInputWidget#s...
jenkins-bot has submitted this change and it was merged. Change subject: LinkAnnotationWidget: Don't use deprecated TextInputWidget#setRTL .. LinkAnnotationWidget: Don't use deprecated TextInputWidget#setRTL Change-Id: Id4e5c66be97ea7bc660d33e413f53fc7d28f6536 --- M src/ui/widgets/ve.ui.LinkAnnotationWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js index 8d9786e..cbf5860 100644 --- a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js +++ b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js @@ -127,7 +127,7 @@ if ( $( 'body' ).hasClass( 'rtl' ) ) { isExt = ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( value.trim() ); // If URL is external, flip to LTR. Otherwise, set back to RTL - this.getTextInputWidget().setRTL( !isExt ); + this.getTextInputWidget().setDir( isExt ? 'ltr' : 'rtl' ); } this.getTextInputWidget().isValid().done( function ( valid ) { -- To view, visit https://gerrit.wikimedia.org/r/320530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4e5c66be97ea7bc660d33e413f53fc7d28f6536 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Esanders Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[REL1_28]: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606
jenkins-bot has submitted this change and it was merged. Change subject: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 .. ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 This way works with 0e15a606 and without it. Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Depends-On: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 (cherry picked from commit 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69) --- M client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Show MapPin icon next to all links
jenkins-bot has submitted this change and it was merged. Change subject: Show MapPin icon next to all links .. Show MapPin icon next to all links * VW maplinks with counter are not impacted by this change. * Provides an optional CSS class .no-icon to hide the icon easily. Bug: T145176 Change-Id: I29c3fcac94afcf862fb8da46f371a19abe1057a1 --- M extension.json A styles/images/COPYING A styles/images/mapPin-progressive.png A styles/images/mapPin-progressive.svg M styles/kartographer.less M styles/leaflet-overrides.less A styles/link.less 7 files changed, 164 insertions(+), 47 deletions(-) Approvals: MaxSem: Looks good to me, approved Yurik: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/extension.json b/extension.json index e505f93..6b2729d 100644 --- a/extension.json +++ b/extension.json @@ -55,6 +55,7 @@ "ext.kartographer.style": { "styles": [ "styles/kartographer.less", + "styles/link.less", "styles/dialog.less", "styles/control-attribution.less", "styles/control-scale.less", diff --git a/styles/images/COPYING b/styles/images/COPYING new file mode 100644 index 000..beb4377 --- /dev/null +++ b/styles/images/COPYING @@ -0,0 +1,8 @@ +=== mapPin-progressive.svg === +This icon file was copied from OOjs UI repository after the build process generated the progressive +icons. +The master version is: https://github.com/wikimedia/oojs-ui/blob/master/src/themes/mediawiki/images/icons/mapPin.svg + +=== mapPin-progressive.png === +Same as above, copied from OOjs UI repository after the build process generated the progressive +icons. diff --git a/styles/images/mapPin-progressive.png b/styles/images/mapPin-progressive.png new file mode 100644 index 000..c1676e6 --- /dev/null +++ b/styles/images/mapPin-progressive.png Binary files differ diff --git a/styles/images/mapPin-progressive.svg b/styles/images/mapPin-progressive.svg new file mode 100644 index 000..a9631cc --- /dev/null +++ b/styles/images/mapPin-progressive.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24">* { fill: #36c } + + diff --git a/styles/kartographer.less b/styles/kartographer.less index 9300ae0..2ff1141 100644 --- a/styles/kartographer.less +++ b/styles/kartographer.less @@ -1,4 +1,39 @@ -@import 'mediawiki.ui/variables'; +/** + * CSS Classes Definitions + * + * .mw-kartographer-maplink: + * Represents a element as output by the Parser. + * May or may not be an interactive link yet (meanwhile JS gets loaded). + * + * .mw-kartographer-map + *Represents a element as output by the Parser. + *May or may not be an interactive map yet (meanwhile JS gets loaded) + * + * .mw-kartographer-link + * Represents an interactive map link. + * The class is added when the element becomes an interactive link. + * May or may not be a or (if created via Developer API) + * + * .mw-kartographer-interactive + *Represents an interactive map. + *The class is added when the element becomes an interactive map. + * + * .mw-kartographer-mapDialog-map + *Represents an interactive map within a full screen map dialog. + * + * .mw-kartographer-static + *Represents an interactive map that was made static afterward because the + *viewport is too small. + * + * In practice: + * + * - will have .mw-kartographer-maplink first, + * .mw-kartographer-link then. + * + * - will have .mw-kartographer-map first, + *.mw-kartographer-link then, if displaying static snapshot. + *.mw-kartographer-interactive then, if directly interactive. + */ .mw-kartographer-mapDialog-map { position: absolute; @@ -12,34 +47,6 @@ .mw-kartographer-error { display: inline-block; background: #ffc0cb; -} - -a.mw-kartographer-link { - display: inline; - cursor: pointer; -} - -a.mw-kartographer-autostyled { - display: inline-block; - vertical-align: middle; - position: relative; - top: -0.08em; - box-sizing: content-box; - height: 0.85em; - padding: 0.24em 0.42em; - border-radius: 1px; - color: #fff; - font-weight: bold; - font-size: 0.85em; - line-height: 1; - text-align: center; -} -a.mw-kartographer-autostyled:visited { - color: #fff; -} - -.leaflet-bar a { - background-position: center center; } .mw-kartographer-static { @@ -81,24 +88,6 @@ top: 10px; right: 10px; margin-right: 0; -} - -.client-js .mw-kartographer-map { - cursor: pointer; -} - -.client-js .mw-kartographer-map:hover { - .mw-kartographer-fullScreen { - background-color:
[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectFileWidget: Don't show action-indicating cursor on emp...
jenkins-bot has submitted this change and it was merged. Change subject: SelectFileWidget: Don't show action-indicating cursor on empty state .. SelectFileWidget: Don't show action-indicating cursor on empty state Changing cursor on SelectFileWidget's `-empty` state to default in order to clearer indicate that the action is happening at the button. Change-Id: Iee3d200facd5f9088a3b1e380f157fe42120bb04 --- M src/styles/widgets/SelectFileWidget.less 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Prtksxna: Looks good to me, but someone else must approve Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/styles/widgets/SelectFileWidget.less b/src/styles/widgets/SelectFileWidget.less index 69fbf05..937459e 100644 --- a/src/styles/widgets/SelectFileWidget.less +++ b/src/styles/widgets/SelectFileWidget.less @@ -154,6 +154,10 @@ } &-empty.oo-ui-widget-enabled { + .oo-ui-selectFileWidget-label { + cursor: default; + } + .oo-ui-selectFileWidget-dropLabel { display: block; } -- To view, visit https://gerrit.wikimedia.org/r/317457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee3d200facd5f9088a3b1e380f157fe42120bb04 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:a...
VolkerE has uploaded a new change for review. https://gerrit.wikimedia.org/r/320537 Change subject: MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:active` state .. MediaWiki theme: Fix visual glitch CheckboxInputWidget's `:active` state Fixing visual glitch in CheckboxInputWidget's `:active` state when unchecked. Follow-up to Id29445aa9ad976c09832d660e7a7f0bcbf4cbb67 Change-Id: Ic7f2c990d4c7d8600d5328c7c48295ec6cf709ad --- M src/themes/mediawiki/widgets.less 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/37/320537/1 diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 3753f7a..d4a8871 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -461,9 +461,11 @@ border-color: @color-progressive; } - &:active + span { + &:active + span, + &:active:focus + span { background-color: @color-progressive-active; border-color: @border-color-input-binary-active; + box-shadow: @box-shadow-active; } &:focus + span { -- To view, visit https://gerrit.wikimedia.org/r/320537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7f2c990d4c7d8600d5328c7c48295ec6cf709ad Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] core: Remove {add|remove}CaptureEventListener
jenkins-bot has submitted this change and it was merged. Change subject: [BREAKING CHANGE] core: Remove {add|remove}CaptureEventListener .. [BREAKING CHANGE] core: Remove {add|remove}CaptureEventListener These were old proxies for node.{add|remove}EventListener and have been deprecated since 0.15.0. Change-Id: Ib89a40f4caa03102a133ad4a132f078ea9edf6d4 --- M src/core.js 1 file changed, 0 insertions(+), 24 deletions(-) Approvals: VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/src/core.js b/src/core.js index 623b991..cf7fd43 100644 --- a/src/core.js +++ b/src/core.js @@ -311,30 +311,6 @@ }; /** - * Proxy for `node.addEventListener( eventName, handler, true )`. - * - * @param {HTMLElement} node - * @param {string} eventName - * @param {Function} handler - * @deprecated since 0.15.0 - */ -OO.ui.addCaptureEventListener = function ( node, eventName, handler ) { - node.addEventListener( eventName, handler, true ); -}; - -/** - * Proxy for `node.removeEventListener( eventName, handler, true )`. - * - * @param {HTMLElement} node - * @param {string} eventName - * @param {Function} handler - * @deprecated since 0.15.0 - */ -OO.ui.removeCaptureEventListener = function ( node, eventName, handler ) { - node.removeEventListener( eventName, handler, true ); -}; - -/** * Reconstitute a JavaScript object corresponding to a widget created by * the PHP implementation. * -- To view, visit https://gerrit.wikimedia.org/r/320427 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib89a40f4caa03102a133ad4a132f078ea9edf6d4 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: operations/software/nginx: non voting debian glue
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/320536 Change subject: operations/software/nginx: non voting debian glue .. operations/software/nginx: non voting debian glue Change-Id: Iece8488454cff226a87d946dd6f2698d965708c1 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/36/320536/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a79be25..1db5ee1 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2326,6 +2326,10 @@ template: - name: tox-jessie + - name: operations/software/nginx +test: + - debian-glue-non-voting + - name: operations/software/puppet-compiler template: - name: tox-jessie -- To view, visit https://gerrit.wikimedia.org/r/320536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iece8488454cff226a87d946dd6f2698d965708c1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606
jenkins-bot has submitted this change and it was merged. Change subject: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 .. ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 This way works with 0e15a606 and without it. Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Depends-On: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 --- M client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Hoo man Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[REL1_28]: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320535 Change subject: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 .. ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 This way works with 0e15a606 and without it. Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Depends-On: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 (cherry picked from commit 24d367a4f2c7f9ac30d988f92aa5ad35a0582e69) --- M client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/35/320535/1 diff --git a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: REL1_28 Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Get mapdata from Gerrit
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/320534 Change subject: Get mapdata from Gerrit .. Get mapdata from Gerrit Also remove all leeway in mapbox.js version to avoid unexpected upgrades. There is a bit of silly mapbox noise if you run build-lib, but not committing it at this time. The mapdata code has already been updated in f3f7239a. Bug: T149268 Change-Id: I7a5350c4187f2421e71d6ad03a9383b0e5c6210f --- M package.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/34/320534/1 diff --git a/package.json b/package.json index dbdf0c4..ebd031a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "grunt-eslint": "19.0.0", "grunt-jsonlint": "1.1.0", "grunt-stylelint": "0.6.0", -"mapbox.js": "^2.3.0", +"mapbox.js": "2.3.0", "prunecluster": "^2.0.0-beta.3", "rollup": "^0.36.1", "rollup-plugin-commonjs": "^5.0.4", @@ -28,6 +28,6 @@ "leaflet": "^0.7.7", "leaflet-sleep": "juliengirault/Leaflet.Sleep", "maki": "^0.5.0", -"wikimedia-mapdata": "github:juliengirault/wikimedia-mapdata" +"wikimedia-mapdata": "git+https://gerrit.wikimedia.org/r/mapdata#497bccd38c9a440ab32d0d64ec90f44ca8ea8d32; } } -- To view, visit https://gerrit.wikimedia.org/r/320534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a5350c4187f2421e71d6ad03a9383b0e5c6210f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: MaxSem___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: CapsuleMultiselectWidget: Fix crash on right-click when no i...
jenkins-bot has submitted this change and it was merged. Change subject: CapsuleMultiselectWidget: Fix crash on right-click when no input .. CapsuleMultiselectWidget: Fix crash on right-click when no input We are defining this.$input as either null or an input, and yet on focus/unfocus operations there's a call for resize which assumes this.$input is a jQuery $( '' ) and tries to manipulate and calculate data from it. In general we should allow for an $input in the capsule even if there's a popup (and have the filtering option as an API the dev will implement, similar to having to implement the API to add items from the popup instead of the menu) -- but while we don't allow for that, any operation on the $input should be guarded. Change-Id: I464c0ac2a2f6b0129e076037212dfc672e679a4c --- M src/widgets/CapsuleMultiselectWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/widgets/CapsuleMultiselectWidget.js b/src/widgets/CapsuleMultiselectWidget.js index 833969f..e915d99 100644 --- a/src/widgets/CapsuleMultiselectWidget.js +++ b/src/widgets/CapsuleMultiselectWidget.js @@ -625,7 +625,7 @@ */ OO.ui.CapsuleMultiselectWidget.prototype.updateInputSize = function () { var $lastItem, direction, contentWidth, currentWidth, bestWidth; - if ( !this.isDisabled() ) { + if ( this.$input && !this.isDisabled() ) { this.$input.css( 'width', '1em' ); $lastItem = this.$group.children().last(); direction = OO.ui.Element.static.getDir( this.$handle ); -- To view, visit https://gerrit.wikimedia.org/r/320528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I464c0ac2a2f6b0129e076037212dfc672e679a4c Gerrit-PatchSet: 3 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: MooeypooGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.2
jenkins-bot has submitted this change and it was merged. Change subject: group0 wikis to 1.29.0-wmf.2 .. group0 wikis to 1.29.0-wmf.2 Change-Id: Ib85f6dc89b2a44f50eb200c296eb9ff5eb871a26 --- M php M wikiversions.json 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/php b/php index a6fa075..608607c 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.29.0-wmf.1 \ No newline at end of file +php-1.29.0-wmf.2 \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index ea2f603..ce49306 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -479,7 +479,7 @@ "maiwiki": "php-1.29.0-wmf.1", "map_bmswiki": "php-1.29.0-wmf.1", "mdfwiki": "php-1.29.0-wmf.1", -"mediawikiwiki": "php-1.29.0-wmf.1", +"mediawikiwiki": "php-1.29.0-wmf.2", "metawiki": "php-1.29.0-wmf.1", "mgwiki": "php-1.29.0-wmf.1", "mgwikibooks": "php-1.29.0-wmf.1", @@ -749,9 +749,9 @@ "tawiktionary": "php-1.29.0-wmf.1", "tcywiki": "php-1.29.0-wmf.1", "tenwiki": "php-1.29.0-wmf.1", -"test2wiki": "php-1.29.0-wmf.1", -"testwiki": "php-1.29.0-wmf.1", -"testwikidatawiki": "php-1.29.0-wmf.1", +"test2wiki": "php-1.29.0-wmf.2", +"testwiki": "php-1.29.0-wmf.2", +"testwikidatawiki": "php-1.29.0-wmf.2", "tetwiki": "php-1.29.0-wmf.1", "tewiki": "php-1.29.0-wmf.1", "tewikibooks": "php-1.29.0-wmf.1", @@ -881,7 +881,7 @@ "zawikiquote": "php-1.29.0-wmf.1", "zawiktionary": "php-1.29.0-wmf.1", "zeawiki": "php-1.29.0-wmf.1", -"zerowiki": "php-1.29.0-wmf.1", +"zerowiki": "php-1.29.0-wmf.2", "zh_classicalwiki": "php-1.29.0-wmf.1", "zh_min_nanwiki": "php-1.29.0-wmf.1", "zh_min_nanwikibooks": "php-1.29.0-wmf.1", -- To view, visit https://gerrit.wikimedia.org/r/320533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib85f6dc89b2a44f50eb200c296eb9ff5eb871a26 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4Gerrit-Reviewer: 20after4 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.2
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/320533 Change subject: group0 wikis to 1.29.0-wmf.2 .. group0 wikis to 1.29.0-wmf.2 Change-Id: Ib85f6dc89b2a44f50eb200c296eb9ff5eb871a26 --- M php M wikiversions.json 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/33/320533/1 diff --git a/php b/php index a6fa075..608607c 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.29.0-wmf.1 \ No newline at end of file +php-1.29.0-wmf.2 \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index ea2f603..ce49306 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -479,7 +479,7 @@ "maiwiki": "php-1.29.0-wmf.1", "map_bmswiki": "php-1.29.0-wmf.1", "mdfwiki": "php-1.29.0-wmf.1", -"mediawikiwiki": "php-1.29.0-wmf.1", +"mediawikiwiki": "php-1.29.0-wmf.2", "metawiki": "php-1.29.0-wmf.1", "mgwiki": "php-1.29.0-wmf.1", "mgwikibooks": "php-1.29.0-wmf.1", @@ -749,9 +749,9 @@ "tawiktionary": "php-1.29.0-wmf.1", "tcywiki": "php-1.29.0-wmf.1", "tenwiki": "php-1.29.0-wmf.1", -"test2wiki": "php-1.29.0-wmf.1", -"testwiki": "php-1.29.0-wmf.1", -"testwikidatawiki": "php-1.29.0-wmf.1", +"test2wiki": "php-1.29.0-wmf.2", +"testwiki": "php-1.29.0-wmf.2", +"testwikidatawiki": "php-1.29.0-wmf.2", "tetwiki": "php-1.29.0-wmf.1", "tewiki": "php-1.29.0-wmf.1", "tewikibooks": "php-1.29.0-wmf.1", @@ -881,7 +881,7 @@ "zawikiquote": "php-1.29.0-wmf.1", "zawiktionary": "php-1.29.0-wmf.1", "zeawiki": "php-1.29.0-wmf.1", -"zerowiki": "php-1.29.0-wmf.1", +"zerowiki": "php-1.29.0-wmf.2", "zh_classicalwiki": "php-1.29.0-wmf.1", "zh_min_nanwiki": "php-1.29.0-wmf.1", "zh_min_nanwikibooks": "php-1.29.0-wmf.1", -- To view, visit https://gerrit.wikimedia.org/r/320533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib85f6dc89b2a44f50eb200c296eb9ff5eb871a26 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4Gerrit-Reviewer: 20after4 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Remove hard coded grrrit-wm: irc command
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/320532 Change subject: Remove hard coded grrrit-wm: irc command .. Remove hard coded grrrit-wm: irc command The irc command is based on the bot's nick now. Change-Id: I7f7c8d0e98941faf296ac5e79a6109a79d0749b1 --- M src/relay.js 1 file changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit refs/changes/32/320532/1 diff --git a/src/relay.js b/src/relay.js index ccbfea4..18e9373 100644 --- a/src/relay.js +++ b/src/relay.js @@ -208,17 +208,15 @@ } ircClient.say(to, "reconnected to gerrit"); - } else if (text.indexOf('grrrit-wm: restart') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + } else if (text.indexOf(ircClient.nick + ': ' + 'restart') === 0 || text.indexOf('grrrit-wm: restart') === 0 ) + && !(whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { ircClient.say(to, "Permission is denied."); } if ( - (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 || - text.indexOf('grrrit-wm: force-restart') === 0 - ) && (whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 + && (whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { console.log(from + ' => ' + to + ' ' + text); @@ -237,8 +235,8 @@ logging.info('re-connected to gerrit.'); setTimeout(function(){ ircClient.say(to, "re-connected to gerrit and irc."); }, 17000); - } else if (text.indexOf('grrrit-wm: force-restart') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || - whitelist_nicks.indexOf(from) >= 0) + } else if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 + && !(whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { ircClient.say(to, "Permission is denied."); } @@ -256,7 +254,7 @@ ircClient.send('NICK', config.nick); logging.info('changed nick to' + config.nick); - } else if (text.indexOf('grrrit-wm: nick') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || + } else if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0 && !(whitelist_cloaks.indexOf(info.host) >= 0 || whitelist_nicks.indexOf(from) >= 0) ) { ircClient.say(to, "Permission is denied."); -- To view, visit https://gerrit.wikimedia.org/r/320532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f7c8d0e98941faf296ac5e79a6109a79d0749b1 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix visual glitch on `:active:focus` widget...
jenkins-bot has submitted this change and it was merged. Change subject: MediaWiki theme: Fix visual glitch on `:active:focus` widgets state .. MediaWiki theme: Fix visual glitch on `:active:focus` widgets state Fixing visual glitch on `:active:focus` state in CheckboxInput- and RadioInputWidget. `:active` state should not feature `:hover` or `:focus` colors. Similar to Ifc2e0d619b46011af840df663ca93882480c4fff Change-Id: Id29445aa9ad976c09832d660e7a7f0bcbf4cbb67 --- M src/themes/mediawiki/widgets.less 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 3753f7a..300edaa 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -484,9 +484,11 @@ } &:active + span, - &:active:hover + span { + &:active:hover + span, + &:active:focus + span { background-color: @background-color-input-binary-active; border-color: @border-color-input-binary-active; + box-shadow: @box-shadow-active; } &:focus + span { @@ -663,6 +665,10 @@ &:active:focus + span { border-color: @border-color-input-binary-active; box-shadow: inset 0 0 0 1px @border-color-input-binary-active; + + &:before { + border-color: @border-color-input-binary-active; + } } &:focus + span { -- To view, visit https://gerrit.wikimedia.org/r/320518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id29445aa9ad976c09832d660e7a7f0bcbf4cbb67 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] InputWidget: Remove deprecated #setRTL fun...
jenkins-bot has submitted this change and it was merged. Change subject: [BREAKING CHANGE] InputWidget: Remove deprecated #setRTL function .. [BREAKING CHANGE] InputWidget: Remove deprecated #setRTL function Deprecated since 0.13.1. Change-Id: I7922b0d577885cf5f20bb262951b596451af0737 --- M php/widgets/InputWidget.php M src/widgets/InputWidget.js 2 files changed, 0 insertions(+), 24 deletions(-) Approvals: VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/php/widgets/InputWidget.php b/php/widgets/InputWidget.php index c395325..2cb409b 100644 --- a/php/widgets/InputWidget.php +++ b/php/widgets/InputWidget.php @@ -92,18 +92,6 @@ } /** -* Set the directionality of the input, either RTL (right-to-left) or LTR (left-to-right). -* -* @deprecated since v0.13.1, use #setDir directly -* @param boolean $isRTL Directionality is right-to-left -* @return $this -*/ - public function setRTL( $isRTL ) { - $this->setDir( $isRTL ? 'rtl' : 'ltr' ); - return $this; - } - - /** * Set the directionality of the input. * * @param string $dir Text directionality: 'ltr', 'rtl' or 'auto' diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js index 692f90d..bcc5d70 100644 --- a/src/widgets/InputWidget.js +++ b/src/widgets/InputWidget.js @@ -153,18 +153,6 @@ }; /** - * Set the directionality of the input, either RTL (right-to-left) or LTR (left-to-right). - * - * @deprecated since v0.13.1; use #setDir directly - * @param {boolean} isRTL Directionality is right-to-left - * @chainable - */ -OO.ui.InputWidget.prototype.setRTL = function ( isRTL ) { - this.setDir( isRTL ? 'rtl' : 'ltr' ); - return this; -}; - -/** * Set the directionality of the input. * * @param {string} dir Text directionality: 'ltr', 'rtl' or 'auto' -- To view, visit https://gerrit.wikimedia.org/r/320429 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7922b0d577885cf5f20bb262951b596451af0737 Gerrit-PatchSet: 5 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: LinkAnnotationWidget: Don't use deprecated TextInputWidget#s...
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/320530 Change subject: LinkAnnotationWidget: Don't use deprecated TextInputWidget#setRTL .. LinkAnnotationWidget: Don't use deprecated TextInputWidget#setRTL Change-Id: Id4e5c66be97ea7bc660d33e413f53fc7d28f6536 --- M src/ui/widgets/ve.ui.LinkAnnotationWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/30/320530/1 diff --git a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js index 8d9786e..cbf5860 100644 --- a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js +++ b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js @@ -127,7 +127,7 @@ if ( $( 'body' ).hasClass( 'rtl' ) ) { isExt = ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( value.trim() ); // If URL is external, flip to LTR. Otherwise, set back to RTL - this.getTextInputWidget().setRTL( !isExt ); + this.getTextInputWidget().setDir( isExt ? 'ltr' : 'rtl' ); } this.getTextInputWidget().isValid().done( function ( valid ) { -- To view, visit https://gerrit.wikimedia.org/r/320530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4e5c66be97ea7bc660d33e413f53fc7d28f6536 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: LinkAnnotation{Inspector|Widget}: Stop using deprecated Text...
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/320531 Change subject: LinkAnnotation{Inspector|Widget}: Stop using deprecated TextInputWidget#isValid .. LinkAnnotation{Inspector|Widget}: Stop using deprecated TextInputWidget#isValid Change-Id: Iefd0030bb42179612a922f7add173242dd7a28b8 --- M src/ui/inspectors/ve.ui.LinkAnnotationInspector.js M src/ui/widgets/ve.ui.LinkAnnotationWidget.js 2 files changed, 18 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/31/320531/1 diff --git a/src/ui/inspectors/ve.ui.LinkAnnotationInspector.js b/src/ui/inspectors/ve.ui.LinkAnnotationInspector.js index 99fa256..b9af63c 100644 --- a/src/ui/inspectors/ve.ui.LinkAnnotationInspector.js +++ b/src/ui/inspectors/ve.ui.LinkAnnotationInspector.js @@ -45,16 +45,19 @@ * Update the actions based on the annotation state */ ve.ui.LinkAnnotationInspector.prototype.updateActions = function () { - var inspector = this, + var isValid = false, + inspector = this, annotation = this.annotationInput.getAnnotation(); - this.annotationInput.getTextInputWidget().isValid().done( function ( isValid ) { - isValid = isValid && !!annotation; - inspector.actions.forEach( { actions: [ 'done', 'insert' ] }, function ( action ) { - action.setDisabled( !isValid ); - } ); - } ); - + this.annotationInput.getTextInputWidget().getValidity() + .then( function () { isValid = !!annotation; }, function () {} ) + .then( + function () { + inspector.actions.forEach( { actions: [ 'done', 'insert' ] }, function ( action ) { + action.setDisabled( !isValid ); + } ); + } + ); }; /** diff --git a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js index cbf5860..22f5bb9 100644 --- a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js +++ b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js @@ -120,6 +120,7 @@ */ ve.ui.LinkAnnotationWidget.prototype.onTextChange = function ( value ) { var isExt, + isValid, widget = this; // RTL/LTR check @@ -130,10 +131,12 @@ this.getTextInputWidget().setDir( isExt ? 'ltr' : 'rtl' ); } - this.getTextInputWidget().isValid().done( function ( valid ) { - // Keep annotation in sync with value - widget.setAnnotation( valid ? widget.constructor.static.getAnnotationFromText( value ) : null, true ); - } ); + this.getTextInputWidget().getValidity() + .then( function () { isValid = true; }, function () {} ) + .then( function () { + // Keep annotation in sync with value + widget.setAnnotation( isValid ? widget.constructor.static.getAnnotationFromText( value ) : null, true ); + } ); }; // eslint-disable-next-line valid-jsdoc -- To view, visit https://gerrit.wikimedia.org/r/320531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd0030bb42179612a922f7add173242dd7a28b8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UrlShortener[master]: Fix broken example query string
jenkins-bot has submitted this change and it was merged. Change subject: Fix broken example query string .. Fix broken example query string Change-Id: I8a82eecefbb0ba327d8e8bc24ec535bcf40e6429 --- M ApiShortenUrl.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiShortenUrl.php b/ApiShortenUrl.php index 8f8631e..f45300b 100644 --- a/ApiShortenUrl.php +++ b/ApiShortenUrl.php @@ -55,7 +55,7 @@ public function getExamplesMessages() { return array( - 'api.php?action=shortenurl=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FArctica' + 'action=shortenurl=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FArctica' => 'apihelp-shortenurl-example-1', ); } -- To view, visit https://gerrit.wikimedia.org/r/320521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a82eecefbb0ba327d8e8bc24ec535bcf40e6429 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UrlShortener Gerrit-Branch: master Gerrit-Owner: AnomieGerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace Visibility with @TestedOnBool
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: replace Visibility with @TestedOnBool .. Hygiene: replace Visibility with @TestedOnBool Change-Id: I7ea8b1291b134990f0879351a22523da2a90717f --- M app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java D app/src/androidTest/java/org/wikipedia/test/view/Visibility.java 2 files changed, 7 insertions(+), 19 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java index a99218b..d58358d 100644 --- a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java +++ b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java @@ -3,13 +3,12 @@ import android.support.annotation.NonNull; import org.junit.Before; -import org.junit.experimental.theories.DataPoints; import org.junit.experimental.theories.Theory; +import org.wikipedia.test.theories.TestedOnBool; import org.wikipedia.test.view.FontScale; import org.wikipedia.test.view.LayoutDirection; import org.wikipedia.test.view.NullValue; import org.wikipedia.test.view.ViewTest; -import org.wikipedia.test.view.Visibility; import org.wikipedia.theme.Theme; import static android.support.design.widget.PasswordTextInput.OnShowPasswordClickListener; @@ -22,30 +21,28 @@ public class PasswordTextInputTest extends ViewTest { private PasswordTextInput subject; -@DataPoints public static final Visibility[] VISIBILITIES = Visibility.values(); - @Before public void setUp() { setUp(WIDTH_DP_S, LayoutDirection.LOCALE, FontScale.DEFAULT, Theme.LIGHT); subject = new PasswordTextInput(ctx()); } -@Theory public void testIsPasswordVisible(@NonNull Visibility visibility) { -if (visibility.visible()) { +@Theory public void testIsPasswordVisible(@TestedOnBool boolean visible) { +if (visible) { subject.passwordVisibilityToggleRequested(); } -assertThat(subject.isPasswordVisible(), is(visibility.visible())); +assertThat(subject.isPasswordVisible(), is(visible)); } @Theory public void testSetOnShowPasswordListener(@NonNull NullValue nul, - @NonNull Visibility visibility) { + @TestedOnBool boolean visible) { OnShowPasswordClickListener listener = nul.isNull() ? null : mock(OnShowPasswordClickListener.class); -if (visibility.visible()) { +if (visible) { subject.passwordVisibilityToggleRequested(); } subject.setOnShowPasswordListener(listener); subject.passwordVisibilityToggleRequested(); if (listener != null) { -verify(listener).onShowPasswordClick(eq(!visibility.visible())); +verify(listener).onShowPasswordClick(eq(!visible)); } } } \ No newline at end of file diff --git a/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java b/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java deleted file mode 100644 index 69f0eef..000 --- a/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.wikipedia.test.view; - -public enum Visibility { -HIDDEN, VISIBLE; - -public boolean visible() { -return this == VISIBLE; -} -} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/320444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ea8b1291b134990f0879351a22523da2a90717f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Mholloway Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 91716238ab7892173cfde58ed7365a2351291678 Alter WMFException to permit us to present a simpler error for users. ebc89250cca319cec2d7b626048dd337453ff7f1 Add option to download file of skipped, ignored, and error from upload. Change-Id: If3d2757b0abe5a84b99fdf005e5a8a839edb0ddb --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Eileen: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/320525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If3d2757b0abe5a84b99fdf005e5a8a839edb0ddb Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: EileenGerrit-Reviewer: Eileen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: RESTBase config: Use special project for wikidata domains.
Ppchelko has uploaded a new change for review. https://gerrit.wikimedia.org/r/320529 Change subject: RESTBase config: Use special project for wikidata domains. .. RESTBase config: Use special project for wikidata domains. It's been decided that most of RESTBase endpoints are completely useless on wikidata domains, like mobile, summary, feed etc. So we need to use a special wikidata project there that only switches on a limited subset of RESTBase modules. Change-Id: I57567951e6ec42dcd6b02b95390c0009e8f39a9c --- M modules/mariadb M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 3 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/29/320529/1 diff --git a/modules/mariadb b/modules/mariadb index 4d96e95..43f9a90 16 --- a/modules/mariadb +++ b/modules/mariadb @@ -1 +1 @@ -Subproject commit 4d96e95500cfbceb8fa552e503644d387e56e334 +Subproject commit 43f9a909d8910e6041d29886717cb6ba8c21c58e diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index a97873b..cf45e4d 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -59,6 +59,10 @@ pageviews: host: <%= @aqs_uri %> +wikidata.org: + x-modules: +- path: projects/wmf_wikidata.yaml + options: *default_options # Swagger spec root. root_spec: _spec @@ -108,7 +112,7 @@ /{domain:sq.wikipedia.beta.wmflabs.org}: *default_project /{domain:test.wikimedia.beta.wmflabs.org}: *default_project /{domain:uk.wikipedia.beta.wmflabs.org}: *default_project -/{domain:wikidata.beta.wmflabs.org}: *default_project +/{domain:wikidata.beta.wmflabs.org}: *wikidata.org /{domain:zero.wikimedia.beta.wmflabs.org}: *default_project /{domain:zh.wikipedia.beta.wmflabs.org}: *default_project diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index 576cb2d..d84e663 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -83,6 +83,12 @@ pageviews: host: <%= @aqs_uri %> +# A different project for wikidata since we have limited RESTBase support there. +wikidata.org: + x-modules: +- path: projects/wmf_wikidata.yaml + options: *default_options + # wiktionaries config wiktionary: _project x-modules: @@ -868,8 +874,8 @@ /{domain:www.mediawiki.org}: *default_project /{domain:wikisource.org}: *default_project /{domain:beta.wikiversity.org}: *default_project -/{domain:www.wikidata.org}: *default_project -/{domain:test.wikidata.org}: *default_project +/{domain:www.wikidata.org}: *wikidata.org +/{domain:test.wikidata.org}: *wikidata.org # global domain /{domain:wikimedia.org}: *wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/320529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57567951e6ec42dcd6b02b95390c0009e8f39a9c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ppchelko___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix crash on right-click of CapsuleMultiselectWidget
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/320528 Change subject: Fix crash on right-click of CapsuleMultiselectWidget .. Fix crash on right-click of CapsuleMultiselectWidget We are defining this.$input as either null or an input, and yet on focus/unfocus operations there's a call for resize which assumes this.$input is a jQuery $( ' ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Revert "Move NewPP limit report HTML comments to JS variable...
Bartosz Dziewoński has submitted this change and it was merged. Change subject: Revert "Move NewPP limit report HTML comments to JS variables" and followups .. Revert "Move NewPP limit report HTML comments to JS variables" and followups This change resulted in unreasonable feature loss (human-readable limit report was gone). Three months and multiple followups later, the functionality is still not completely restored. Given lack of response from the original author, I think it is time to revert and reconsider, especially since the 1.28 release is soon. A machine-readable limit report would be a very useful feature, but not at the cost of losing human-readable limit report. This reverts the following commits: * Move NewPP limit report HTML comments to JS variables b7c4c8717f964d1890d185ec3e6e9481fcb734e4 * Only pretty-print the parser report JS vars 28adc4d7eef2d7d8e5696a4f9849538a769daa00 * Show wgPageParseReport on page previews too 1255654ed5a89ed57491bda38f544ed87e3bc601 * Re-add human readable parser limit report 0051f108b954b52b9981d5d85862ac1f292db80c * Restore hooks.txt for ParserLimitReportFormat 4663e7a7371fabb96ed9c909e5b93042c5f08438 Resolved minor merge conflicts in OutputPage (with 80e5b160) and release notes. Bug: T110763 Bug: T142210 Change-Id: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 (cherry picked from commit 0e15a6068a5a07fc109b5898ae51fdb8decafaf0) --- M RELEASE-NOTES-1.28 M includes/EditPage.php M includes/OutputPage.php M includes/parser/Parser.php M includes/parser/ParserOutput.php M includes/resourceloader/ResourceLoader.php 6 files changed, 65 insertions(+), 92 deletions(-) Approvals: Bartosz Dziewoński: Verified; Looks good to me, approved diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index d20dba0..7521cfa 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -209,7 +209,6 @@ * Skin::linkKnown() (use MediaWiki\Linker\LinkRenderer instead) * Skin::userLink() (use Linker::userLink() instead) * Skin::userToolLinks() (use Linker::userToolLinks() instead) -* The 'ParserLimitReportFormat' hook was removed. * Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is disabled. * DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21). diff --git a/includes/EditPage.php b/includes/EditPage.php index 059af97..a9d1c48 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3559,22 +3559,16 @@ ] ) . Html::openElement( 'tbody' ); - foreach ( $output->getLimitReportData()['limitreport'] as $key => $value ) { + foreach ( $output->getLimitReportData() as $key => $value ) { if ( Hooks::run( 'ParserLimitReportFormat', [ $key, &$value, &$limitReport, true, true ] ) ) { - $keyMsg = wfMessage( "limitreport-$key" ); - $valueMsg = wfMessage( - [ "limitreport-$key-value-html", "limitreport-$key-value" ] - ); + $keyMsg = wfMessage( $key ); + $valueMsg = wfMessage( [ "$key-value-html", "$key-value" ] ); if ( !$valueMsg->exists() ) { $valueMsg = new RawMessage( '$1' ); } if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) { - // If it's a value/limit array, convert it for $1/$2 - if ( is_array( $value ) && isset( $value['value'] ) ) { - $value = [ $value['value'], $value['limit'] ]; - } $limitReport .= Html::openElement( 'tr' ) . Html::rawElement( 'th', null, $keyMsg->parse() ) . Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) . diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 863a426..a8be748 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -295,9 +295,6 @@ */ private $copyrightUrl; - /** @var array Profiling data */ - private $limitReportData = []; - /** * Constructor for OutputPage. This should not be called directly. * Instead a new RequestContext should be created and it will implicitly create @@ -1776,14 +1773,9 @@ } } - // Enable OOUI if requested via ParserOutput + // enable OOUI if requested via ParserOutput if ( $parserOutput->getEnableOOUI() ) {
[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistatus: fewer login tries with a longer delay between
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/320527 Change subject: wikistatus: fewer login tries with a longer delay between .. wikistatus: fewer login tries with a longer delay between Change-Id: I7352d542aa6db4845e313cfb8ff8934544681550 --- M modules/openstack/files/liberty/nova/wikistatus/wikistatus.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/320527/1 diff --git a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py index 4d3f6f9..ffb6c27 100644 --- a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py +++ b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py @@ -109,7 +109,7 @@ if site: # MW has a bug that kills a fair number of these logins, # so give it a few tries. -for count in reversed(xrange(4)): +for count in reversed(xrange(2)): try: site.login(CONF.wiki_login, CONF.wiki_password, domain=CONF.wiki_domain) @@ -117,7 +117,7 @@ except mwclient.APIError: LOG.warning("mwclient login failed, will try %s more times" % count) -time.sleep(.2) +time.sleep(1) raise mwclient.MaximumRetriesExceeded() else: LOG.warning("Unable to reach %s. We'll keep trying, " -- To view, visit https://gerrit.wikimedia.org/r/320527 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7352d542aa6db4845e313cfb8ff8934544681550 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Update news route and tests to handle template-generated sum...
Mholloway has uploaded a new change for review. https://gerrit.wikimedia.org/r/320526 Change subject: Update news route and tests to handle template-generated summary merge URIs .. Update news route and tests to handle template-generated summary merge URIs Change-Id: I16a44b1c03db7b32aff41624a1f7804090e35a72 --- M lib/feed/featured.js M lib/feed/most-read.js M lib/feed/news.js M lib/mobile-util.js M test/features/news/news.js 5 files changed, 65 insertions(+), 67 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps refs/changes/26/320526/1 diff --git a/lib/feed/featured.js b/lib/feed/featured.js index 3f60059..1a30624 100644 --- a/lib/feed/featured.js +++ b/lib/feed/featured.js @@ -108,7 +108,7 @@ }); }).then(function (res) { return { -payload: { $merge: [ mUtil.getRbPageSummaryUrl(app, domain, res.dbTitle) ] }, +payload: { $merge: [ mUtil.getRbPageSummaryUrl(app.restbase_tpl, domain, res.dbTitle) ] }, meta: { etag: tfaPageObj.pageid } }; }).catch(function (err) { diff --git a/lib/feed/most-read.js b/lib/feed/most-read.js index 2e451b1..a1807aa 100644 --- a/lib/feed/most-read.js +++ b/lib/feed/most-read.js @@ -145,7 +145,7 @@ var results = goodTitles.map(function(entry) { return Object.assign(entry, { -$merge: [ mUtil.getRbPageSummaryUrl(app, req.params.domain, entry.article) ], +$merge: [ mUtil.getRbPageSummaryUrl(app.restbase_tpl, req.params.domain, entry.article) ], article: undefined, fromencoded: undefined, ns: undefined, diff --git a/lib/feed/news.js b/lib/feed/news.js index 6faff8e..c519363 100644 --- a/lib/feed/news.js +++ b/lib/feed/news.js @@ -16,9 +16,32 @@ return href; } +function constructStory(restbase_tpl, domain, storyHtml) { +var story = { links: [] }; +var linkTitles = []; + +var pushMergeLinkForTitle = function(title) { +this.push({ $merge: [ mUtil.getRbPageSummaryUrl(restbase_tpl, domain, title) ] }); +}; + + storyHtml.querySelectorAll('a[rel="mw:WikiLink"]').forEach(function(anchor) { +var href = anchor.href; +var title = removeFragment(href.slice(1)); + +if (linkTitles.indexOf(title) === -1) { +pushMergeLinkForTitle.call(story.links, title); +linkTitles.push(title); +} +}); + +story.story = storyHtml.innerHTML; +return story; +} + function promise(app, req) { var lang = req.params.domain.split('.')[0]; var aggregated = !!req.query.aggregated; + if (!NEWS_TEMPLATES[lang]) { if (aggregated) { return BBPromise.resolve({}); @@ -31,41 +54,21 @@ }); } -var result = { -payload: [], -meta: {} -}; req.params.title = NEWS_TEMPLATES[lang].title; return parsoid.getParsoidHtml(app, req) .then(function (response) { -result.meta.etag = parsoid.getRevisionFromEtag(response.headers); +var stories = domino.createDocument(response.body) +.querySelector(NEWS_TEMPLATES[lang].selector) +.getElementsByTagName('li'); +var result = { +payload: [], +meta: { etag: parsoid.getRevisionFromEtag(response.headers) } +}; -var linkTitles = []; -var doc = domino.createDocument(response.body); -var newsList = doc.querySelector(NEWS_TEMPLATES[lang].selector); -var stories = newsList.getElementsByTagName('li'); +Array.prototype.forEach.call(stories, function(storyHtml) { +result.payload.push(constructStory(app.restbase_tpl, req.params.domain, storyHtml)); +}); -for (var j = 0, m = stories.length; j < m; j++) { -var anchors = stories[j].querySelectorAll('a[rel="mw:WikiLink"]'); -var story = { -links: [] -}; - -for (var i = 0, n = anchors.length; i < n; i++) { -var href = anchors[i].href; -var title = removeFragment(href.slice(1)); - -if (linkTitles.indexOf(title) === -1) { -story.links.push({ -$merge: [ mUtil.getRbPageSummaryUrl(app, req.params.domain, title) ] -}); -linkTitles.push(title); -} -} - -story.story = stories[j].innerHTML; -result.payload.push(story); -} return result; }); } @@ -74,5 +77,6 @@ promise: promise, // visible for testing -removeFragment: removeFragment +removeFragment: removeFragment, +constructStory: constructStory }; diff --git a/lib/mobile-util.js b/lib/mobile-util.js index d59cde0..a1b8b58 100644 --- a/lib/mobile-util.js +++
[MediaWiki-commits] [Gerrit] mapdata[master]: Added support for 'page' externalData
MaxSem has submitted this change and it was merged. Change subject: Added support for 'page' externalData .. Added support for 'page' externalData Change-Id: Ibfc92478496ee7c8b4901926d0b1abf234cfd80a --- M src/Group.External.js 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: MaxSem: Verified JGirault: Looks good to me, approved diff --git a/src/Group.External.js b/src/Group.External.js index 1b8a27a..5c51b08 100644 --- a/src/Group.External.js +++ b/src/Group.External.js @@ -44,6 +44,13 @@ switch ( data.service ) { +case 'page': + if ( geodata.jsondata && geodata.jsondata.data ) { +extend( data, geodata.jsondata.data ); + } + // FIXME: error reporting, at least to console.log + break; + case 'geomask': // Mask-out the entire world 10 times east and west, // and add each result geometry as a hole @@ -119,6 +126,10 @@ uri = mwUri( group.geoJSON.url ); switch ( group.geoJSON.service ) { + case 'page': +// FIXME: add link to commons page +break; + case 'geoshape': case 'geoline': if ( uri.query.query ) { -- To view, visit https://gerrit.wikimedia.org/r/320339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfc92478496ee7c8b4901926d0b1abf234cfd80a Gerrit-PatchSet: 1 Gerrit-Project: mapdata Gerrit-Branch: master Gerrit-Owner: MaxSemGerrit-Reviewer: JGirault Gerrit-Reviewer: MaxSem Gerrit-Reviewer: Yurik ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/320525 Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 91716238ab7892173cfde58ed7365a2351291678 Alter WMFException to permit us to present a simpler error for users. ebc89250cca319cec2d7b626048dd337453ff7f1 Add option to download file of skipped, ignored, and error from upload. Change-Id: If3d2757b0abe5a84b99fdf005e5a8a839edb0ddb --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/25/320525/1 -- To view, visit https://gerrit.wikimedia.org/r/320525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3d2757b0abe5a84b99fdf005e5a8a839edb0ddb Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Validate getExamplesMessages() query strings
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/320524 Change subject: Validate getExamplesMessages() query strings .. Validate getExamplesMessages() query strings Assert that they don't begin with 'api.php?'. Change-Id: Idf5e8e08863a379a37a427a11936e5f9ce567396 Depends-On: I8a82eecefbb0ba327d8e8bc24ec535bcf40e6429 Depends-On: I476aad09655a2822381a2c61690b4b0ad423151e --- M tests/phpunit/structure/ApiDocumentationTest.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/24/320524/1 diff --git a/tests/phpunit/structure/ApiDocumentationTest.php b/tests/phpunit/structure/ApiDocumentationTest.php index 2049e38..e979ce0 100644 --- a/tests/phpunit/structure/ApiDocumentationTest.php +++ b/tests/phpunit/structure/ApiDocumentationTest.php @@ -137,6 +137,8 @@ // Messages for examples. foreach ( $module->getExamplesMessages() as $qs => $msg ) { + $this->assertFalse( (bool)preg_match( '/^api\.php\?/', $qs ), + "Query string must not begin with 'api.php?' for example $qs" ); $this->checkMessage( $msg, "Example $qs" ); } } -- To view, visit https://gerrit.wikimedia.org/r/320524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf5e8e08863a379a37a427a11936e5f9ce567396 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Remove bogus restrictions in JCDataApi and fix example query...
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/320523 Change subject: Remove bogus restrictions in JCDataApi and fix example query strings .. Remove bogus restrictions in JCDataApi and fix example query strings There's nothing in there that in any way requires JSON format. If we add the proper call to ApiResult::addMetadataToResultVars, it's not even ugly in XML format. Change-Id: I476aad09655a2822381a2c61690b4b0ad423151e --- M i18n/en.json M includes/JCApi.php M includes/JCDataApi.php 3 files changed, 9 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig refs/changes/23/320523/1 diff --git a/i18n/en.json b/i18n/en.json index e327c20..069ecf6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -49,7 +49,7 @@ "apihelp-jsonconfig-example-1": "Show configuration", "apihelp-jsonconfig-example-2": "Reset [[Zero:TEST]]", "apihelp-jsonconfig-example-3": "Reload [[Zero:TEST]]", - "apihelp-jsondata-description": "Retrieve localized JSON data. This API only supports format=json and formatversion=2 or later.", + "apihelp-jsondata-description": "Retrieve localized JSON data.", "apihelp-jsondata-param-title": "Title to get. By default assumes namespace to be \"Data:\"", "apihelp-jsondata-example-1": "Get JSON content of the Sample.tab page, localized to user's language", "apihelp-jsondata-example-2": "Get JSON content of the Sample.tab page localized to French" diff --git a/includes/JCApi.php b/includes/JCApi.php index 9806feb..bf369f5 100644 --- a/includes/JCApi.php +++ b/includes/JCApi.php @@ -146,9 +146,9 @@ return [ 'action=jsonconfig=jsonfm' => 'apihelp-jsonconfig-example-1', - 'api.php?action=jsonconfig=reset=480=TEST=jsonfm' + 'action=jsonconfig=reset=480=TEST=jsonfm' => 'apihelp-jsonconfig-example-2', - 'api.php?action=jsonconfig=reload=480=TEST=jsonfm' + 'action=jsonconfig=reload=480=TEST=jsonfm' => 'apihelp-jsonconfig-example-3', ]; } diff --git a/includes/JCDataApi.php b/includes/JCDataApi.php index 5a1d79b..8eefe9d 100644 --- a/includes/JCDataApi.php +++ b/includes/JCDataApi.php @@ -2,6 +2,7 @@ namespace JsonConfig; use ApiBase; +use ApiResult; use ApiFormatJson; /** @@ -10,18 +11,6 @@ class JCDataApi extends ApiBase { public function execute() { - $printerParams = $this->getMain()->getPrinter()->extractRequestParams(); - if ( !( $this->getMain()->getPrinter() instanceof ApiFormatJson ) || -!isset( $printerParams['formatversion'] ) - ) { - $this->dieUsage( 'This module only supports format=json and format=jsonfm', - 'invalidparammix' ); - } - if ( $printerParams['formatversion'] == 1 ) { - $this->dieUsage( 'This module only supports formatversion=2 or later', - 'invalidparammix' ); - } - $params = $this->extractRequestParams(); $jct = JCSingleton::parseTitle( $params['title'], NS_DATA ); if ( !$jct ) { @@ -37,6 +26,9 @@ /** @var JCDataContent $data */ $data = $data->getLocalizedData( $this->getLanguage() ); } + + // Armor any API metadata in $data + $data = ApiResult::addMetadataToResultVars( (array)$data, is_object( $data ) ); $this->getResult()->addValue( null, $this->getModuleName(), $data ); @@ -55,9 +47,9 @@ protected function getExamplesMessages() { return [ - 'api.php?action=jsondata=2=jsonfm=Sample.tab' + 'action=jsondata=2=jsonfm=Sample.tab' => 'apihelp-jsondata-example-1', - 'api.php?action=jsondata=2=jsonfm=Sample.tab=fr' + 'action=jsondata=2=jsonfm=Sample.tab=fr' => 'apihelp-jsondata-example-2', ]; } -- To view, visit https://gerrit.wikimedia.org/r/320523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I476aad09655a2822381a2c61690b4b0ad423151e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/JsonConfig Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Upgrade to Commons Lang v3.5
jenkins-bot has submitted this change and it was merged. Change subject: Upgrade to Commons Lang v3.5 .. Upgrade to Commons Lang v3.5 There was a bug introduced by 6f8ba16 when comparing two CharSequences in DescriptionEditView. The fix is in Commons Lang v3.5[0]. LANG-1127 may be applicable for some of our Locale dependent tests and many util supplements were made[1] [0] https://issues.apache.org/jira/browse/LANG-1162 [1] https://commons.apache.org/proper/commons-lang/release-notes/RELEASE-NOTES-3.5.txt Change-Id: I50cc4252747a2812d8aa44b68d90b12f11135d71 --- M app/build.gradle 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/build.gradle b/app/build.gradle index 755a549..c67b785 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -204,7 +204,7 @@ transitive = true } compile 'net.hockeyapp.android:HockeySDK:4.0.1' -compile 'org.apache.commons:commons-lang3:3.4' +compile 'org.apache.commons:commons-lang3:3.5' apt "com.jakewharton:butterknife-compiler:$butterKnifeVersion" -- To view, visit https://gerrit.wikimedia.org/r/320436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50cc4252747a2812d8aa44b68d90b12f11135d71 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Mholloway Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UrlShortener[master]: Fix broken example query string
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/320521 Change subject: Fix broken example query string .. Fix broken example query string Change-Id: I8a82eecefbb0ba327d8e8bc24ec535bcf40e6429 --- M ApiShortenUrl.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UrlShortener refs/changes/21/320521/1 diff --git a/ApiShortenUrl.php b/ApiShortenUrl.php index 8f8631e..f45300b 100644 --- a/ApiShortenUrl.php +++ b/ApiShortenUrl.php @@ -55,7 +55,7 @@ public function getExamplesMessages() { return array( - 'api.php?action=shortenurl=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FArctica' + 'action=shortenurl=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FArctica' => 'apihelp-shortenurl-example-1', ); } -- To view, visit https://gerrit.wikimedia.org/r/320521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a82eecefbb0ba327d8e8bc24ec535bcf40e6429 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UrlShortener Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Revert "Move NewPP limit report HTML comments to JS variable...
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320522 Change subject: Revert "Move NewPP limit report HTML comments to JS variables" and followups .. Revert "Move NewPP limit report HTML comments to JS variables" and followups This change resulted in unreasonable feature loss (human-readable limit report was gone). Three months and multiple followups later, the functionality is still not completely restored. Given lack of response from the original author, I think it is time to revert and reconsider, especially since the 1.28 release is soon. A machine-readable limit report would be a very useful feature, but not at the cost of losing human-readable limit report. This reverts the following commits: * Move NewPP limit report HTML comments to JS variables b7c4c8717f964d1890d185ec3e6e9481fcb734e4 * Only pretty-print the parser report JS vars 28adc4d7eef2d7d8e5696a4f9849538a769daa00 * Show wgPageParseReport on page previews too 1255654ed5a89ed57491bda38f544ed87e3bc601 * Re-add human readable parser limit report 0051f108b954b52b9981d5d85862ac1f292db80c * Restore hooks.txt for ParserLimitReportFormat 4663e7a7371fabb96ed9c909e5b93042c5f08438 Resolved minor merge conflicts in OutputPage (with 80e5b160) and release notes. Bug: T110763 Bug: T142210 Change-Id: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 (cherry picked from commit 0e15a6068a5a07fc109b5898ae51fdb8decafaf0) --- M RELEASE-NOTES-1.28 M includes/EditPage.php M includes/OutputPage.php M includes/parser/Parser.php M includes/parser/ParserOutput.php M includes/resourceloader/ResourceLoader.php 6 files changed, 65 insertions(+), 92 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/22/320522/1 diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index d20dba0..7521cfa 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -209,7 +209,6 @@ * Skin::linkKnown() (use MediaWiki\Linker\LinkRenderer instead) * Skin::userLink() (use Linker::userLink() instead) * Skin::userToolLinks() (use Linker::userToolLinks() instead) -* The 'ParserLimitReportFormat' hook was removed. * Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is disabled. * DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21). diff --git a/includes/EditPage.php b/includes/EditPage.php index 059af97..a9d1c48 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3559,22 +3559,16 @@ ] ) . Html::openElement( 'tbody' ); - foreach ( $output->getLimitReportData()['limitreport'] as $key => $value ) { + foreach ( $output->getLimitReportData() as $key => $value ) { if ( Hooks::run( 'ParserLimitReportFormat', [ $key, &$value, &$limitReport, true, true ] ) ) { - $keyMsg = wfMessage( "limitreport-$key" ); - $valueMsg = wfMessage( - [ "limitreport-$key-value-html", "limitreport-$key-value" ] - ); + $keyMsg = wfMessage( $key ); + $valueMsg = wfMessage( [ "$key-value-html", "$key-value" ] ); if ( !$valueMsg->exists() ) { $valueMsg = new RawMessage( '$1' ); } if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) { - // If it's a value/limit array, convert it for $1/$2 - if ( is_array( $value ) && isset( $value['value'] ) ) { - $value = [ $value['value'], $value['limit'] ]; - } $limitReport .= Html::openElement( 'tr' ) . Html::rawElement( 'th', null, $keyMsg->parse() ) . Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) . diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 863a426..a8be748 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -295,9 +295,6 @@ */ private $copyrightUrl; - /** @var array Profiling data */ - private $limitReportData = []; - /** * Constructor for OutputPage. This should not be called directly. * Instead a new RequestContext should be created and it will implicitly create @@ -1776,14 +1773,9 @@ } } - // Enable OOUI if requested via ParserOutput + // enable OOUI if requested via ParserOutput if
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Move NewPP limit report HTML comments to JS variable...
Bartosz Dziewoński has submitted this change and it was merged. Change subject: Revert "Move NewPP limit report HTML comments to JS variables" and followups .. Revert "Move NewPP limit report HTML comments to JS variables" and followups This change resulted in unreasonable feature loss (human-readable limit report was gone). Three months and multiple followups later, the functionality is still not completely restored. Given lack of response from the original author, I think it is time to revert and reconsider, especially since the 1.28 release is soon. A machine-readable limit report would be a very useful feature, but not at the cost of losing human-readable limit report. This reverts the following commits: * Move NewPP limit report HTML comments to JS variables b7c4c8717f964d1890d185ec3e6e9481fcb734e4 * Only pretty-print the parser report JS vars 28adc4d7eef2d7d8e5696a4f9849538a769daa00 * Show wgPageParseReport on page previews too 1255654ed5a89ed57491bda38f544ed87e3bc601 * Re-add human readable parser limit report 0051f108b954b52b9981d5d85862ac1f292db80c * Restore hooks.txt for ParserLimitReportFormat 4663e7a7371fabb96ed9c909e5b93042c5f08438 Resolved minor merge conflicts in OutputPage (with 80e5b160) and release notes. Bug: T110763 Bug: T142210 Change-Id: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 --- M RELEASE-NOTES-1.28 M includes/EditPage.php M includes/OutputPage.php M includes/parser/Parser.php M includes/parser/ParserOutput.php M includes/resourceloader/ResourceLoader.php 6 files changed, 65 insertions(+), 92 deletions(-) Approvals: Bartosz Dziewoński: Verified; Looks good to me, approved diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index b5dc3f9..df9feda 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -211,7 +211,6 @@ * Skin::linkKnown() (use MediaWiki\Linker\LinkRenderer instead) * Skin::userLink() (use Linker::userLink() instead) * Skin::userToolLinks() (use Linker::userToolLinks() instead) -* The 'ParserLimitReportFormat' hook was removed. * Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is disabled. * DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21). diff --git a/includes/EditPage.php b/includes/EditPage.php index 9c5c91a..ad308b1 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3550,22 +3550,16 @@ ] ) . Html::openElement( 'tbody' ); - foreach ( $output->getLimitReportData()['limitreport'] as $key => $value ) { + foreach ( $output->getLimitReportData() as $key => $value ) { if ( Hooks::run( 'ParserLimitReportFormat', [ $key, &$value, &$limitReport, true, true ] ) ) { - $keyMsg = wfMessage( "limitreport-$key" ); - $valueMsg = wfMessage( - [ "limitreport-$key-value-html", "limitreport-$key-value" ] - ); + $keyMsg = wfMessage( $key ); + $valueMsg = wfMessage( [ "$key-value-html", "$key-value" ] ); if ( !$valueMsg->exists() ) { $valueMsg = new RawMessage( '$1' ); } if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) { - // If it's a value/limit array, convert it for $1/$2 - if ( is_array( $value ) && isset( $value['value'] ) ) { - $value = [ $value['value'], $value['limit'] ]; - } $limitReport .= Html::openElement( 'tr' ) . Html::rawElement( 'th', null, $keyMsg->parse() ) . Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) . diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 76bfaa2..50629ba 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -295,9 +295,6 @@ */ private $copyrightUrl; - /** @var array Profiling data */ - private $limitReportData = []; - /** * Constructor for OutputPage. This should not be called directly. * Instead a new RequestContext should be created and it will implicitly create @@ -1775,14 +1772,9 @@ } } - // Enable OOUI if requested via ParserOutput + // enable OOUI if requested via ParserOutput if ( $parserOutput->getEnableOOUI() ) { $this->enableOOUI(); - } - -
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add option to download file of skipped, ignored, and error f...
jenkins-bot has submitted this change and it was merged. Change subject: Add option to download file of skipped, ignored, and error from upload. .. Add option to download file of skipped, ignored, and error from upload. The url to download the csv files only has minimal protection - ie. it is restricted by permission but within that permission some could theoretically fish for files they did not create. How much of a concern is that? Also, my feeling is that it would be worth when we abort copying the errors and all remaining lines (and possibly skipped & ignored) into a 'not-imported' csv as I feel that would be easier for the users. There is some extra processing and files created, but I think it is probably warranted. Lastly, needs some unit tests Bug: T88460 Change-Id: I01c694f9ef225376cac49c6cd85aa1569bbda10b --- M sites/all/modules/offline2civicrm/ChecksFile.php M sites/all/modules/offline2civicrm/offline2civicrm.module 2 files changed, 90 insertions(+), 8 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php b/sites/all/modules/offline2civicrm/ChecksFile.php index f5c428b..f536960 100644 --- a/sites/all/modules/offline2civicrm/ChecksFile.php +++ b/sites/all/modules/offline2civicrm/ChecksFile.php @@ -7,12 +7,20 @@ */ abstract class ChecksFile { protected $numSkippedRows = 0; +protected $messages = array(); +protected $file_uri = ''; +protected $error_file_uri = ''; +protected $skipped_file_uri = ''; +protected $ignored_file_uri = ''; /** * @param string $file_uri path to the file */ function __construct( $file_uri ) { $this->file_uri = $file_uri; +$this->error_file_uri = str_replace('.csv', '_errors.csv', $file_uri); +$this->skipped_file_uri = str_replace('.csv', '_skipped.csv', $file_uri); +$this->ignored_file_uri = str_replace('.csv', '_ignored.csv', $file_uri); } /** @@ -35,7 +43,7 @@ $headers = _load_headers( fgetcsv( $file, 0, ',', '"', '\\') ); - $this->validateColumns( $headers ); +$this->validateColumns( $headers ); $num_errors = 0; $num_ignored = 0; @@ -69,7 +77,12 @@ if ( $existing = wmf_civicrm_get_contributions_from_gateway_id( $msg['gateway'], $msg['gateway_txn_id'] ) ){ $skipped = $this->handleDuplicate( $existing ); if ( $skipped ) { +if ($num_duplicates === 0) { + $skipped_file = $this->createOutputFile($this->skipped_file_uri, 'Skipped', $headers); +} $num_duplicates++; +fputcsv($skipped_file, array_merge(array('Skipped' => 'Duplicate'), $data)); + } else { $num_successful++; } @@ -90,15 +103,24 @@ } catch ( EmptyRowException $ex ) { continue; } catch ( IgnoredRowException $ex ) { +if ($num_ignored === 0) { + $ignored_file = $this->createOutputFile($this->ignored_file_uri, 'Ignored', $headers); +} +fputcsv($ignored_file, array_merge(array('Ignored' => $ex->getUserErrorMessage()), $data)); $num_ignored++; continue; } catch ( WmfException $ex ) { +if ($num_errors === 0) { + $error_file = $this->createOutputFile($this->error_file_uri, 'Error', $headers); +} + $m = $ex->getUserErrorMessage(); $num_errors++; +fputcsv($error_file, array_merge(array('error' => $ex->getUserErrorMessage()), $data)); -ChecksImportLog::record( t( "Error in line @rownum: @row (@exception)", array( +ChecksImportLog::record( t( "Error in line @rownum: (@exception) @row", array( '@rownum' => $rowNum, '@row' => implode( ', ', $row ), -'@exception' => $ex->getMessage(), +'@exception' => $ex->getUserErrorMessage(), ) ) ); if ( $error_streak_start + $error_streak_count < $rowNum ) { @@ -107,19 +129,37 @@ $error_streak_count = 0; } $error_streak_count++; + if ( $error_streak_count >= $error_streak_threshold ) { -$errorMsg = "Import aborted due to {$error_streak_count} consecutive errors, last error was at row {$rowNum}: {$ex->getMessage()}, after {$num_successful} records were stored successfully, {$num_ignored} were ignored, {$num_duplicates} duplicates, and {$num_errors} errors encountered."; +$errorMsg = "Import aborted due to
[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistatus: work around occasional wikitech login failures
Andrew Bogott has submitted this change and it was merged. Change subject: wikistatus: work around occasional wikitech login failures .. wikistatus: work around occasional wikitech login failures Bug: T95839 Change-Id: I7e32dd102f0926ec460ac6fcc39e55f397ae207f --- M modules/openstack/files/liberty/nova/wikistatus/wikistatus.py 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py index a1c5960..4d3f6f9 100644 --- a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py +++ b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py @@ -13,6 +13,8 @@ #License for the specific language governing permissions and limitations #under the License. +import time + import mwclient import nova.context @@ -105,12 +107,22 @@ retry_timeout=5, max_retries=3) if site: -site.login(CONF.wiki_login, CONF.wiki_password, - domain=CONF.wiki_domain) -return site +# MW has a bug that kills a fair number of these logins, +# so give it a few tries. +for count in reversed(xrange(4)): +try: +site.login(CONF.wiki_login, CONF.wiki_password, + domain=CONF.wiki_domain) +return site +except mwclient.APIError: +LOG.warning("mwclient login failed, will try %s more times" +% count) +time.sleep(.2) +raise mwclient.MaximumRetriesExceeded() else: LOG.warning("Unable to reach %s. We'll keep trying, " -"but pages will be out of sync in the meantime.") +"but pages will be out of sync in the meantime." +% host) return None def _deserialize_context(self, contextdict): -- To view, visit https://gerrit.wikimedia.org/r/320482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e32dd102f0926ec460ac6fcc39e55f397ae207f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew BogottGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up 294c244: Don't remove the useful class, just the o...
jenkins-bot has submitted this change and it was merged. Change subject: Follow-up 294c244: Don't remove the useful class, just the old one .. Follow-up 294c244: Don't remove the useful class, just the old one Change-Id: I5ddd2ef9613930c65cfc4f2783846fcadd277549 --- M src/widgets/ComboBoxInputWidget.js 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: VolkerE: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/src/widgets/ComboBoxInputWidget.js b/src/widgets/ComboBoxInputWidget.js index 4e5238b..a681ef0 100644 --- a/src/widgets/ComboBoxInputWidget.js +++ b/src/widgets/ComboBoxInputWidget.js @@ -109,7 +109,9 @@ this.$field = $( '' ) .addClass( 'oo-ui-comboBoxInputWidget-field' ) .append( this.$input, this.dropdownButton.$element ); - this.$element.append( this.$field ); + this.$element + .addClass( 'oo-ui-comboBoxInputWidget' ) + .append( this.$field ); this.$overlay.append( this.menu.$element ); this.onMenuItemsChange(); }; -- To view, visit https://gerrit.wikimedia.org/r/320459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ddd2ef9613930c65cfc4f2783846fcadd277549 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Catrope Gerrit-Reviewer: Jforrester Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Accept 'OK' status results from search engine
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/320520 Change subject: Accept 'OK' status results from search engine .. Accept 'OK' status results from search engine Historically code that talks to the SearchEngine has been treating anything other than a 'Good' result, such as results but with a warning (perhaps the query timed out and only gave partial results) as a complete failure. Adjust the handling to report results from an 'OK' status response, while keeping the previous behavior of throwing away any warnings. Change-Id: I8b503ce79fc54ed9913e6e9a58cfe28f75516456 --- M SpecialProofreadPages.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/20/320520/1 diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php index eb275f7..2d27998 100644 --- a/SpecialProofreadPages.php +++ b/SpecialProofreadPages.php @@ -74,7 +74,15 @@ $searchEngine->setLimitOffset( $this->limit + 1, $this->offset ); $searchEngine->setNamespaces( [ $indexNamespaceId ] ); $searchEngine->showRedirects = false; - $textMatches = $searchEngine->searchText( $this->searchTerm ); + $status = $searchEngine->searchText( $this->searchTerm ); + if ( $status instanceof SearchResultSet ) { + $textMatches = $status; + $status = null; + } elseif ( $status->isOK() ) { + $textMatches = $status->getValue(); + } else { + $textMatches = null; + } if ( !( $textMatches instanceof SearchResultSet ) ) { // TODO: $searchEngine->searchText() can return status objects // Might want to extract some information from them -- To view, visit https://gerrit.wikimedia.org/r/320520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b503ce79fc54ed9913e6e9a58cfe28f75516456 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.28.0-wmf.3]: Accept 'OK' status results from search engine
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/320519 Change subject: Accept 'OK' status results from search engine .. Accept 'OK' status results from search engine Historically code that talks to the SearchEngine has been treating anything other than a 'Good' result, such as results but with a warning (perhaps the query timed out and only gave partial results) as a complete failure. Adjust the handling to report results from an 'OK' status response, while keeping the previous behavior of throwing away any warnings. Change-Id: I8b503ce79fc54ed9913e6e9a58cfe28f75516456 --- M SpecialProofreadPages.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/19/320519/1 diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php index bfa95d1..fd32674 100644 --- a/SpecialProofreadPages.php +++ b/SpecialProofreadPages.php @@ -74,7 +74,15 @@ $searchEngine->setLimitOffset( $this->limit + 1, $this->offset ); $searchEngine->setNamespaces( [ $indexNamespaceId ] ); $searchEngine->showRedirects = false; - $textMatches = $searchEngine->searchText( $this->searchTerm ); + $status = $searchEngine->searchText( $this->searchTerm ); + if ( $status instanceof SearchResultSet ) { + $textMatches = $status; + $status = null; + } elseif ( $status->isOK() ) { + $textMatches = $status->getValue(); + } else { + $textMatches = null; + } if ( !( $textMatches instanceof SearchResultSet ) ) { // TODO: $searchEngine->searchText() can return status objects // Might want to extract some information from them -- To view, visit https://gerrit.wikimedia.org/r/320519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b503ce79fc54ed9913e6e9a58cfe28f75516456 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: wmf/1.28.0-wmf.3 Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix visual glitch on `:active:focus` widget...
VolkerE has uploaded a new change for review. https://gerrit.wikimedia.org/r/320518 Change subject: MediaWiki theme: Fix visual glitch on `:active:focus` widgets state .. MediaWiki theme: Fix visual glitch on `:active:focus` widgets state Fixing visual glitch on `:active:focus` state in CheckboxInput- and RadioInputWidget. `:active` state should not feature `:hover` or `:focus` colors. Similar to Ifc2e0d619b46011af840df663ca93882480c4fff Change-Id: Id29445aa9ad976c09832d660e7a7f0bcbf4cbb67 --- M src/themes/mediawiki/widgets.less 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/18/320518/1 diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 3753f7a..300edaa 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -484,9 +484,11 @@ } &:active + span, - &:active:hover + span { + &:active:hover + span, + &:active:focus + span { background-color: @background-color-input-binary-active; border-color: @border-color-input-binary-active; + box-shadow: @box-shadow-active; } &:focus + span { @@ -663,6 +665,10 @@ &:active:focus + span { border-color: @border-color-input-binary-active; box-shadow: inset 0 0 0 1px @border-color-input-binary-active; + + &:before { + border-color: @border-color-input-binary-active; + } } &:focus + span { -- To view, visit https://gerrit.wikimedia.org/r/320518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id29445aa9ad976c09832d660e7a7f0bcbf4cbb67 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: add layout prefixes to description IDs
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: add layout prefixes to description IDs .. Hygiene: add layout prefixes to description IDs Add view_ / fragment_ layout prefixes to description IDs and remove an unnecessary View parent in DescriptionEditFragment Bug: T148203 Change-Id: I54db1df44458ff3fa7716860a61d1ea1468f0ac0 --- M app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java M app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java M app/src/main/res/layout/fragment_description_edit.xml M app/src/main/res/layout/view_description_edit.xml 4 files changed, 18 insertions(+), 24 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java index 81b3ac6..494f93d 100644 --- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java +++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java @@ -25,7 +25,7 @@ public class DescriptionEditFragment extends Fragment { private static final String ARG_TITLE = "title"; -@BindView(R.id.description_edit_view) DescriptionEditView editView; +@BindView(R.id.fragment_description_edit_view) DescriptionEditView editView; private Unbinder unbinder; private PageTitle pageTitle; @Nullable private Call call; diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java index 0fcbbef..5fa6dee 100644 --- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java +++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java @@ -28,11 +28,11 @@ import butterknife.OnTextChanged; public class DescriptionEditView extends FrameLayout { -@BindView(R.id.description_edit_page_title) TextView pageTitleText; -@BindView(R.id.description_edit_save_button) FloatingActionButton saveButton; -@BindView(R.id.description_edit_text) EditText pageDescriptionText; -@BindView(R.id.description_edit_char_count) TextView charCountText; -@BindView(R.id.description_edit_progress_bar) ProgressBar progressBar; +@BindView(R.id.view_description_edit_page_title) TextView pageTitleText; +@BindView(R.id.view_description_edit_save_button) FloatingActionButton saveButton; +@BindView(R.id.view_description_edit_text) EditText pageDescriptionText; +@BindView(R.id.view_description_edit_char_count) TextView charCountText; +@BindView(R.id.view_description_edit_progress_bar) ProgressBar progressBar; @Nullable private PageTitle pageTitle; @Nullable private String originalDescription; @@ -87,13 +87,13 @@ return pageDescriptionText.getText().toString(); } -@OnClick(R.id.description_edit_save_button) void onSaveClick() { +@OnClick(R.id.view_description_edit_save_button) void onSaveClick() { if (callback != null) { callback.onSaveClick(); } } -@OnTextChanged(value = R.id.description_edit_text, +@OnTextChanged(value = R.id.view_description_edit_text, callback = OnTextChanged.Callback.AFTER_TEXT_CHANGED) void pageDescriptionTextChanged() { updateSaveButtonVisible(); diff --git a/app/src/main/res/layout/fragment_description_edit.xml b/app/src/main/res/layout/fragment_description_edit.xml index fc1c5ee..68022ce 100644 --- a/app/src/main/res/layout/fragment_description_edit.xml +++ b/app/src/main/res/layout/fragment_description_edit.xml @@ -1,13 +1,7 @@ -http://schemas.android.com/apk/res/android; +android:id="@+id/fragment_description_edit_view" android:layout_width="match_parent" android:layout_height="match_parent" -android:paddingTop="?attr/actionBarSize"> - - - - \ No newline at end of file +android:layout_marginTop="?attr/actionBarSize" /> \ No newline at end of file diff --git a/app/src/main/res/layout/view_description_edit.xml b/app/src/main/res/layout/view_description_edit.xml index 4e1615e..4662f97 100644 --- a/app/src/main/res/layout/view_description_edit.xml +++ b/app/src/main/res/layout/view_description_edit.xml @@ -19,7 +19,7 @@ android:elevation="6dp"> -- To view, visit https://gerrit.wikimedia.org/r/320313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54db1df44458ff3fa7716860a61d1ea1468f0ac0 Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320516 Change subject: ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 .. ParserLimitReportPrepareHookHandlerTest: Update for 0e15a606 This way works with 0e15a606 and without it. Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Depends-On: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 --- M client/includes/Hooks/ParserLimitReportPrepareHookHandler.php M client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/16/320516/2 diff --git a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php index 9ee5634..a1322ad 100644 --- a/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php +++ b/client/includes/Hooks/ParserLimitReportPrepareHookHandler.php @@ -68,8 +68,8 @@ $output->setLimitReportData( 'limitreport-entityaccesscount', [ - 'value' => $this->restrictedEntityLookup->getEntityAccessCount(), - 'limit' => $this->entityAccessLimit + $this->restrictedEntityLookup->getEntityAccessCount(), + $this->entityAccessLimit ] ); diff --git a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php index 6e6a04c..4753b13 100644 --- a/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php +++ b/client/tests/phpunit/includes/Hooks/ParserLimitReportPrepareHookHandlerTest.php @@ -47,8 +47,8 @@ $limitReportData = $parserOutput->getLimitReportData(); $this->assertSame( - [ 'value' => 42, 'limit' => 1234 ], - $limitReportData['limitreport']['entityaccesscount'] + [ 42, 1234 ], + $limitReportData['limitreport-entityaccesscount'] ); } -- To view, visit https://gerrit.wikimedia.org/r/320516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bcf4edceb6e0fae9876b307ab78e860360c02f3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Accept 'OK' status results from search engine
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/320517 Change subject: Accept 'OK' status results from search engine .. Accept 'OK' status results from search engine Historically code that talks to the SearchEngine has been treating anything other than a 'Good' result, such as results but with a warning (perhaps the query timed out and only gave partial results) as a complete failure. Adjust the handling to report results from an 'OK' status response while attaching any warnings to the api response. Bug: T134157 Change-Id: I54307ab1f12139a5045e377f7dfa7626a1e5d065 --- M includes/Api/ApiFlowSearch.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/17/320517/1 diff --git a/includes/Api/ApiFlowSearch.php b/includes/Api/ApiFlowSearch.php index 4f4fe62..c273da4 100644 --- a/includes/Api/ApiFlowSearch.php +++ b/includes/Api/ApiFlowSearch.php @@ -54,9 +54,10 @@ /** @var Status $status */ $status = $this->searchEngine->searchText( $params['term'] ); - if ( !$status->isGood() ) { + if ( !$status->isOK() ) { throw new InvalidDataException( $status->getMessage(), 'fail-search' ); } + $this->getMain()->getErrorFormatter()->addMessagesFromStatus( $status ); /** @var \Elastica\ResultSet|null $resultSet */ $resultSet = $status->getValue(); -- To view, visit https://gerrit.wikimedia.org/r/320517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54307ab1f12139a5045e377f7dfa7626a1e5d065 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...experimental[master]: poultry fix
Chelsyx has submitted this change and it was merged. Change subject: poultry fix .. poultry fix Change-Id: I6d5bb9d6ad4b639fc578d1ce6f0d9aad12c3fe82 --- M shiny-server/poultry 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chelsyx: Verified; Looks good to me, approved diff --git a/shiny-server/poultry b/shiny-server/poultry index 8357194..263ab79 16 --- a/shiny-server/poultry +++ b/shiny-server/poultry @@ -1 +1 @@ -Subproject commit 8357194edd41127c702f44184e9a0fcaf2b41acb +Subproject commit 263ab7937a776d1aa4b349a2bc35732117c5225c -- To view, visit https://gerrit.wikimedia.org/r/320514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d5bb9d6ad4b639fc578d1ce6f0d9aad12c3fe82 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/experimental Gerrit-Branch: master Gerrit-Owner: ChelsyxGerrit-Reviewer: Chelsyx ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...experimental[master]: poultry fix
Chelsyx has uploaded a new change for review. https://gerrit.wikimedia.org/r/320514 Change subject: poultry fix .. poultry fix Change-Id: I6d5bb9d6ad4b639fc578d1ce6f0d9aad12c3fe82 --- M shiny-server/poultry 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/experimental refs/changes/14/320514/1 diff --git a/shiny-server/poultry b/shiny-server/poultry index 8357194..263ab79 16 --- a/shiny-server/poultry +++ b/shiny-server/poultry @@ -1 +1 @@ -Subproject commit 8357194edd41127c702f44184e9a0fcaf2b41acb +Subproject commit 263ab7937a776d1aa4b349a2bc35732117c5225c -- To view, visit https://gerrit.wikimedia.org/r/320514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d5bb9d6ad4b639fc578d1ce6f0d9aad12c3fe82 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/experimental Gerrit-Branch: master Gerrit-Owner: Chelsyx___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Update ssh2 to 0.5.3
jenkins-bot has submitted this change and it was merged. Change subject: Update ssh2 to 0.5.3 .. Update ssh2 to 0.5.3 Change-Id: Ib4328310fd56344e0e9291f4d6e2775685fc87f6 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Paladox: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 6960a24..4595ddc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "irc": "~0.5", "irc-colors": "~1.3.0", "js-yaml": "^3.4.2", -"ssh2": "~0.5.1", +"ssh2": "~0.5.3", "swig": "~0.14.0", "underscore": "~1.8.3", "winston": "~2.1.1" -- To view, visit https://gerrit.wikimedia.org/r/320480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4328310fd56344e0e9291f4d6e2775685fc87f6 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Alter WMFException to permit us to present a simpler error f...
jenkins-bot has submitted this change and it was merged. Change subject: Alter WMFException to permit us to present a simpler error for users. .. Alter WMFException to permit us to present a simpler error for users. Currently the debug is being passed in, which is fine except when we want to present the message to users. Bug: T88460 Change-Id: Icd69c23dd4387aff720cdc9d6b0e5950406e4067 --- M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module M sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc M sites/all/modules/thank_you/thank_you.module M sites/all/modules/wmf_civicrm/wmf_civicrm.module M sites/all/modules/wmf_common/WmfException.php 5 files changed, 43 insertions(+), 22 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module index ab4cf64..710e64f 100644 --- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module +++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module @@ -274,7 +274,7 @@ } catch (Exception $e) { $message = 'Batch processing aborted: ' . $e->getMessage(); - $e = new WmfException( 'UNKNOWN', $message, $contribution_recur); + $e = new WmfException( 'UNKNOWN', $message, array('contribution_recur' => $contribution_recur)); $failed[] = $contribution_recur; break; } @@ -337,7 +337,7 @@ if ( $result->isFailed() || $result->getErrors() ) { _recurring_globalcollect_update_record_failure($contribution_recur_id); -throw new WmfException( 'PAYMENT_FAILED', 'recurring charge failed', $result); +throw new WmfException( 'PAYMENT_FAILED', 'recurring charge failed', array('payment_result' => $result)); } // If success, add a record to the contribution table and send a thank you email. @@ -370,7 +370,7 @@ try { $transaction = WmfTransaction::from_unique_id( $contribution_recur['trxn_id'] ); } catch ( Exception $ex ) { -throw new WmfException( 'INVALID_RECURRING', $ex->getMessage(), $contribution_recur ); +throw new WmfException( 'INVALID_RECURRING', $ex->getMessage(), array('contribution_recur' => $contribution_recur )); } $msg = array( diff --git a/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc b/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc index eeaa298..99dae1a 100644 --- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc +++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect_common.inc @@ -240,7 +240,7 @@ civicrm_api_contribution_status( 'Failed' ), ); if ( !in_array( $record['contribution_status_id'], $working_statuses ) ) { -throw new WmfException( 'INVALID_RECURRING', t( 'The subscription is supposed to be in a completed or failed state before it can be processed.' ), $record ); +throw new WmfException( 'INVALID_RECURRING', t( 'The subscription is supposed to be in a completed or failed state before it can be processed.' ), array('contribution_recur' => $record) ); } $dbs = wmf_civicrm_get_dbs(); @@ -257,7 +257,7 @@ $dbs->pop(); if ( !$affected_rows ) { -throw new WmfException( 'INVALID_RECURRING', t( 'The subscription was not marked as in progress.' ), $record ); +throw new WmfException( 'INVALID_RECURRING', t( 'The subscription was not marked as in progress.' ), array('contribution_recur' => $record) ); } return $affected_rows; @@ -301,9 +301,9 @@ /** * _recurring_globalcollect_validate_record_for_update - * + * * @param array $record - * @throws Exception + * @throws Exception * @return boolean */ function _recurring_globalcollect_validate_record_for_update($record) { @@ -324,25 +324,25 @@ // Make sure $cycle_day is not empty if (empty($cycle_day)) { $message = 'cycle_day cannot be empty'; -throw new WmfException( 'INVALID_RECURRING', $message, $record ); +throw new WmfException( 'INVALID_RECURRING', $message, array('contribution_recur' => $record) ); } // Make sure $frequency_interval is not empty if (empty($frequency_interval)) { $message = 'frequency_interval cannot be empty'; -throw new WmfException( 'INVALID_RECURRING', $message, $record ); +throw new WmfException( 'INVALID_RECURRING', $message, array('contribution_recur' => $record) ); } // Make sure a valid interval is assigned if (!in_array($frequency_unit, $allowed_intervals)) { $message = 'Invalid frequency_unit [' . $frequency_unit . '] for recurring_globalcollect. Allowed intervals: [ ' . implode(', ', $allowed_intervals) . ' ]'; -throw new WmfException( 'INVALID_RECURRING', $message,
[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistatus: work around occasional wikitech login failures
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/320482 Change subject: wikistatus: work around occasional wikitech login failures .. wikistatus: work around occasional wikitech login failures Bug: T95839 Change-Id: I7e32dd102f0926ec460ac6fcc39e55f397ae207f --- M modules/openstack/files/liberty/nova/wikistatus/wikistatus.py 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/320482/1 diff --git a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py index a1c5960..b4774fa 100644 --- a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py +++ b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py @@ -13,6 +13,8 @@ #License for the specific language governing permissions and limitations #under the License. +import time + import mwclient import nova.context @@ -105,12 +107,22 @@ retry_timeout=5, max_retries=3) if site: -site.login(CONF.wiki_login, CONF.wiki_password, - domain=CONF.wiki_domain) +# MW has a bug that kills a fair number of these logins, +# so give it a few tries. +for count in reversed(xrange(4)): +try: +site.login(CONF.wiki_login, CONF.wiki_password, + domain=CONF.wiki_domain) +break +except mwclient.APIError: +LOG.warning("mwclient login failed, will try %s more times" +% count) +time.sleep(.2) return site else: LOG.warning("Unable to reach %s. We'll keep trying, " -"but pages will be out of sync in the meantime.") +"but pages will be out of sync in the meantime." +% host) return None def _deserialize_context(self, contextdict): -- To view, visit https://gerrit.wikimedia.org/r/320482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e32dd102f0926ec460ac6fcc39e55f397ae207f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Update ssh2 to 0.5.3
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/320480 Change subject: Update ssh2 to 0.5.3 .. Update ssh2 to 0.5.3 Change-Id: Ib4328310fd56344e0e9291f4d6e2775685fc87f6 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit refs/changes/80/320480/1 diff --git a/package.json b/package.json index 6960a24..4595ddc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "irc": "~0.5", "irc-colors": "~1.3.0", "js-yaml": "^3.4.2", -"ssh2": "~0.5.1", +"ssh2": "~0.5.3", "swig": "~0.14.0", "underscore": "~1.8.3", "winston": "~2.1.1" -- To view, visit https://gerrit.wikimedia.org/r/320480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4328310fd56344e0e9291f4d6e2775685fc87f6 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Move NewPP limit report HTML comments to JS variable...
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/320461 Change subject: Revert "Move NewPP limit report HTML comments to JS variables" and followups .. Revert "Move NewPP limit report HTML comments to JS variables" and followups This change resulted in unreasonable feature loss (human-readable limit report was gone). Three months and multiple followups later, the functionality is still not completely restored. Given lack of response from the original author, I think it is time to revert and reconsider, especially since the 1.28 release is soon. A machine-readable limit report would be a very useful feature, but not at the cost of losing human-readable limit report. This reverts the following commits: * Move NewPP limit report HTML comments to JS variables b7c4c8717f964d1890d185ec3e6e9481fcb734e4 * Only pretty-print the parser report JS vars 28adc4d7eef2d7d8e5696a4f9849538a769daa00 * Show wgPageParseReport on page previews too 1255654ed5a89ed57491bda38f544ed87e3bc601 * Re-add human readable parser limit report 0051f108b954b52b9981d5d85862ac1f292db80c * Restore hooks.txt for ParserLimitReportFormat 4663e7a7371fabb96ed9c909e5b93042c5f08438 Resolved minor merge conflicts in OutputPage (with 80e5b160) and release notes. Bug: T110763 Bug: T142210 Change-Id: Id88c8066fae3f369e8977b4b7488f67071bdeeb7 --- M RELEASE-NOTES-1.28 M includes/EditPage.php M includes/OutputPage.php M includes/parser/Parser.php M includes/parser/ParserOutput.php M includes/resourceloader/ResourceLoader.php 6 files changed, 65 insertions(+), 92 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/320461/1 diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index b5dc3f9..df9feda 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -211,7 +211,6 @@ * Skin::linkKnown() (use MediaWiki\Linker\LinkRenderer instead) * Skin::userLink() (use Linker::userLink() instead) * Skin::userToolLinks() (use Linker::userToolLinks() instead) -* The 'ParserLimitReportFormat' hook was removed. * Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is disabled. * DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21). diff --git a/includes/EditPage.php b/includes/EditPage.php index 9c5c91a..ad308b1 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3550,22 +3550,16 @@ ] ) . Html::openElement( 'tbody' ); - foreach ( $output->getLimitReportData()['limitreport'] as $key => $value ) { + foreach ( $output->getLimitReportData() as $key => $value ) { if ( Hooks::run( 'ParserLimitReportFormat', [ $key, &$value, &$limitReport, true, true ] ) ) { - $keyMsg = wfMessage( "limitreport-$key" ); - $valueMsg = wfMessage( - [ "limitreport-$key-value-html", "limitreport-$key-value" ] - ); + $keyMsg = wfMessage( $key ); + $valueMsg = wfMessage( [ "$key-value-html", "$key-value" ] ); if ( !$valueMsg->exists() ) { $valueMsg = new RawMessage( '$1' ); } if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) { - // If it's a value/limit array, convert it for $1/$2 - if ( is_array( $value ) && isset( $value['value'] ) ) { - $value = [ $value['value'], $value['limit'] ]; - } $limitReport .= Html::openElement( 'tr' ) . Html::rawElement( 'th', null, $keyMsg->parse() ) . Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) . diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 76bfaa2..50629ba 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -295,9 +295,6 @@ */ private $copyrightUrl; - /** @var array Profiling data */ - private $limitReportData = []; - /** * Constructor for OutputPage. This should not be called directly. * Instead a new RequestContext should be created and it will implicitly create @@ -1775,14 +1772,9 @@ } } - // Enable OOUI if requested via ParserOutput + // enable OOUI if requested via ParserOutput if ( $parserOutput->getEnableOOUI() ) {
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: WIP: Add config.yaml and use it
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/320462 Change subject: WIP: Add config.yaml and use it .. WIP: Add config.yaml and use it * Add a dummy config.yaml file and point it to the existing settings file in the debian package. Change-Id: I61f67671ae8469bc02c125b71ca81493bcb4f213 --- A debian/config.yaml M debian/parsoid.default M debian/parsoid.install 3 files changed, 103 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/62/320462/1 diff --git a/debian/config.yaml b/debian/config.yaml new file mode 100644 index 000..2798c6b --- /dev/null +++ b/debian/config.yaml @@ -0,0 +1,101 @@ +# This is a sample configuration file. This sample file has been +# set up to just point to the previously used localsettings.js file +# so that users can upgrade without breaking their installs. +# +# But, we encourage users to migrate the settings to the config.yaml +# setup. +# +# Copy this file to config.yaml and edit that file to fit your needs. +# +# Also see: +# - `npm start -- -h` for more information about passing config files via +# the commandline. +# - lib/config/ParsoidConfig.js for all the properties that you can configure +# here. Not all properties are documented here. + +worker_heartbeat_timeout: 30 + +logging: +level: info + +#metrics: +#type: log + +services: + - module: ../src/lib/index.js +entrypoint: apiServiceWorker +conf: +# For backwards compatibility, and to continue to support non-static +# configs for the time being, optionally provide a path to a +# localsettings.js file. See localsettings.example.js +localsettings: /etc/mediawiki/parsoid/settings.js + +# Set your own user-agent string +# Otherwise, defaults to: +# 'Parsoid/' +#userAgent: 'My-User-Agent-String' + +# Configure Parsoid to point to your MediaWiki instances. +#mwApis: +#- # This is the only required parameter, + # the URL of you MediaWiki API endpoint. + # uri: 'http://localhost/w/api.php' + # The "domain" is used for communication with Visual Editor + # and RESTBase. It defaults to the hostname portion of + # the `uri` property below, but you can manually set it + # to an arbitrary string. + # domain: 'localhost' # optional + # To specify a proxy (or proxy headers) specific to this prefix + # (which overrides defaultAPIProxyURI). Alternatively, set `proxy` + # to `null` to override and force no proxying when a default proxy + # has been set. + #proxy: + #uri: 'http://my.proxy:1234/' + #headers: # optional + #'X-Forwarded-Proto': 'https' + +# We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly +# for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks', +# 'enwikivoyage' etc. +# The default for this is false. Uncomment the line below if you want +# to load WMF's config for wikipedias, etc. +#loadWMF: true + +# A default proxy to connect to the API endpoints. +# Default: undefined (no proxying). +# Overridden by per-wiki proxy config in setMwApi. +#defaultAPIProxyURI: 'http://proxy.example.org:8080' + +# Enable debug mode (prints extra debugging messages) +#debug: true + +# Use the PHP preprocessor to expand templates via the MW API (default true) +#usePHPPreProcessor: false + +# Use selective serialization (default false) +#useSelser: true + +# Allow cross-domain requests to the API (default '*') +# Sets Access-Control-Allow-Origin header +# disable: +#allowCORS: false +# restrict: +#allowCORS: 'some.domain.org' + +# Allow override of port/interface: +#serverPort: 8000 +#serverInterface: '127.0.0.1' + +# Enable linting of some wikitext errors to the log +#linting: true +# Send lint errors to MW API instead of to the log +#linterSendAPI: false + +# Require SSL certificates to be valid (default true) +# Set to false when using self-signed SSL certificates +#strictSSL: false + +# Use a different server for CSS style modules. +# Leaving it undefined (the default) will use the same URI as the MW API, +# changing api.php for load.php. +#modulesLoadURI: 'http://example.org/load.php' diff --git a/debian/parsoid.default b/debian/parsoid.default index a52649d..cae6ac4 100644 --- a/debian/parsoid.default +++ b/debian/parsoid.default @@ -3,7 +3,7 @@ # File where the parsoid daemon will write stderr and stdout to PARSOID_LOG_FILE=/var/log/parsoid/parsoid.log