[MediaWiki-commits] [Gerrit] Ruby Ruby syntax check and RuboCop for Gather - change (integration/config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/237376 Change subject: Ruby Ruby syntax check and RuboCop for Gather .. Ruby Ruby syntax check and RuboCop for Gather Since Gather does not have RuboCop set up, running in experimental pipeline for now. Bug: T112097 Change-Id: Icc1b3a73fbb4ef348ccca4710f2f2849cca132d1 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/76/237376/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8b9770c..484a03f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3741,6 +3741,8 @@ - mwext-mw-selenium gate-and-submit: - mwext-mw-selenium +experimental: + - name: extension-rubylint - name: mediawiki/extensions/GettingStarted template: -- To view, visit https://gerrit.wikimedia.org/r/237376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc1b3a73fbb4ef348ccca4710f2f2849cca132d1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run Ruby syntax check for operations/puppet in experimental ... - change (integration/config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/237375 Change subject: Run Ruby syntax check for operations/puppet in experimental pipeline .. Run Ruby syntax check for operations/puppet in experimental pipeline Bug: T1361 Change-Id: I82172bb4dcffbe8fe21b837dc0eb91906854f1b6 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/75/237375/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8b9770c..995fd74 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2750,6 +2750,7 @@ experimental: - bundle-rubocop - operations-puppet-bundle-rspec + - ruby1.9.3lint postmerge: - operations-puppet-doc -- To view, visit https://gerrit.wikimedia.org/r/237375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82172bb4dcffbe8fe21b837dc0eb91906854f1b6 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix wrong exception in LabelDescriptionLookup mock - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/237374 Change subject: Fix wrong exception in LabelDescriptionLookup mock .. Fix wrong exception in LabelDescriptionLookup mock Change-Id: Ie8896c5341a9154ba369dbe1a4990d8dd075e5a3 --- M lib/tests/phpunit/formatters/EntityIdHtmlLinkFormatterTest.php 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/74/237374/1 diff --git a/lib/tests/phpunit/formatters/EntityIdHtmlLinkFormatterTest.php b/lib/tests/phpunit/formatters/EntityIdHtmlLinkFormatterTest.php index 2cc061d..7b571ff 100644 --- a/lib/tests/phpunit/formatters/EntityIdHtmlLinkFormatterTest.php +++ b/lib/tests/phpunit/formatters/EntityIdHtmlLinkFormatterTest.php @@ -2,11 +2,12 @@ namespace Wikibase\Lib\Test; -use OutOfBoundsException; +use MediaWikiTestCase; use Title; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup; +use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookupException; use Wikibase\DataModel\Term\Term; use Wikibase\DataModel\Term\TermFallback; use Wikibase\Lib\EntityIdHtmlLinkFormatter; @@ -23,7 +24,7 @@ * @licence GNU GPL v2+ * @author Marius Hoch < h...@online.de > */ -class EntityIdHtmlLinkFormatterTest extends \MediaWikiTestCase { +class EntityIdHtmlLinkFormatterTest extends MediaWikiTestCase { /** * @param Term $term @@ -46,7 +47,7 @@ $labelDescriptionLookup = $this->getMock( 'Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup' ); $labelDescriptionLookup->expects( $this->any() ) ->method( 'getLabel' ) - ->will( $this->throwException( new OutOfBoundsException( 'meep' ) ) ); + ->will( $this->throwException( new LabelDescriptionLookupException( 'meep' ) ) ); return $labelDescriptionLookup; } -- To view, visit https://gerrit.wikimedia.org/r/237374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8896c5341a9154ba369dbe1a4990d8dd075e5a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for American English spelling - change (mediawiki...Petition)
jenkins-bot has submitted this change and it was merged. Change subject: Fix for American English spelling .. Fix for American English spelling Change-Id: Ib6f08d91b769a5440d99592a1b74d5967dc169ac --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index a0d509d..9166ed8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,7 +5,7 @@ ] }, "petition": "Sign petition", - "petition-desc": "Adds an [[Special:Petition|includable page]] to collect signatures, and for authorised users to [[Special:PetitionData|download signatures]] as a CSV file.", + "petition-desc": "Adds an [[Special:Petition|includable page]] to collect signatures, and for authorized users to [[Special:PetitionData|download signatures]] as a CSV file.", "petition-form-name": "Name", "petition-form-email": "Email address", "petition-form-country": "Country", -- To view, visit https://gerrit.wikimedia.org/r/237344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6f08d91b769a5440d99592a1b74d5967dc169ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Petition Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run Ruby syntax check for mediawiki/vagrant in experimental ... - change (integration/config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/237373 Change subject: Run Ruby syntax check for mediawiki/vagrant in experimental pipeline .. Run Ruby syntax check for mediawiki/vagrant in experimental pipeline Bug: T1361 Change-Id: I4901c59e877bfa8403e61e85714373b881a1e304 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/73/237373/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8b9770c..d25f735 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2615,6 +2615,8 @@ postmerge: - mediawiki-vagrant-puppet-doc-publish - mediawiki-vagrant-bundle17-yard-publish +experimental: + - ruby1.9.3lint - name: operations/debs/adminbot template: -- To view, visit https://gerrit.wikimedia.org/r/237373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4901c59e877bfa8403e61e85714373b881a1e304 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining appservers in codfw - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Enable ferm on remaining appservers in codfw .. Enable ferm on remaining appservers in codfw Change-Id: Ia1d74d2b4be4535684b47565c59639870488d98f --- M manifests/site.pp 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 5d6ae73..12ff244 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1957,10 +1957,7 @@ #mw2008-mw2049 are appservers node /^mw20(0[89]|[1-4][0-9])\.codfw\.wmnet$/ { role mediawiki::appserver - -if $::hostname =~ /^mw200[89]$/ { -include base::firewall -} +include base::firewall } #mw2050-2079 are api appservers @@ -1988,6 +1985,7 @@ #mw2090-mw2119 are appservers node /^mw2(09[0-9]|1[0-1][0-9])\.codfw\.wmnet$/ { role mediawiki::appserver +include base::firewall } #mw2120-2147 are api appservers @@ -2013,6 +2011,7 @@ #mw2153-mw2199 are appservers node /^mw21(5[3-9]|[6-9][0-9])\.codfw\.wmnet$/ { role mediawiki::appserver +include base::firewall } #mw2200-2234 are api appservers -- To view, visit https://gerrit.wikimedia.org/r/237370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1d74d2b4be4535684b47565c59639870488d98f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace some very simple asserttag with assertContains - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/237372 Change subject: Replace some very simple asserttag with assertContains .. Replace some very simple asserttag with assertContains See my comment in I36ad837 for the motivation why I touched this. Most other usages of assertTag in our code base are much more complicated and are not that easy to convert to something else. One could convert some to assertRegex, but I really want to avoid overly complex regular expressions. I suggest to rebase I36ad837 on top of this. Bug: T69122 Change-Id: Id016edf0cafdb2312299f658856491e08d634c5e --- M repo/tests/phpunit/includes/content/ItemContentTest.php M repo/tests/phpunit/includes/specials/SpecialGoToLinkedPageTest.php 2 files changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/72/237372/1 diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php b/repo/tests/phpunit/includes/content/ItemContentTest.php index e5aa7fc..10d1d09 100644 --- a/repo/tests/phpunit/includes/content/ItemContentTest.php +++ b/repo/tests/phpunit/includes/content/ItemContentTest.php @@ -401,8 +401,9 @@ $html = $parserOutput->getText(); - $this->assertTag( array( 'tag' => 'div', 'class' => 'redirectMsg' ), $html, 'redirect message' ); - $this->assertTag( array( 'tag' => 'a', 'content' => 'Q123' ), $html, 'redirect target' ); + $this->assertContains( '', $html, 'redirect message' ); + $this->assertContains( ' 'p', - 'content' => $error, - 'attributes' => array( - 'class' => 'error' - ) - ); - if ( !empty( $error ) ) { - $this->assertTag( $errorMatch, $output, "Failed to match error: " . $error ); + $this->assertContains( '' . $error . '', $output, + 'Failed to match error: ' . $error ); } } -- To view, visit https://gerrit.wikimedia.org/r/237372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id016edf0cafdb2312299f658856491e08d634c5e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added new "Recreate data" JS handling to extension.json - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged. Change subject: Added new "Recreate data" JS handling to extension.json .. Added new "Recreate data" JS handling to extension.json Change-Id: I8c1f9f3cace0d3e4e33ff8c2a90f95218e1af4b5 --- M extension.json 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/extension.json b/extension.json index 1d11479..90e837a 100644 --- a/extension.json +++ b/extension.json @@ -1,7 +1,7 @@ { "name": "Cargo", "namemsg": "extensionname-cargo", - "version": "0.9", + "version": "0.10-alpha", "author": "Yaron Koren", "url": "https://www.mediawiki.org/wiki/Extension:Cargo";, "descriptionmsg": "cargo-desc", @@ -102,6 +102,15 @@ "styles": "Cargo.css", "position": "top" }, + "ext.cargo.recreatedata": { + "scripts": "libs/ext.cargo.recreatedata.js", + "dependencies": "mediawiki.jqueryMsg", + "messages": [ + "cargo-recreatedata-tablecreated", + "cargo-recreatedata-success" + ], + "position": "top" + }, "ext.cargo.drilldown": { "styles": [ "drilldown/resources/CargoDrilldown.css", -- To view, visit https://gerrit.wikimedia.org/r/237371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c1f9f3cace0d3e4e33ff8c2a90f95218e1af4b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren Gerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added new "Recreate data" JS handling to extension.json - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/237371 Change subject: Added new "Recreate data" JS handling to extension.json .. Added new "Recreate data" JS handling to extension.json Change-Id: I8c1f9f3cace0d3e4e33ff8c2a90f95218e1af4b5 --- M extension.json 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/71/237371/1 diff --git a/extension.json b/extension.json index 1d11479..90e837a 100644 --- a/extension.json +++ b/extension.json @@ -1,7 +1,7 @@ { "name": "Cargo", "namemsg": "extensionname-cargo", - "version": "0.9", + "version": "0.10-alpha", "author": "Yaron Koren", "url": "https://www.mediawiki.org/wiki/Extension:Cargo";, "descriptionmsg": "cargo-desc", @@ -102,6 +102,15 @@ "styles": "Cargo.css", "position": "top" }, + "ext.cargo.recreatedata": { + "scripts": "libs/ext.cargo.recreatedata.js", + "dependencies": "mediawiki.jqueryMsg", + "messages": [ + "cargo-recreatedata-tablecreated", + "cargo-recreatedata-success" + ], + "position": "top" + }, "ext.cargo.drilldown": { "styles": [ "drilldown/resources/CargoDrilldown.css", -- To view, visit https://gerrit.wikimedia.org/r/237371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c1f9f3cace0d3e4e33ff8c2a90f95218e1af4b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining appservers in codfw - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/237370 Change subject: Enable ferm on remaining appservers in codfw .. Enable ferm on remaining appservers in codfw Change-Id: Ia1d74d2b4be4535684b47565c59639870488d98f --- M manifests/site.pp 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/70/237370/1 diff --git a/manifests/site.pp b/manifests/site.pp index 5d6ae73..12ff244 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1957,10 +1957,7 @@ #mw2008-mw2049 are appservers node /^mw20(0[89]|[1-4][0-9])\.codfw\.wmnet$/ { role mediawiki::appserver - -if $::hostname =~ /^mw200[89]$/ { -include base::firewall -} +include base::firewall } #mw2050-2079 are api appservers @@ -1988,6 +1985,7 @@ #mw2090-mw2119 are appservers node /^mw2(09[0-9]|1[0-1][0-9])\.codfw\.wmnet$/ { role mediawiki::appserver +include base::firewall } #mw2120-2147 are api appservers @@ -2013,6 +2011,7 @@ #mw2153-mw2199 are appservers node /^mw21(5[3-9]|[6-9][0-9])\.codfw\.wmnet$/ { role mediawiki::appserver +include base::firewall } #mw2200-2234 are api appservers -- To view, visit https://gerrit.wikimedia.org/r/237370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1d74d2b4be4535684b47565c59639870488d98f 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] Compress js (and other text) in varnish - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/237369 Change subject: Compress js (and other text) in varnish .. Compress js (and other text) in varnish do_gzip will compress content on its way *into* the cache, if the backend didn't already compress it for varnish. It should be harmless for types the backend is already compressing, but it's nice to have the fallback here for content that the backend isn't configured to compress. This regex should cover the most common cases... Bug: T109040 Change-Id: I41453814b7e50cd6e3930eb6bb2d7d2a4ca5b66f --- M modules/varnish/templates/vcl/wikimedia.vcl.erb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/69/237369/1 diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb b/modules/varnish/templates/vcl/wikimedia.vcl.erb index 933d4eb..f2c3aed 100644 --- a/modules/varnish/templates/vcl/wikimedia.vcl.erb +++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb @@ -466,8 +466,8 @@ set beresp.grace = 60m; <% if @vcl_config.fetch("do_gzip", false) -%> - // Compress ico and SVG files - if (beresp.http.content-type ~ "^image/(x-icon|vnd\.microsoft\.icon|svg\+xml)$") { + // Compress compressible things if the backend didn't already + if (beresp.http.content-type ~ "^text/|^image/(x-icon|vnd\.microsoft\.icon)|(xml|html|javascript|json)$") { set beresp.do_gzip = true; } <% end -%> -- To view, visit https://gerrit.wikimedia.org/r/237369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41453814b7e50cd6e3930eb6bb2d7d2a4ca5b66f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add do_gzip to the misc_web cache cluster - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/237367 Change subject: Add do_gzip to the misc_web cache cluster .. Add do_gzip to the misc_web cache cluster Change-Id: I56cafe324299ab114d68274450e256452c86ebe5 --- M modules/role/manifests/cache/misc.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/237367/1 diff --git a/modules/role/manifests/cache/misc.pp b/modules/role/manifests/cache/misc.pp index 892c035..9c00262 100644 --- a/modules/role/manifests/cache/misc.pp +++ b/modules/role/manifests/cache/misc.pp @@ -25,6 +25,7 @@ 'retry5xx' => 1, 'cache4xx' => '1m', 'layer'=> 'frontend', +'do_gzip' => true, 'allowed_methods' => '^(GET|DELETE|HEAD|POST|PURGE|PUT)$', 'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re, }, -- To view, visit https://gerrit.wikimedia.org/r/237367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56cafe324299ab114d68274450e256452c86ebe5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add do_gzip to the maps cache cluster - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/237368 Change subject: Add do_gzip to the maps cache cluster .. Add do_gzip to the maps cache cluster Change-Id: Ice17c0802d90ed02203cb2054865c77c8e023fb3 --- M modules/role/manifests/cache/maps.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/237368/1 diff --git a/modules/role/manifests/cache/maps.pp b/modules/role/manifests/cache/maps.pp index 662e32b..5f1a923 100644 --- a/modules/role/manifests/cache/maps.pp +++ b/modules/role/manifests/cache/maps.pp @@ -37,6 +37,7 @@ $common_vcl_config = { 'cache4xx' => '1m', 'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re, +'do_gzip' => true, } $be_vcl_config = merge($common_vcl_config, { -- To view, visit https://gerrit.wikimedia.org/r/237368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice17c0802d90ed02203cb2054865c77c8e023fb3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: standardize/de-duplicate do_gzip - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/237366 Change subject: varnish: standardize/de-duplicate do_gzip .. varnish: standardize/de-duplicate do_gzip This standardizes our do_gzip stanza across the text, mobile, and upload clusters via wikimedia.vcl.erb. For text and mobile, the net change is that it's applied at both layers instead of just the frontend (more efficient). Upload switches from backend-only to both layers (very little change in practice), and switches from only compressing SVGs to also compressing icons like the others (probably doesn't matter, just better to have everything aligned). Bug: T96847 Change-Id: I66c708c03675f3b976f7deda519daa92b01c8b9d --- M modules/varnish/templates/vcl/wikimedia.vcl.erb M templates/varnish/mobile-frontend.inc.vcl.erb M templates/varnish/text-frontend.inc.vcl.erb M templates/varnish/upload-backend.inc.vcl.erb 4 files changed, 7 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/237366/1 diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb b/modules/varnish/templates/vcl/wikimedia.vcl.erb index 8d989a1..933d4eb 100644 --- a/modules/varnish/templates/vcl/wikimedia.vcl.erb +++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb @@ -465,6 +465,13 @@ <% end -%> set beresp.grace = 60m; +<% if @vcl_config.fetch("do_gzip", false) -%> + // Compress ico and SVG files + if (beresp.http.content-type ~ "^image/(x-icon|vnd\.microsoft\.icon|svg\+xml)$") { + set beresp.do_gzip = true; + } +<% end -%> + /* Function vcl_fetch in <%= @vcl %>.inc.vcl will be appended here */ } diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb b/templates/varnish/mobile-frontend.inc.vcl.erb index f179588..5c73b50 100644 --- a/templates/varnish/mobile-frontend.inc.vcl.erb +++ b/templates/varnish/mobile-frontend.inc.vcl.erb @@ -117,13 +117,6 @@ return (hit_for_pass); } -<% if @vcl_config.fetch("do_gzip", false) -%> - // Compress ico and SVG files - if (beresp.http.content-type ~ "^image/(x-icon|vnd\.microsoft\.icon|svg\+xml)$") { - set beresp.do_gzip = true; - } -<% end -%> - return (deliver); } diff --git a/templates/varnish/text-frontend.inc.vcl.erb b/templates/varnish/text-frontend.inc.vcl.erb index 7cbd0ed..e311212 100644 --- a/templates/varnish/text-frontend.inc.vcl.erb +++ b/templates/varnish/text-frontend.inc.vcl.erb @@ -123,13 +123,6 @@ return (hit_for_pass); } -<% if @vcl_config.fetch("do_gzip", false) -%> - // Compress ico and SVG files - if (beresp.http.content-type ~ "^image/(x-icon|vnd\.microsoft\.icon|svg\+xml)$") { - set beresp.do_gzip = true; - } -<% end -%> - return (deliver); } diff --git a/templates/varnish/upload-backend.inc.vcl.erb b/templates/varnish/upload-backend.inc.vcl.erb index 016ad25..5bad940 100644 --- a/templates/varnish/upload-backend.inc.vcl.erb +++ b/templates/varnish/upload-backend.inc.vcl.erb @@ -64,12 +64,6 @@ set beresp.http.X-MediaWiki-Original = regsub(req.url, "^(/+[^/]+/[^/]+/)thumb/([^/]+/[^/]+/[^/]+).*$", "\1\2"); } -<% if @vcl_config.fetch("do_gzip", false) -%> - if (beresp.http.content-type == "image/svg+xml") { - set beresp.do_gzip = true; - } -<% end -%> - return (deliver); } -- To view, visit https://gerrit.wikimedia.org/r/237366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66c708c03675f3b976f7deda519daa92b01c8b9d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove wikidata cosmetic changes flag in page.py - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove wikidata cosmetic changes flag in page.py .. Remove wikidata cosmetic changes flag in page.py 73273de4 introduced a workaround in page.py to prevent cosmetic changes being activated on Wikidata. At the time, the 'wikidata' family had two sites, 'client' and 'repo'. Since early 2013 with 03e87f2d the code for the production repository changed to 'wikidata', when Wikidata moved to wikidata.org However the code used in the workaround in page.py was not updated, so this workaround has not been effective for over 2.5 years. Change-Id: I85cdfbf39c310279fabd2aea1ddbbb3e3d47e14b --- M pywikibot/families/wikidata_family.py M pywikibot/page.py 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikidata_family.py b/pywikibot/families/wikidata_family.py index 1824a8f..847d655 100644 --- a/pywikibot/families/wikidata_family.py +++ b/pywikibot/families/wikidata_family.py @@ -4,6 +4,7 @@ __version__ = '$Id$' +from pywikibot import config from pywikibot import family # The Wikidata family @@ -31,6 +32,11 @@ '_default': ((u'/doc', ), ['wikidata']), } +# Disable cosmetic changes +config.cosmetic_changes_disable.update({ +'wikidata': ('wikidata', 'test') +}) + def shared_data_repository(self, code, transcluded=False): """ Indicate Wikidata is both a repository and its own client. diff --git a/pywikibot/page.py b/pywikibot/page.py index d284e2c..2ba2b0c 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1123,7 +1123,6 @@ pywikibot.calledModuleName() in config.cosmetic_changes_deny_script: return family = self.site.family.name -config.cosmetic_changes_disable.update({'wikidata': ('repo', )}) if config.cosmetic_changes_mylang_only: cc = ((family == config.family and self.site.lang == config.mylang) or -- To view, visit https://gerrit.wikimedia.org/r/237362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85cdfbf39c310279fabd2aea1ddbbb3e3d47e14b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Require DataModelServices 2.0.1 - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/237364 Change subject: Require DataModelServices 2.0.1 .. Require DataModelServices 2.0.1 ^2.0.1 means... >=2.0.1 <3.0.0 Bug: T112003 Change-Id: I26c6f4d1d510050b96616c87e122dac52e4690ef --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/64/237364/1 diff --git a/composer.json b/composer.json index eed841b..c5316ec 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "wikibase/data-model": "~4.0", "wikibase/data-model-serialization": "~2.0", "wikibase/internal-serialization": "~2.0", - "wikibase/data-model-services": "~2.0", + "wikibase/data-model-services": "^2.0.1", "wikibase/data-model-javascript": "^1.0.2", "wikibase/javascript-api": "~1.0", "wikibase/serialization-javascript": "~2.0", -- To view, visit https://gerrit.wikimedia.org/r/237364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26c6f4d1d510050b96616c87e122dac52e4690ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf22 Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RuboCop setup - change (mediawiki...QuickSurveys)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/237365 Change subject: RuboCop setup .. RuboCop setup RuboCop was updated to the latest version. Basic configuration file was created, according to recommendation at https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_confi guration Bug: T112091 Change-Id: Iac9e3f3a718a57816332e2e0bcc4fd5c74aedcc9 --- A .rubocop.yml M Gemfile M Gemfile.lock 3 files changed, 30 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/65/237365/1 diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 000..84567a5 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,20 @@ +AllCops: + StyleGuideCopsOnly: true + +Metrics/LineLength: + Max: 100 + +Metrics/MethodLength: + Enabled: false + +Style/Alias: + Enabled: false + +Style/SignalException: + Enabled: false + +Style/StringLiterals: + EnforcedStyle: single_quotes + +Style/TrivialAccessors: + ExactNameMatch: true diff --git a/Gemfile b/Gemfile index d459ad2..e0bfe35 100644 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,4 @@ source 'https://rubygems.org' gem 'mediawiki_selenium', '~> 1.5.0' -gem 'rubocop', require: false +gem 'rubocop', '~> 0.34.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 454100a..9e97b98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: -ast (2.0.0) -astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) +ast (2.1.0) +astrolabe (1.3.1) + parser (~> 2.2) builder (3.2.2) childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) @@ -58,9 +58,9 @@ watir-webdriver (>= 0.6.11) page_navigation (0.9) data_magic (>= 0.14) -parser (2.2.0.3) +parser (2.2.2.6) ast (>= 1.1, < 3.0) -powerpack (0.1.0) +powerpack (0.1.1) rainbow (2.0.0) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) @@ -68,13 +68,13 @@ netrc (~> 0.7) rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) -rubocop (0.29.1) +rubocop (0.34.1) astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) + parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) -ruby-progressbar (1.7.1) +ruby-progressbar (1.7.5) rubyzip (1.1.7) selenium-webdriver (2.46.2) childprocess (~> 0.5) @@ -96,4 +96,4 @@ DEPENDENCIES mediawiki_selenium (~> 1.5.0) - rubocop + rubocop (~> 0.34.1) -- To view, visit https://gerrit.wikimedia.org/r/237365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac9e3f3a718a57816332e2e0bcc4fd5c74aedcc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: dev Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove quiet option on Android tests - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove quiet option on Android tests .. Remove quiet option on Android tests When all tests perform well, Gradle's -q option is great to eliminate unnecessary noise and shave a second or two off build times. Unfortunately, tests fail and we need to know why quickly. This patch removes the quiet option from builds, restoring the default verbosity level. For example, prior to this patch, the complete output for a ProGuard failure was: FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':app:proguardAlphaReleaseAndroidTest'. > java.io.IOException: Please correct the above warnings first. * Try: Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. After this patch, the failure will show that it is due to ProGuard warnings and what those warnings are. Change-Id: Ie0805774064b47bbd516094dee84a1075a93691d --- M jjb/mobile.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mholloway: Looks good to me, but someone else must approve Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml index cc35ed1..ef2b8e6 100644 --- a/jjb/mobile.yaml +++ b/jjb/mobile.yaml @@ -36,7 +36,7 @@ builders: - shell: | scripts/missing-qq.py - ./gradlew -q clean checkstyle testAllAlphaRelease + ./gradlew clean checkstyle testAllAlphaRelease publishers: - archive: # Capture generated .apk, ProGuard mappings, checkstyle.xml, and test results -- To view, visit https://gerrit.wikimedia.org/r/237133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0805774064b47bbd516094dee84a1075a93691d Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Niedzielski Gerrit-Reviewer: BearND Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Hashar 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] Adjust width of language code, autonym and count in CXStats - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/237363 Change subject: Adjust width of language code, autonym and count in CXStats .. Adjust width of language code, autonym and count in CXStats * Put the three elements inside one container, to make it possible to adjust their widths independently of the table. * Set widths for the three elements, tested with long codes like be-tarask and map-bms, and with 6-digit translation count. * Reduce font size for the language code, and set ltr direction, to ensure that it aligns correctly and that long codes has less chance of overlapping the autonym on small screns. * Set overflow: hidden for the case long autonyms do become too long on small screens. Bug: T110862 Change-Id: I426c4f7ca9651b63a74bcf8b867a072e4a6eb0f9 --- M modules/stats/ext.cx.stats.js M modules/stats/styles/ext.cx.stats.less 2 files changed, 40 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/63/237363/1 diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js index b0a0245..a6dd339 100644 --- a/modules/stats/ext.cx.stats.js +++ b/modules/stats/ext.cx.stats.js @@ -297,10 +297,10 @@ CXStats.prototype.drawTranslationsChart = function ( direction, status, property ) { var $chart, $bar, translations, $translations, model, i, j, $rows = [], $callout, - $total, $row, width, max = 0, $tail, tailWidth = 0, tail, + $langCode, $autonym, $total, $rowLabelContainer, fmt = mw.language.convertNumber; $chart = $( '' ).addClass( 'cx-stats-chart' ); @@ -379,6 +379,24 @@ content: $callout } ); + $langCode = $( '' ) + .addClass( 'cx-stats-chart__langcode' ) + // Always Latin (like English). + // Make sure it's aligned correctly on all screen sizes. + .prop( { + lang: 'en', + dir: 'ltr' + } ) + .text( model[ i ].language ); + + $autonym = $( '' ) + .addClass( 'cx-stats-chart__autonym' ) + .prop( { + dir: $.uls.data.getDir( model[ i ].language ), + lang: model[ i ].language + } ) + .text( $.uls.data.getAutonym( model[ i ].language ) ); + $total = $( '' ) .addClass( 'cx-stats-chart__total' ) .text( fmt( model[ i ][ property ] ) ); @@ -397,18 +415,17 @@ .addClass( 'cx-stats-chart__total' ) .text( fmt( model[ i ][ property ] ) ); } + + $rowLabelContainer = $( '' ) + .addClass( 'cx-stats-chart__row-label-container' ) + .append( + $langCode, + $autonym, + $total +); + $row.append( - $( '' ) - .addClass( 'cx-stats-chart__langcode' ) - .text( model[ i ].language ), - $( '' ) - .addClass( 'cx-stats-chart__autonym' ) - .prop( { - dir: $.uls.data.getDir( model[ i ].language ), - lang: model[ i ].language - } ) - .text( $.uls.data.getAutonym( model[ i ].language ) ), - $total, + $rowLabelContainer, $translations ); diff --git a/modules/stats/styles/ext.cx.stats.less b/modules/stats/styles/ext.cx.stats.less index 02b43fb..df979a0 100644 --- a/modules/stats/styles/ext.cx.stats.less +++ b/modules/stats/styles/ext.cx.stats.less @@ -93,25 +93,33 @@ } } + &__row-label-container { + .mw-ui-one-quarter; + } + &__langcode { - .mw-ui-one-twelfth; + .mw-ui-one-qu
[MediaWiki-commits] [Gerrit] Move commons category to beta - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Move commons category to beta .. Move commons category to beta Bug: T100717 Change-Id: I2cd815255eb2be655cb20abf95891bb4ae247e1a --- M includes/Resources.php M includes/skins/SkinMinervaAlpha.php M includes/skins/SkinMinervaBeta.php R resources/skins.minerva.beta.scripts/commonsCategory.js 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index bf0a5a2..ec87e99 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1757,6 +1757,10 @@ ), 'scripts' => array( 'resources/skins.minerva.beta.scripts/bannerImage.js', + 'resources/skins.minerva.beta.scripts/commonsCategory.js', + ), + 'messages' => array( + 'mobile-frontend-commons-category-view', ), ), // By mode. This should only ever be loaded in Minerva skin. @@ -1766,13 +1770,9 @@ // Feature modules that should be loaded in alpha should be listed below here. 'mobile.hovercards', ), - 'messages' => array( - 'mobile-frontend-commons-category-view', - ), 'scripts' => array( - 'resources/skins.minerva.alpha.scripts/commonsCategory.js', 'resources/skins.minerva.alpha.scripts/hovercards.js', - ) + ), ), 'tablet.scripts' => $wgMFResourceFileModuleBoilerplate + array( 'dependencies' => array( diff --git a/includes/skins/SkinMinervaAlpha.php b/includes/skins/SkinMinervaAlpha.php index d17f623..df119e7 100644 --- a/includes/skins/SkinMinervaAlpha.php +++ b/includes/skins/SkinMinervaAlpha.php @@ -52,7 +52,6 @@ $vars = parent::getSkinConfigVariables(); $vars['wgMFShowRedLinks'] = true; - $vars['wgMFImagesCategory'] = $this->getOutput()->getProperty( 'wgMFImagesCategory' ); return $vars; } diff --git a/includes/skins/SkinMinervaBeta.php b/includes/skins/SkinMinervaBeta.php index c75982f..dc5f65e 100644 --- a/includes/skins/SkinMinervaBeta.php +++ b/includes/skins/SkinMinervaBeta.php @@ -29,6 +29,7 @@ public function getSkinConfigVariables() { $vars = parent::getSkinConfigVariables(); $vars['wgMFDescription'] = $this->getOutput()->getProperty( 'wgMFDescription' ); + $vars['wgMFImagesCategory'] = $this->getOutput()->getProperty( 'wgMFImagesCategory' ); return $vars; } diff --git a/resources/skins.minerva.alpha.scripts/commonsCategory.js b/resources/skins.minerva.beta.scripts/commonsCategory.js similarity index 100% rename from resources/skins.minerva.alpha.scripts/commonsCategory.js rename to resources/skins.minerva.beta.scripts/commonsCategory.js -- To view, visit https://gerrit.wikimedia.org/r/231412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cd815255eb2be655cb20abf95891bb4ae247e1a Gerrit-PatchSet: 16 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove wikidata cosmetic changes flag in page.py - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/237362 Change subject: Remove wikidata cosmetic changes flag in page.py .. Remove wikidata cosmetic changes flag in page.py 73273de4 introduced a workaround in page.py to prevent cosmetic changes being activated on Wikidata. At the time, the 'wikidata' family had two sites, 'client' and 'repo'. Since early 2013 with 03e87f2d the code for the production repository changed to 'wikidata', when Wikidata moved to wikidata.org However the code used in the workaround in page.py was not updated, so this workaround has not been effective for over 2.5 years. Change-Id: I85cdfbf39c310279fabd2aea1ddbbb3e3d47e14b --- M pywikibot/families/wikidata_family.py M pywikibot/page.py 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/62/237362/1 diff --git a/pywikibot/families/wikidata_family.py b/pywikibot/families/wikidata_family.py index 1824a8f..847d655 100644 --- a/pywikibot/families/wikidata_family.py +++ b/pywikibot/families/wikidata_family.py @@ -4,6 +4,7 @@ __version__ = '$Id$' +from pywikibot import config from pywikibot import family # The Wikidata family @@ -31,6 +32,11 @@ '_default': ((u'/doc', ), ['wikidata']), } +# Disable cosmetic changes +config.cosmetic_changes_disable.update({ +'wikidata': ('wikidata', 'test') +}) + def shared_data_repository(self, code, transcluded=False): """ Indicate Wikidata is both a repository and its own client. diff --git a/pywikibot/page.py b/pywikibot/page.py index d284e2c..2ba2b0c 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1123,7 +1123,6 @@ pywikibot.calledModuleName() in config.cosmetic_changes_deny_script: return family = self.site.family.name -config.cosmetic_changes_disable.update({'wikidata': ('repo', )}) if config.cosmetic_changes_mylang_only: cc = ((family == config.family and self.site.lang == config.mylang) or -- To view, visit https://gerrit.wikimedia.org/r/237362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85cdfbf39c310279fabd2aea1ddbbb3e3d47e14b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining API appservers in codfw - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Enable ferm on remaining API appservers in codfw .. Enable ferm on remaining API appservers in codfw Change-Id: Ic9aae66e4ec7b8fd4e4c4e0d64bd803340efc328 --- M manifests/site.pp 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 9320d45..5d6ae73 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1966,10 +1966,7 @@ #mw2050-2079 are api appservers node /^mw20[5-7][0-9]\.codfw\.wmnet$/ { role mediawiki::appserver::api - -if $::hostname == 'mw2050' { -include base::firewall -} +include base::firewall } # ROW B codfw appservers: mw2080-mw2147 @@ -1996,6 +1993,7 @@ #mw2120-2147 are api appservers node /^mw21([2-3][0-9]|4[0-7])\.codfw\.wmnet$/ { role mediawiki::appserver::api +include base::firewall } # ROW C codfw appservers: mw2148-mw2234 @@ -2020,6 +2018,7 @@ #mw2200-2234 are api appservers node /^mw22([0-2][0-9]|3[0-4])\.codfw\.wmnet$/ { role mediawiki::appserver::api +include base::firewall } # Codfw ldap server, aka ldap-codfw -- To view, visit https://gerrit.wikimedia.org/r/237361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9aae66e4ec7b8fd4e4c4e0d64bd803340efc328 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining API appservers in codfw - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/237361 Change subject: Enable ferm on remaining API appservers in codfw .. Enable ferm on remaining API appservers in codfw Change-Id: Ic9aae66e4ec7b8fd4e4c4e0d64bd803340efc328 --- M manifests/site.pp 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/237361/1 diff --git a/manifests/site.pp b/manifests/site.pp index 9320d45..5d6ae73 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1966,10 +1966,7 @@ #mw2050-2079 are api appservers node /^mw20[5-7][0-9]\.codfw\.wmnet$/ { role mediawiki::appserver::api - -if $::hostname == 'mw2050' { -include base::firewall -} +include base::firewall } # ROW B codfw appservers: mw2080-mw2147 @@ -1996,6 +1993,7 @@ #mw2120-2147 are api appservers node /^mw21([2-3][0-9]|4[0-7])\.codfw\.wmnet$/ { role mediawiki::appserver::api +include base::firewall } # ROW C codfw appservers: mw2148-mw2234 @@ -2020,6 +2018,7 @@ #mw2200-2234 are api appservers node /^mw22([0-2][0-9]|3[0-4])\.codfw\.wmnet$/ { role mediawiki::appserver::api +include base::firewall } # Codfw ldap server, aka ldap-codfw -- To view, visit https://gerrit.wikimedia.org/r/237361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9aae66e4ec7b8fd4e4c4e0d64bd803340efc328 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] Log events using mw#track - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/237360 Change subject: Log events using mw#track .. Log events using mw#track MobileFrontend or, more specifically, anything that invokes the Schema#log method, shouldn't explicitly depend on EventLogging as currently as it's a soft dependency. The EventLoggingHooks::onResourceLoaderRegisterModules documentation recommends that extensions with a soft dependency on EventLogging use mw#track. Change-Id: I9f9195b26e9d99efd2a45b4febbfbdf509c7d15f --- M resources/mobile.startup/Schema.js M tests/qunit/mobile.startup/test_Schema.js 2 files changed, 45 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/60/237360/1 diff --git a/resources/mobile.startup/Schema.js b/resources/mobile.startup/Schema.js index 106981f..4da91ac 100644 --- a/resources/mobile.startup/Schema.js +++ b/resources/mobile.startup/Schema.js @@ -110,23 +110,28 @@ this.defaults = defaults; Class.prototype.initialize.apply( this, arguments ); }, + /** -* Actually log event via EventLogging +* Actually log event via the EventLogging subscriber. +* +* Since we have a soft dependency on the EventLogging extension, we use the +* `mw#track` method to log events to reduce coupling between the two extensions. +* * @method * @param {Object} data to log * @return {jQuery.Deferred} */ log: function ( data ) { - if ( mw.eventLog ) { - // Log event if logging schema is not sampled or if user is in the bucket - if ( !this.isSampled || this._isUserInBucket() ) { - return mw.eventLog.logEvent( this.name, $.extend( {}, this.defaults, data ) ); - } else { - return $.Deferred().reject( 'User not in event sampling bucket.' ); - } - } else { - return $.Deferred().reject( 'EventLogging not installed.' ); + var deferred = $.Deferred(); + + // Log event if logging schema is not sampled or if user is in the bucket + if ( !this.isSampled || this._isUserInBucket() ) { + mw.track( 'event.' + this.name, $.extend( {}, this.defaults, data ) ); + + return deferred.resolve(); } + + return deferred.reject(); }, /** diff --git a/tests/qunit/mobile.startup/test_Schema.js b/tests/qunit/mobile.startup/test_Schema.js index 707aa0a..90d8cd3 100644 --- a/tests/qunit/mobile.startup/test_Schema.js +++ b/tests/qunit/mobile.startup/test_Schema.js @@ -70,4 +70,34 @@ assert.strictEqual( testSchema._isUserInBucket(), false, 'user is not in bucket' ); } ); + QUnit.test( '#log', 2, function ( assert ) { + var schema = new TestSchema(), + event = { + foo: 'bar' + }; + + // Restore Schema#log as we intend to stub the mw#track method. + TestSchema.prototype.log.restore(); + this.sandbox.stub( mw, 'track' ).returns( undefined ); + + schema.log( event ).then( function () { + assert.deepEqual( + [ 'event.test', event ], + mw.track.firstCall.args, + '#log invokes mw#track and immediately resolves' + ); + } ); + + schema.isSampled = true; + this.sandbox.stub( schema, '_isUserInBucket' ).returns( false ); + + schema.log( event ).fail( function () { + assert.strictEqual( + 1, + mw.track.callCount, + '#log doesn\'t invoke mw#track and rejects if the user isn\'t in the bucket.' + ); + } ); + } ); + }( jQuery, mw.mobileFrontend ) ); -- To view, visit https://gerrit.wikimedia.org/r/237360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f9195b26e9d99efd2a45b4febbfbdf509c7d15f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx ___ MediaWiki-commits mailing list MediaWiki
[MediaWiki-commits] [Gerrit] Make commons category non-dependent on infobox experiment - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Make commons category non-dependent on infobox experiment .. Make commons category non-dependent on infobox experiment Changes * Bubble commons category to client * Anchor tag shows when commons category present. Bug: T100717 Change-Id: I2f88eebfec0d7971dff6b6e2b180a6ee8d77f48f --- M i18n/en.json M i18n/qqq.json M includes/MobileFrontend.body.php M includes/MobileFrontend.hooks.php M includes/Resources.php M includes/config/Wikidata.php M includes/skins/SkinMinervaAlpha.php M resources/skins.minerva.alpha.scripts/commonsCategory.js 8 files changed, 91 insertions(+), 8 deletions(-) Approvals: Siebrand: Looks good to me, but someone else must approve Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 9a0c928..af52f3a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -61,6 +61,7 @@ "mobile-frontend-changeslist-ip": "Anonymous user", "mobile-frontend-changeslist-nocomment": "no edit summary", "mobile-frontend-clear-search": "Clear", + "mobile-frontend-commons-category-view": "Images for $1", "mobile-frontend-contribution-summary": "All edits made by {{GENDER:$1|[[Special:UserProfile/$1|$1]]}}", "mobile-frontend-cookies-required": "Cookies are required to switch view modes. Please enable them and try again.", "mobile-frontend-copyright": "Content is available under $1 unless otherwise noted.", diff --git a/i18n/qqq.json b/i18n/qqq.json index ad1ad95..dee1b0e 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -57,6 +57,7 @@ "mobile-frontend-changeslist-ip": "Label used in mobile watchlist/history/recentchanges overview for IP (non-logged-in) edits.\n{{Identical|Anonymous user}}", "mobile-frontend-changeslist-nocomment": "Text to mark an empty edit summary in mobile watchlist/history/recentchanges overview.", "mobile-frontend-clear-search": "Tooltip for clear button that appears when you type into search box.\n{{Identical|Clear}}", + "mobile-frontend-commons-category-view": "Link label, opens images associated with the subject matter.\nParameters:\n$1 - Title of page.", "mobile-frontend-contribution-summary": "Summary text that appears at the top of the [[Special:Contributions]] page for a given username.\n\nParameters:\n* $1 - username", "mobile-frontend-cookies-required": "Error message shown when user attempts to switch site modes and cookies are not enabled.", "mobile-frontend-copyright": "A short sentence explaining that the content of the page is available under a particular license. Parameters:\n* $1 - license name\n'''See also'''\n* {{msg-mw|Copyright}}", diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php index 7ed20bc..28dbe0c 100644 --- a/includes/MobileFrontend.body.php +++ b/includes/MobileFrontend.body.php @@ -64,14 +64,12 @@ } /** -* Returns a short description of a page from Wikidata +* Returns the Wikibase entity associated with a page or null if none exists. * * @param string $item Wikibase id of the page -* @return string|null +* @return mw.wikibase.entity|null */ - public static function getWikibaseDescription( $item ) { - global $wgContLang; - + public static function getWikibaseEntity( $item ) { if ( !class_exists( 'Wikibase\\Client\\WikibaseClient' ) ) { return null; } @@ -83,11 +81,68 @@ $entity = $entityLookup->getEntity( new ItemId( $item ) ); if ( !$entity ) { return null; + } else { + return $entity; } - return $entity->getFingerprint()->getDescription( $wgContLang->getCode() )->getText(); } catch ( Exception $ex ) { // Do nothing, exception mostly due to description being unavailable in needed language + return null; } - return null; + } + + /** +* Returns the value of Wikibase property. Returns null if doesn't exist. +* +* @param string $item Wikibase id of the page +* @param string $property Wikibase property id to retrieve +* @return mixed|null +*/ + public static function getWikibasePropertyValue( $item, $property ) { + $value = null; + $entity = self::getWikibaseEntity( $item ); + + try { + if ( !$entity ) { + return null; + } else { + $statements = $entity->getStatements()->getByPropertyId( +
[MediaWiki-commits] [Gerrit] Enable ferm on remaining job runners in codfw - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Enable ferm on remaining job runners in codfw .. Enable ferm on remaining job runners in codfw Change-Id: I5cae7437deb648ee27c651081ef4a5429761f5d6 --- M manifests/site.pp 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index cb72e4c..9320d45 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1945,6 +1945,7 @@ $ganglia_aggregator = true } role mediawiki::jobrunner +include base::firewall } #mw2007 is a videoscaler @@ -1978,9 +1979,7 @@ $ganglia_aggregator = true } role mediawiki::jobrunner -if $::hostname == 'mw2081' { -include base::firewall -} +include base::firewall } #mw2086-mw2089 are imagescalers -- To view, visit https://gerrit.wikimedia.org/r/237359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cae7437deb648ee27c651081ef4a5429761f5d6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining job runners in codfw - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/237359 Change subject: Enable ferm on remaining job runners in codfw .. Enable ferm on remaining job runners in codfw Change-Id: I5cae7437deb648ee27c651081ef4a5429761f5d6 --- M manifests/site.pp 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/237359/1 diff --git a/manifests/site.pp b/manifests/site.pp index cb72e4c..9320d45 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1945,6 +1945,7 @@ $ganglia_aggregator = true } role mediawiki::jobrunner +include base::firewall } #mw2007 is a videoscaler @@ -1978,9 +1979,7 @@ $ganglia_aggregator = true } role mediawiki::jobrunner -if $::hostname == 'mw2081' { -include base::firewall -} +include base::firewall } #mw2086-mw2089 are imagescalers -- To view, visit https://gerrit.wikimedia.org/r/237359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cae7437deb648ee27c651081ef4a5429761f5d6 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] cassandra: fail on missing CA/cert subject - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: cassandra: fail on missing CA/cert subject .. cassandra: fail on missing CA/cert subject Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c --- M modules/cassandra/files/cassandra-ca-mgr 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/cassandra/files/cassandra-ca-mgr b/modules/cassandra/files/cassandra-ca-mgr index b76f8fe..4f55a5d 100755 --- a/modules/cassandra/files/cassandra-ca-mgr +++ b/modules/cassandra/files/cassandra-ca-mgr @@ -133,7 +133,7 @@ self.crt = os.path.join(self.base, name, "%s.crt" % name) self.password = password self.size = size -self.subject = KeytoolSubject(self.name, **cert) +self.subject = KeytoolSubject(self.name, **cert["subject"]) self.valid = int(cert.get("valid", 365)) mkdirs(os.path.join(self.base, name)) @@ -247,7 +247,7 @@ self.truststore = os.path.join(self.base, "truststore") self.key = key self.password = password -self.subject = OpensslSubject(name, **(kwargs.get("subject", dict( +self.subject = OpensslSubject(name, **kwargs["subject"]) self.valid = int(kwargs.get("valid", 365)) def generate(self): -- To view, visit https://gerrit.wikimedia.org/r/237358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi Gerrit-Reviewer: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: fail on missing CA/cert subject - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/237358 Change subject: cassandra: fail on missing CA/cert subject .. cassandra: fail on missing CA/cert subject Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c --- M modules/cassandra/files/cassandra-ca-mgr 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/237358/1 diff --git a/modules/cassandra/files/cassandra-ca-mgr b/modules/cassandra/files/cassandra-ca-mgr index b76f8fe..4f55a5d 100755 --- a/modules/cassandra/files/cassandra-ca-mgr +++ b/modules/cassandra/files/cassandra-ca-mgr @@ -133,7 +133,7 @@ self.crt = os.path.join(self.base, name, "%s.crt" % name) self.password = password self.size = size -self.subject = KeytoolSubject(self.name, **cert) +self.subject = KeytoolSubject(self.name, **cert["subject"]) self.valid = int(cert.get("valid", 365)) mkdirs(os.path.join(self.base, name)) @@ -247,7 +247,7 @@ self.truststore = os.path.join(self.base, "truststore") self.key = key self.password = password -self.subject = OpensslSubject(name, **(kwargs.get("subject", dict( +self.subject = OpensslSubject(name, **kwargs["subject"]) self.valid = int(kwargs.get("valid", 365)) def generate(self): -- To view, visit https://gerrit.wikimedia.org/r/237358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia787f5d8682cae72559634e20b3b360c138f5e5c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining image scalers in codfw - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Enable ferm on remaining image scalers in codfw .. Enable ferm on remaining image scalers in codfw Change-Id: I2875dd7986dc61fe1ecf8ebfedc7cffedeb26989 --- M manifests/site.pp 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index de85e9e..cb72e4c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1986,9 +1986,7 @@ #mw2086-mw2089 are imagescalers node /^mw208[6-9]\.codfw\.wmnet$/ { role mediawiki::imagescaler -if $::hostname == 'mw2086' { -include base::firewall -} +include base::firewall } #mw2090-mw2119 are appservers @@ -2006,6 +2004,7 @@ #mw2148-mw2151 are imagescalers node /^mw21(4[89]|5[01])\.codfw\.wmnet$/ { role mediawiki::imagescaler +include base::firewall } #mw2152 is a videoscaler -- To view, visit https://gerrit.wikimedia.org/r/237355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2875dd7986dc61fe1ecf8ebfedc7cffedeb26989 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Always throw TermLookupException in EntityInfoTermLookup - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/237357 Change subject: Always throw TermLookupException in EntityInfoTermLookup .. Always throw TermLookupException in EntityInfoTermLookup Have the getLabel and getDescription methods delegate to getLabels and getDescriptions, which handles the OutOfBoundsException and then throws TermLookupException. @todo add tests for this Bug: T112003 Change-Id: Iff176d6ac834ca6138425e47ae0d101e436b276b --- M lib/includes/store/EntityInfoTermLookup.php 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/57/237357/1 diff --git a/lib/includes/store/EntityInfoTermLookup.php b/lib/includes/store/EntityInfoTermLookup.php index 951acf7..8feb0db 100644 --- a/lib/includes/store/EntityInfoTermLookup.php +++ b/lib/includes/store/EntityInfoTermLookup.php @@ -42,24 +42,24 @@ * @return string|null */ public function getLabel( EntityId $entityId, $languageCode ) { - try { - return $this->entityInfo->getLabel( $entityId, $languageCode ); - } catch ( \OutOfBoundsException $ex ) { - throw new TermLookupException( $entityId, array( $languageCode ), $ex->getMessage(), $ex ); - } + return $this->getLabels( $entityId, array( $languageCode ) ); } /** * Gets all labels of an Entity with the specified EntityId. * * @param EntityId $entityId -* @param string[] $languages +* @param string[] $languageCodes * * @throws TermLookupException * @return string[] */ - public function getLabels( EntityId $entityId, array $languages ) { - return $this->entityInfo->getLabels( $entityId, $languages ); + public function getLabels( EntityId $entityId, array $languageCodes ) { + try { + return $this->entityInfo->getLabels( $entityId, $languageCodes ); + } catch ( \OutOfBoundsException $ex ) { + throw new TermLookupException( $entityId, $languageCodes, $ex->getMessage(), $ex ); + } } /** @@ -72,24 +72,24 @@ * @return string|null */ public function getDescription( EntityId $entityId, $languageCode ) { - try { - return $this->entityInfo->getDescription( $entityId, $languageCode ); - } catch ( \OutOfBoundsException $ex ) { - throw new TermLookupException( $entityId, array( $languageCode ), $ex->getMessage(), $ex ); - } + return $this->getDescription( $entityId, array( $languageCode ) ); } /** * Gets all descriptions of an Entity with the specified EntityId. * * @param EntityId $entityId -* @param string[] $languages +* @param string[] $languageCodes * * @throws TermLookupException * @return string[] */ - public function getDescriptions( EntityId $entityId, array $languages ) { - return $this->entityInfo->getDescriptions( $entityId, $languages ); + public function getDescriptions( EntityId $entityId, array $languageCodes ) { + try { + return $this->entityInfo->getDescriptions( $entityId, $languageCodes ); + } catch ( \OutOfBoundsException $ex ) { + throw new TermLookupException( $entityId, $languageCodes, $ex->getMessage(), $ex ); + } } } -- To view, visit https://gerrit.wikimedia.org/r/237357 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff176d6ac834ca6138425e47ae0d101e436b276b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable the second video scaler in codfw - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Enable the second video scaler in codfw .. Enable the second video scaler in codfw Change-Id: I37eae277fb7da6365ffdf63753626cd252f59746 --- M manifests/site.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 7a6009f..de85e9e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2011,6 +2011,7 @@ #mw2152 is a videoscaler node 'mw2152.codfw.wmnet' { role mediawiki::videoscaler +include base::firewall } #mw2153-mw2199 are appservers -- To view, visit https://gerrit.wikimedia.org/r/237354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37eae277fb7da6365ffdf63753626cd252f59746 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Require DataModelServices 2.0.1 - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/237356 Change subject: Require DataModelServices 2.0.1 .. Require DataModelServices 2.0.1 ^2.0.1 means... >=2.0.1 <3.0.0 Bug: T112003 Change-Id: I26c6f4d1d510050b96616c87e122dac52e4690ef --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/56/237356/1 diff --git a/composer.json b/composer.json index 59ce53c..301bc55 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "wikibase/data-model": "~4.0", "wikibase/data-model-serialization": "~2.0", "wikibase/internal-serialization": "~2.0", - "wikibase/data-model-services": "~2.0", + "wikibase/data-model-services": "^2.0.1", "wikibase/data-model-javascript": "^1.0.2", "wikibase/javascript-api": "~1.0", "wikibase/serialization-javascript": "~2.0", -- To view, visit https://gerrit.wikimedia.org/r/237356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26c6f4d1d510050b96616c87e122dac52e4690ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mocking of Serializable class in PHP 5.5+ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Fix mocking of Serializable class in PHP 5.5+ .. Fix mocking of Serializable class in PHP 5.5+ Since I3a42a2a883e8eef900eeb02355fc3b064411f642, Message is serializable, which breaks mocking it without calling the constructor due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/171. Change-Id: I837b1860c03b7b51ca495b74fafcd97d45c1306e --- M lib/tests/phpunit/formatters/MessageSnakFormatterTest.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php b/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php index 225ee0d..fa8a704 100644 --- a/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php +++ b/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php @@ -36,7 +36,7 @@ */ private function getFormatter( $snakType, $format ) { $message = $this->getMockBuilder( 'Message' ) - ->disableOriginalConstructor() + ->setConstructorArgs( array( 'message') ) ->getMock(); foreach ( array( 'parse', 'text', 'plain' ) as $method ) { -- To view, visit https://gerrit.wikimedia.org/r/237332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I837b1860c03b7b51ca495b74fafcd97d45c1306e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang Gerrit-Reviewer: Adrian Lang Gerrit-Reviewer: Aude Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ferm on remaining image scalers in codfw - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/237355 Change subject: Enable ferm on remaining image scalers in codfw .. Enable ferm on remaining image scalers in codfw Change-Id: I2875dd7986dc61fe1ecf8ebfedc7cffedeb26989 --- M manifests/site.pp 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/237355/1 diff --git a/manifests/site.pp b/manifests/site.pp index 7a6009f..62d8449 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1986,9 +1986,7 @@ #mw2086-mw2089 are imagescalers node /^mw208[6-9]\.codfw\.wmnet$/ { role mediawiki::imagescaler -if $::hostname == 'mw2086' { -include base::firewall -} +include base::firewall } #mw2090-mw2119 are appservers @@ -2006,6 +2004,7 @@ #mw2148-mw2151 are imagescalers node /^mw21(4[89]|5[01])\.codfw\.wmnet$/ { role mediawiki::imagescaler +include base::firewall } #mw2152 is a videoscaler -- To view, visit https://gerrit.wikimedia.org/r/237355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2875dd7986dc61fe1ecf8ebfedc7cffedeb26989 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] Enable the second video scaler in codfw - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/237354 Change subject: Enable the second video scaler in codfw .. Enable the second video scaler in codfw Change-Id: I37eae277fb7da6365ffdf63753626cd252f59746 --- M manifests/site.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/237354/1 diff --git a/manifests/site.pp b/manifests/site.pp index 7a6009f..de85e9e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2011,6 +2011,7 @@ #mw2152 is a videoscaler node 'mw2152.codfw.wmnet' { role mediawiki::videoscaler +include base::firewall } #mw2153-mw2199 are appservers -- To view, visit https://gerrit.wikimedia.org/r/237354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37eae277fb7da6365ffdf63753626cd252f59746 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] Pass baserevid to wbeditentity - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/237353 Change subject: Pass baserevid to wbeditentity .. Pass baserevid to wbeditentity 436ccf2e introduced DataSite.editEntity with a restricted list of parameters that could be passed to wbgetentities, not including legal parameter baserevid, and implemented WikibasePage.editEntity with baserevid being passed to DataSite.editEntity. As a result, baserevid has been silently discarded. Add a warning when a parameter is ignored. Change-Id: I38b305189a0a6fa437a78fed0118562348b1ac3d --- M pywikibot/site.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/53/237353/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index 72d69a3..d494a98 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6492,8 +6492,11 @@ params['baserevid'] = kwargs['baserevid'] params['token'] = self.tokens['edit'] for arg in kwargs: -if arg in ['clear', 'data', 'exclude', 'summary']: +if arg in ['clear', 'data', 'exclude', 'summary', 'baserevid']: params[arg] = kwargs[arg] +else: +warn('Unknown wbeditentity parameter {0} ignored'.format(arg), + UserWarning, 2) params['data'] = json.dumps(data) req = self._simple_request(**params) data = req.submit() -- To view, visit https://gerrit.wikimedia.org/r/237353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38b305189a0a6fa437a78fed0118562348b1ac3d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.uls from upstream .. Update jquery.uls from upstream Update to https://github.com/wikimedia/jquery.uls/commit/69c9a4d459b8ebab67046c62ec51949d48ef1400 Changes: * Added localization for: ** Livvi-Karelian (olo) ** Shan (shn) ** Albanian (sq) * Localization updates for other languages * Add Livvi-Karelian (olo) to langdb * Update langdb with CLDR supplemental data Change-Id: Ied54d9ed73e5883baa269936a3f1cea5aa931428 --- M lib/jquery.uls/i18n/bs.json M lib/jquery.uls/i18n/hr.json M lib/jquery.uls/i18n/krc.json M lib/jquery.uls/i18n/mzn.json A lib/jquery.uls/i18n/olo.json A lib/jquery.uls/i18n/shn.json A lib/jquery.uls/i18n/sq.json M lib/jquery.uls/i18n/zh-hans.json M lib/jquery.uls/src/jquery.uls.data.js 9 files changed, 79 insertions(+), 8 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.uls/i18n/bs.json b/lib/jquery.uls/i18n/bs.json index 7394218..dcc90b4 100644 --- a/lib/jquery.uls/i18n/bs.json +++ b/lib/jquery.uls/i18n/bs.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "DzWiki", - "Edinwiki" + "Edinwiki", + "Srdjan m" ] }, "uls-select-language": "Izaberite jezik", @@ -17,6 +18,6 @@ "uls-no-results-found": "Nema pronađenih rezultata", "uls-common-languages": "Prijedlozi za jezik", "uls-no-results-suggestion-title": "Možda vas interesuje:", - "uls-search-help": "Možete da tražite po imenu jezika ili pisma, po ISO kodu jezika ili po regionu:", + "uls-search-help": "Možete da tražite po imenu jezika ili pisma, po ISO kodu jezika ili po regionu.", "uls-search-placeholder": "Pretraga jezika" } diff --git a/lib/jquery.uls/i18n/hr.json b/lib/jquery.uls/i18n/hr.json index 352389a..93bc525 100644 --- a/lib/jquery.uls/i18n/hr.json +++ b/lib/jquery.uls/i18n/hr.json @@ -1,17 +1,22 @@ { "@metadata": { "authors": [ - "MaGa" + "MaGa", + "Teoo3" ] }, + "uls-select-language": "Odaberite jezik", "uls-region-WW": "Svjetski jezici", "uls-region-SP": "Posebno", "uls-region-AM": "Amerika", "uls-region-AF": "Afrika", "uls-region-EU": "Europa", "uls-region-AS": "Azija", - "uls-region-ME": "Srednji istok", + "uls-region-ME": "Bliski istok", "uls-region-PA": "Pacifik", + "uls-no-results-found": "Nema rezultata", "uls-common-languages": "Najčešći jezici", + "uls-no-results-suggestion-title": "Možda ste zainteresirani za:", + "uls-search-help": "Možete tražiti prema nazivu jezika, pisma, ISO kôdu jezika ili možete pretražiti po regiji.", "uls-search-placeholder": "Pretraga jezika" } diff --git a/lib/jquery.uls/i18n/krc.json b/lib/jquery.uls/i18n/krc.json index 7f2b03e..4ddf3da 100644 --- a/lib/jquery.uls/i18n/krc.json +++ b/lib/jquery.uls/i18n/krc.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Iltever" + "Iltever", + "Ernác" ] }, "uls-select-language": "Тил сайлау", diff --git a/lib/jquery.uls/i18n/mzn.json b/lib/jquery.uls/i18n/mzn.json index fd929bf..c3a514a 100644 --- a/lib/jquery.uls/i18n/mzn.json +++ b/lib/jquery.uls/i18n/mzn.json @@ -16,6 +16,6 @@ "uls-no-results-found": "هچّی پیدا نیّه", "uls-common-languages": "رایج زوونون", "uls-no-results-suggestion-title": "شاید دوست دارین:", - "uls-search-help": "شما بتونّی زوون نوم، اسکریپ نوم، زوونِ استانداردِ کد یا ونه منطقه جه شه دِلِوستِ زوون ره پیدا هاکنین:", + "uls-search-help": "شما بتونّی زوون نوم، اسکریپ نوم، زوونِ استانداردِ کد یا ونه منطقه جه شه دِلِوستِ زوون ره پیدا هاکنین.", "uls-search-placeholder": "زوونِ جستجو" } diff --git a/lib/jquery.uls/i18n/olo.json b/lib/jquery.uls/i18n/olo.json new file mode 100644 index 000..f54b1e5 --- /dev/null +++ b/lib/jquery.uls/i18n/olo.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Ilja.mos" + ] + }, + "uls-select-language": "Valliče kieli", + "uls-region-WW": "Muailman lajuine", + "uls-region-SP": "Erikoine", + "uls-region-AM": "Amerikku", + "uls-region-AF": "Afriekku", + "uls-region-EU": "Jevrouppu", + "uls-region-AS": "Aazii", + "uls-region-ME": "Lähi-idä", + "uls-region-PA": "Okeanii", + "uls-no-results-found": "Ei löydynyh tuloksii", + "uls-common-languages": "Automuattizesti vallitut kielet", + "uls-no-results-suggestion-title": "Voit olla kiinnostunnuh nämmis kielis:", +
[MediaWiki-commits] [Gerrit] Replace use of gmdate with wfTimestamp - change (mediawiki...WhosOnline)
jenkins-bot has submitted this change and it was merged. Change subject: Replace use of gmdate with wfTimestamp .. Replace use of gmdate with wfTimestamp Change-Id: Id9be5d636c04b9500f153531abb660af3644f90d --- M WhosOnlineSpecialPage.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/WhosOnlineSpecialPage.php b/WhosOnlineSpecialPage.php index ef5f7e3..c1c9670 100644 --- a/WhosOnlineSpecialPage.php +++ b/WhosOnlineSpecialPage.php @@ -113,7 +113,7 @@ $db = wfGetDB( DB_MASTER ); $db->selectDB( $wgDBname ); - $old = gmdate( 'YmdHis', time() - 3600 ); + $old = wfTimestamp( TS_MW, time() - 3600 ); $db->delete( 'online', array( 'timestamp < "' . $old . '"' ), __METHOD__ ); $this->setHeaders(); -- To view, visit https://gerrit.wikimedia.org/r/175013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9be5d636c04b9500f153531abb660af3644f90d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WhosOnline Gerrit-Branch: master Gerrit-Owner: Southparkfan Gerrit-Reviewer: Addshore Gerrit-Reviewer: Qgil Gerrit-Reviewer: Southparkfan Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some extension breaking regression - change (mediawiki...Git2Pages)
jenkins-bot has submitted this change and it was merged. Change subject: Fix some extension breaking regression .. Fix some extension breaking regression An earlier changeset by me, (https://gerrit.wikimedia.org/r/#/c/192373/) accidentally removed a dollar character, and I made a realpath fail. Change-Id: Ic3d1efc077cb559f77af3d2970a34cb6ee5767ae --- M GitRepository.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/GitRepository.php b/GitRepository.php index eb58b1d..8e3d189 100644 --- a/GitRepository.php +++ b/GitRepository.php @@ -67,7 +67,7 @@ wfShellExec( 'git remote add -f origin ' . wfEscapeShellArg( $url ) ); wfShellExec( 'git config core.sparsecheckout true' ); wfShellExec( 'touch ' . wfEscapeShellArg( $sparseCheckoutFile ) ); - wfShellExec( 'echo ' . wfEscapeShellArg( $checkoutItem ) . ' >> ' . wfEscapeShellArg( sparseCheckoutFile ) ); + wfShellExec( 'echo ' . wfEscapeShellArg( $checkoutItem ) . ' >> ' . wfEscapeShellArg( $sparseCheckoutFile ) ); wfShellExec( 'git pull ' . wfEscapeShellArg( $url ) . ' ' . wfEscapeShellArg( $branch ) ); wfDebug( 'GitRepository: Sparse checkout subdirectory' ); chdir( $oldDir ); @@ -100,7 +100,7 @@ $filePath = $gitFolder . DIRECTORY_SEPARATOR . $filename; # Throw an exception if $gitFolder doesn't look like a folder - if ( strcmp( $gitFolder, realpath( $filePath ) ) !== 0 ) { + if ( strcmp( $gitFolder, realpath( $gitFolder ) ) !== 0 ) { throw new Exception( 'The parameter "$gitFolder" does not seem to be a folder.' ); } -- To view, visit https://gerrit.wikimedia.org/r/237260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3d1efc077cb559f77af3d2970a34cb6ee5767ae Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Git2Pages Gerrit-Branch: master Gerrit-Owner: Southparkfan Gerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/237352 Change subject: Update jquery.uls from upstream .. Update jquery.uls from upstream Update to https://github.com/wikimedia/jquery.uls/commit/69c9a4d459b8ebab67046c62ec51949d48ef1400 Changes: * Added localization for: ** Livvi-Karelian (olo) ** Shan (shn) ** Albanian (sq) * Add Livvi-Karelian (olo) to langdb * Update langdb with CLDR supplemental data Change-Id: Ied54d9ed73e5883baa269936a3f1cea5aa931428 --- M lib/jquery.uls/i18n/bs.json M lib/jquery.uls/i18n/hr.json M lib/jquery.uls/i18n/krc.json M lib/jquery.uls/i18n/mzn.json A lib/jquery.uls/i18n/olo.json A lib/jquery.uls/i18n/shn.json A lib/jquery.uls/i18n/sq.json M lib/jquery.uls/i18n/zh-hans.json M lib/jquery.uls/src/jquery.uls.data.js 9 files changed, 79 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/52/237352/1 diff --git a/lib/jquery.uls/i18n/bs.json b/lib/jquery.uls/i18n/bs.json index 7394218..dcc90b4 100644 --- a/lib/jquery.uls/i18n/bs.json +++ b/lib/jquery.uls/i18n/bs.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "DzWiki", - "Edinwiki" + "Edinwiki", + "Srdjan m" ] }, "uls-select-language": "Izaberite jezik", @@ -17,6 +18,6 @@ "uls-no-results-found": "Nema pronađenih rezultata", "uls-common-languages": "Prijedlozi za jezik", "uls-no-results-suggestion-title": "Možda vas interesuje:", - "uls-search-help": "Možete da tražite po imenu jezika ili pisma, po ISO kodu jezika ili po regionu:", + "uls-search-help": "Možete da tražite po imenu jezika ili pisma, po ISO kodu jezika ili po regionu.", "uls-search-placeholder": "Pretraga jezika" } diff --git a/lib/jquery.uls/i18n/hr.json b/lib/jquery.uls/i18n/hr.json index 352389a..93bc525 100644 --- a/lib/jquery.uls/i18n/hr.json +++ b/lib/jquery.uls/i18n/hr.json @@ -1,17 +1,22 @@ { "@metadata": { "authors": [ - "MaGa" + "MaGa", + "Teoo3" ] }, + "uls-select-language": "Odaberite jezik", "uls-region-WW": "Svjetski jezici", "uls-region-SP": "Posebno", "uls-region-AM": "Amerika", "uls-region-AF": "Afrika", "uls-region-EU": "Europa", "uls-region-AS": "Azija", - "uls-region-ME": "Srednji istok", + "uls-region-ME": "Bliski istok", "uls-region-PA": "Pacifik", + "uls-no-results-found": "Nema rezultata", "uls-common-languages": "Najčešći jezici", + "uls-no-results-suggestion-title": "Možda ste zainteresirani za:", + "uls-search-help": "Možete tražiti prema nazivu jezika, pisma, ISO kôdu jezika ili možete pretražiti po regiji.", "uls-search-placeholder": "Pretraga jezika" } diff --git a/lib/jquery.uls/i18n/krc.json b/lib/jquery.uls/i18n/krc.json index 7f2b03e..4ddf3da 100644 --- a/lib/jquery.uls/i18n/krc.json +++ b/lib/jquery.uls/i18n/krc.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Iltever" + "Iltever", + "Ernác" ] }, "uls-select-language": "Тил сайлау", diff --git a/lib/jquery.uls/i18n/mzn.json b/lib/jquery.uls/i18n/mzn.json index fd929bf..c3a514a 100644 --- a/lib/jquery.uls/i18n/mzn.json +++ b/lib/jquery.uls/i18n/mzn.json @@ -16,6 +16,6 @@ "uls-no-results-found": "هچّی پیدا نیّه", "uls-common-languages": "رایج زوونون", "uls-no-results-suggestion-title": "شاید دوست دارین:", - "uls-search-help": "شما بتونّی زوون نوم، اسکریپ نوم، زوونِ استانداردِ کد یا ونه منطقه جه شه دِلِوستِ زوون ره پیدا هاکنین:", + "uls-search-help": "شما بتونّی زوون نوم، اسکریپ نوم، زوونِ استانداردِ کد یا ونه منطقه جه شه دِلِوستِ زوون ره پیدا هاکنین.", "uls-search-placeholder": "زوونِ جستجو" } diff --git a/lib/jquery.uls/i18n/olo.json b/lib/jquery.uls/i18n/olo.json new file mode 100644 index 000..f54b1e5 --- /dev/null +++ b/lib/jquery.uls/i18n/olo.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Ilja.mos" + ] + }, + "uls-select-language": "Valliče kieli", + "uls-region-WW": "Muailman lajuine", + "uls-region-SP": "Erikoine", + "uls-region-AM": "Amerikku", + "uls-region-AF": "Afriekku", + "uls-region-EU": "Jevrouppu", + "uls-region-AS": "Aazii", + "uls-region-ME": "Lähi-idä", + "uls-region-PA": "Okeanii", + "uls-no-results-found": "Ei löydynyh tuloksii", + "uls-common-languages": "Automuattizesti vallitut kielet", + "uls-no-results-suggestion-title": "Voit olla kiinnostunn
[MediaWiki-commits] [Gerrit] install_server: provision restbase-test2 with standard 2-dis... - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: install_server: provision restbase-test2 with standard 2-disk raid .. install_server: provision restbase-test2 with standard 2-disk raid Change-Id: Iade6b895d002b1d534cf3bff25e148bcf9788d73 --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 216df53..c257857 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -105,7 +105,7 @@ rdb100[1-4]) echo partman/mw.cfg ;; \ restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \ restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \ - restbase-test2*) echo partman/raid1.cfg ;; \ + restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \ rhenium) echo partman/raid1-gpt.cfg ;; \ snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \ stat1002) echo partman/lvm-noraid-large.a.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/237351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iade6b895d002b1d534cf3bff25e148bcf9788d73 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi Gerrit-Reviewer: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install_server: provision restbase-test2 with standard 2-dis... - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/237351 Change subject: install_server: provision restbase-test2 with standard 2-disk raid .. install_server: provision restbase-test2 with standard 2-disk raid Change-Id: Iade6b895d002b1d534cf3bff25e148bcf9788d73 --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/237351/1 diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 216df53..c257857 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -105,7 +105,7 @@ rdb100[1-4]) echo partman/mw.cfg ;; \ restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \ restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \ - restbase-test2*) echo partman/raid1.cfg ;; \ + restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \ rhenium) echo partman/raid1-gpt.cfg ;; \ snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \ stat1002) echo partman/lvm-noraid-large.a.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/237351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iade6b895d002b1d534cf3bff25e148bcf9788d73 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix toggling Flow to false in BetaFeatures (opt-out) - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/237350 Change subject: Fix toggling Flow to false in BetaFeatures (opt-out) .. Fix toggling Flow to false in BetaFeatures (opt-out) The problem seems to have been that when opting in, the workflow was associated with the page we just moved out of the way instead of with the new page. As a result, when trying to opt-out, it couldn't locate the workflow associated with the board, because it was tied to the wrong page to begin with. Bug: T111830 Change-Id: Ic30ebdf1681bd8bd1b313e4a5ea738f03fee01ea --- M Hooks.php M includes/Import/OptInController.php 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/50/237350/1 diff --git a/Hooks.php b/Hooks.php index 75b756f..8edbb3b 100644 --- a/Hooks.php +++ b/Hooks.php @@ -1566,7 +1566,7 @@ } /** -* Occurs at the begining of the MovePage process. Perhaps ContentModel should be +* Occurs at the beginning of the MovePage process. Perhaps ContentModel should be * extended to be notified about moves explicitly. */ public static function onTitleMove( Title $oldTitle, Title $newTitle, User $user ) { diff --git a/includes/Import/OptInController.php b/includes/Import/OptInController.php index 0a498f7..b55514a 100644 --- a/includes/Import/OptInController.php +++ b/includes/Import/OptInController.php @@ -236,6 +236,14 @@ $this->fatal( 'flow-special-enableflow-board-creation-not-allowed', $page ); } + // $title was recently moved, but the article ID is cached inside + // the Title object. Let's make sure it accurately reflects that + // $title now doesn't exist by forcefully re-fetching the non- + // existing article ID. + // Otherwise, we run the risk of the Workflow we're creating being + // associated with the page we just moved. + $title->getArticleID( Title::GAID_FOR_UPDATE ); + $loader = $loaderFactory->createWorkflowLoader( $title ); $blocks = $loader->getBlocks(); -- To view, visit https://gerrit.wikimedia.org/r/237350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic30ebdf1681bd8bd1b313e4a5ea738f03fee01ea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add must_be to DataSite write actions - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add must_be to DataSite write actions .. Add must_be to DataSite write actions Change-Id: Ib766760db53388216a064d708952a969f2f2d931 --- M pywikibot/site.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 5e6dcc2..8740d37 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6736,6 +6736,7 @@ data = req.submit() return data +@must_be(group='user') def linkTitles(self, page1, page2, bot=True): """ Link two pages together. @@ -6762,6 +6763,7 @@ data = req.submit() return data +@must_be(group='user') def mergeItems(self, fromItem, toItem, **kwargs): """ Merge two items together. @@ -6785,6 +6787,7 @@ data = req.submit() return data +@must_be(group='user') def set_redirect_target(self, from_item, to_item): """ Make a redirect to another item. @@ -6804,6 +6807,7 @@ data = req.submit() return data +@must_be(group='user') def createNewItemFromPage(self, page, bot=True, **kwargs): """ Create a new Wikibase item for a provided page. -- To view, visit https://gerrit.wikimedia.org/r/237294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib766760db53388216a064d708952a969f2f2d931 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: XZise Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Readers: Fixed i18n - change (mediawiki...BlueSpiceExtensions)
Dvogel hallowelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/237348 Change subject: Readers: Fixed i18n .. Readers: Fixed i18n Added new i18n entry for grid column. Change-Id: I3ea463af6ebc9e259418bf691ed9422ae5a1410d --- M Readers/Readers.setup.php M Readers/i18n/de.json M Readers/i18n/en.json M Readers/i18n/qqq.json M Readers/resources/BS.Readers/PathPanel.js 5 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/48/237348/1 diff --git a/Readers/Readers.setup.php b/Readers/Readers.setup.php index c2eeb6e..17f8714 100644 --- a/Readers/Readers.setup.php +++ b/Readers/Readers.setup.php @@ -52,8 +52,8 @@ ), 'position' => 'bottom', 'messages' => array( - 'bs-readers-header-username', 'bs-readers-header-readerspath', - 'bs-readers-header-ts' + 'bs-readers-header-ts', + 'bs-readers-header-page' ) ) + $aResourceModuleTemplate; \ No newline at end of file diff --git a/Readers/i18n/de.json b/Readers/i18n/de.json index fc96f46..e5d6425 100644 --- a/Readers/i18n/de.json +++ b/Readers/i18n/de.json @@ -17,5 +17,6 @@ "bs-readers-emptyinput": "Du musste einen Seite angeben.", "bs-readers-header-username": "Benutzername", "bs-readers-header-readerspath": "Leser", - "bs-readers-header-ts": "Datum" + "bs-readers-header-ts": "Datum", + "bs-readers-header-page": "Seite" } diff --git a/Readers/i18n/en.json b/Readers/i18n/en.json index c184938..8c473c4 100644 --- a/Readers/i18n/en.json +++ b/Readers/i18n/en.json @@ -16,5 +16,6 @@ "bs-readers-emptyinput": "No page has been provided.", "bs-readers-header-username": "Username", "bs-readers-header-readerspath": "Reader", - "bs-readers-header-ts": "Date" + "bs-readers-header-ts": "Date", + "bs-readers-header-page": "Page" } diff --git a/Readers/i18n/qqq.json b/Readers/i18n/qqq.json index 7668500..4f729d7 100644 --- a/Readers/i18n/qqq.json +++ b/Readers/i18n/qqq.json @@ -19,5 +19,6 @@ "bs-readers-emptyinput": "Error text on special page for no page has been provided.", "bs-readers-header-username": "Column headline for username\n{{Identical|Username}}", "bs-readers-header-readerspath": "Used on special page, headline for reader\n{{Identical|Reader}}", - "bs-readers-header-ts": "Column headline for \"time and date\".\n{{Identical|Date}}" + "bs-readers-header-ts": "Column headline for \"time and date\".\n{{Identical|Date}}", + "bs-readers-header-page": "Column headline for wikipage title\n{{Identical|Page}}" } diff --git a/Readers/resources/BS.Readers/PathPanel.js b/Readers/resources/BS.Readers/PathPanel.js index 3709e4c..ea7101d 100644 --- a/Readers/resources/BS.Readers/PathPanel.js +++ b/Readers/resources/BS.Readers/PathPanel.js @@ -38,7 +38,7 @@ this.colPage = Ext.create( 'Ext.grid.column.Template', { id: 'pvpage', - header: mw.message( 'bs-readers-header-username' ).plain(), + header: mw.message( 'bs-readers-header-page' ).plain(), sortable: true, dataIndex: 'pv_page', tpl: '{pv_page_title}', -- To view, visit https://gerrit.wikimedia.org/r/237348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ea463af6ebc9e259418bf691ed9422ae5a1410d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Dvogel hallowelt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: add restbase-test200[1-3] spares - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: cassandra: add restbase-test200[1-3] spares .. cassandra: add restbase-test200[1-3] spares Bug: T111382 Change-Id: I02a1a487487912ca57cb632d733f75fa83d6b763 --- M hieradata/regex.yaml M manifests/site.pp 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index e535ac3..839fb92 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -26,7 +26,7 @@ __regex: !ruby/regexp /^(labnet|labvirt|virt)100[1-9]\.eqiad\.wmnet$/ cluster: "virt" -cassandra_test: +cassandra_test_eqiad: __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ cassandra::seeds: - cerium.eqiad.wmnet @@ -39,6 +39,19 @@ cassandra::max_heap_size: 4g cassandra::heap_newsize: 1g +cassandra_test_codfw: + __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/ + cassandra::seeds: + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet + - xenon.eqiad.wmnet + restbase::seeds: + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet + - xenon.eqiad.wmnet + cassandra::max_heap_size: 4g + cassandra::heap_newsize: 1g + swift_be_codfw: __regex: !ruby/regexp /^ms-be20.*\.codfw\.wmnet$/ swift_storage_drives: [ diff --git a/manifests/site.pp b/manifests/site.pp index 5c970df..7a6009f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -334,6 +334,13 @@ include standard } +# cassandra multi-dc temporary test T111382 +node /^restbase-test200[1-3]\.codfw\.wmnet$/ { +role restbase, cassandra +include base::firewall +include standard +} + node /^(chromium|hydrogen)\.wikimedia\.org$/ { include base::firewall include standard -- To view, visit https://gerrit.wikimedia.org/r/237347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02a1a487487912ca57cb632d733f75fa83d6b763 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: add restbase-test200[1-3] spares - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/237347 Change subject: cassandra: add restbase-test200[1-3] spares .. cassandra: add restbase-test200[1-3] spares Bug: T111382 Change-Id: I02a1a487487912ca57cb632d733f75fa83d6b763 --- M hieradata/regex.yaml M manifests/site.pp 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/47/237347/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index e535ac3..839fb92 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -26,7 +26,7 @@ __regex: !ruby/regexp /^(labnet|labvirt|virt)100[1-9]\.eqiad\.wmnet$/ cluster: "virt" -cassandra_test: +cassandra_test_eqiad: __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ cassandra::seeds: - cerium.eqiad.wmnet @@ -39,6 +39,19 @@ cassandra::max_heap_size: 4g cassandra::heap_newsize: 1g +cassandra_test_codfw: + __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/ + cassandra::seeds: + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet + - xenon.eqiad.wmnet + restbase::seeds: + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet + - xenon.eqiad.wmnet + cassandra::max_heap_size: 4g + cassandra::heap_newsize: 1g + swift_be_codfw: __regex: !ruby/regexp /^ms-be20.*\.codfw\.wmnet$/ swift_storage_drives: [ diff --git a/manifests/site.pp b/manifests/site.pp index 5c970df..7a6009f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -334,6 +334,13 @@ include standard } +# cassandra multi-dc temporary test T111382 +node /^restbase-test200[1-3]\.codfw\.wmnet$/ { +role restbase, cassandra +include base::firewall +include standard +} + node /^(chromium|hydrogen)\.wikimedia\.org$/ { include base::firewall include standard -- To view, visit https://gerrit.wikimedia.org/r/237347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02a1a487487912ca57cb632d733f75fa83d6b763 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Skip some default callbacks when constructing SummaryFormatter - change (mediawiki...Wikibase)
Ricordisamoa has uploaded a new change for review. https://gerrit.wikimedia.org/r/237345 Change subject: Skip some default callbacks when constructing SummaryFormatter .. Skip some default callbacks when constructing SummaryFormatter So the custom callback for 'VT:wikibase-entityid' gets called. Reported by Ivan A. Krestinin: https://www.wikidata.org/wiki/?diff=250029949&oldid=249601743 Change-Id: I8b443372c900238b1dc1c6586795a4e1833322ac --- M repo/includes/WikibaseRepo.php 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/237345/1 diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php index 9b328fb..b5afa8b 100644 --- a/repo/includes/WikibaseRepo.php +++ b/repo/includes/WikibaseRepo.php @@ -797,7 +797,7 @@ * * @return callable[] */ - private function getFormatterFactoryCallbacksByType() { + private function getFormatterFactoryCallbacksByType( array $skip = array() ) { $callbacks = array(); $valueFormatterBuilders = $this->newWikibaseValueFormatterBuilders(); @@ -812,15 +812,17 @@ $callbacks["PT:$key"] = $formatter; } + $callbacks = array_diff_key( $callbacks, array_flip( $skip ) ); + return $callbacks; } /** * @return OutputFormatValueFormatterFactory */ - protected function newValueFormatterFactory() { + protected function newValueFormatterFactory( array $skip = array() ) { return new OutputFormatValueFormatterFactory( - $this->getFormatterFactoryCallbacksByType(), + $this->getFormatterFactoryCallbacksByType( $skip ), $this->getDefaultLanguage(), new LanguageFallbackChainFactory() ); @@ -879,7 +881,9 @@ $idFormatter = new EntityIdPlainLinkFormatter( $this->getEntityContentFactory() ); // Create a new ValueFormatterFactory, and override the formatter for entity IDs. - $valueFormatterFactory = $this->newValueFormatterFactory(); + $valueFormatterFactory = $this->newValueFormatterFactory( + array( 'PT:wikibase-item', 'PT:wikibase-property' ) + ); $valueFormatterFactory->setFormatterFactoryCallback( 'VT:wikibase-entityid', function ( $format, FormatterOptions $options ) use ( $idFormatter ) { -- To view, visit https://gerrit.wikimedia.org/r/237345 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b443372c900238b1dc1c6586795a4e1833322ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for American English spelling - change (mediawiki...Petition)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/237344 Change subject: Fix for American English spelling .. Fix for American English spelling Change-Id: Ib6f08d91b769a5440d99592a1b74d5967dc169ac --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Petition refs/changes/44/237344/1 diff --git a/i18n/en.json b/i18n/en.json index a0d509d..9166ed8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,7 +5,7 @@ ] }, "petition": "Sign petition", - "petition-desc": "Adds an [[Special:Petition|includable page]] to collect signatures, and for authorised users to [[Special:PetitionData|download signatures]] as a CSV file.", + "petition-desc": "Adds an [[Special:Petition|includable page]] to collect signatures, and for authorized users to [[Special:PetitionData|download signatures]] as a CSV file.", "petition-form-name": "Name", "petition-form-email": "Email address", "petition-form-country": "Country", -- To view, visit https://gerrit.wikimedia.org/r/237344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6f08d91b769a5440d99592a1b74d5967dc169ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Petition Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions/skins is obsolete - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: mediawiki/extensions/skins is obsolete .. mediawiki/extensions/skins is obsolete Skins are now under mediawiki/skins and the original repo has been marked read only in Gerrit. Bug: T62927 Change-Id: Ic1bded68418776885948071509592bce8da35cb9 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 5e75bf6..8b9770c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7038,10 +7038,6 @@ - name: jsonlint - name: extension-unittests-generic - - name: mediawiki/extensions/skins -template: - - name: extension-checks - - name: mediawiki/extensions/Solarium template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/237342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1bded68418776885948071509592bce8da35cb9 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a ferm define for mw_appserver_networks (needed for scap... - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Add a ferm define for mw_appserver_networks (needed for scap::proxy) .. Add a ferm define for mw_appserver_networks (needed for scap::proxy) Change-Id: Ie9e8e0703b3bf3b1eeeff50259a07f608c3b1378 --- M modules/base/templates/firewall/defs.erb 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/templates/firewall/defs.erb b/modules/base/templates/firewall/defs.erb index fc8256b..0aab1ec 100644 --- a/modules/base/templates/firewall/defs.erb +++ b/modules/base/templates/firewall/defs.erb @@ -4,11 +4,13 @@ all_network_subnets = scope.lookupvar('network::constants::all_network_subnets') special_hosts = scope.lookupvar('network::constants::special_hosts') analytics_networks = scope.lookupvar('network::constants::analytics_networks') +mw_appserver_networks = scope.lookupvar('network::constants::mw_appserver_networks') -%> @def $EXTERNAL_NETWORKS = (<%- external_networks.each do |external_net| -%><%= external_net %> <% end -%>); @def $ALL_NETWORKS = (<%- all_networks.each do |net| -%><%= net %> <% end -%>); @def $ANALYTICS_NETWORKS = (<%- analytics_networks.each do |net| -%><%= net %> <% end -%>); +@def $MW_APPSERVER_NETWORKS = (<%- mw_appserver_networks.each do |net| -%><%= net %> <% end -%>); <%- special_hosts.sort.map do |realm, services | -%> <%- if @realm != realm then next end -%> -- To view, visit https://gerrit.wikimedia.org/r/237085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9e8e0703b3bf3b1eeeff50259a07f608c3b1378 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Readers: Fixed grid sorting - change (mediawiki...BlueSpiceExtensions)
Dvogel hallowelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/237343 Change subject: Readers: Fixed grid sorting .. Readers: Fixed grid sorting Sorting was not implemented. Change-Id: I8eef2ecd42d572f3de4ce1c4283669b6363808a2 --- M Readers/Readers.class.php 1 file changed, 32 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/43/237343/1 diff --git a/Readers/Readers.class.php b/Readers/Readers.class.php index f65c7fd..9acd553 100644 --- a/Readers/Readers.class.php +++ b/Readers/Readers.class.php @@ -265,7 +265,15 @@ $sSort = $oStoreParams->getSort( 'MAX(readers_ts)' ); $sDirection = $oStoreParams->getDirection(); - if ( $sSort == 'user_page' ) $sSort = 'readers_user_name'; + if ( $sSort == 'user_name' ) { + $sSort = 'readers_user_name'; + } + if ( $sSort == 'user_ts' ) { + $sSort = 'readers_ts'; + } + if ( $sSort == 'user_readers' ) { + $sSort = 'readers_user_name'; + } $oDbr = wfGetDB( DB_SLAVE ); $res = $oDbr->select( @@ -365,21 +373,32 @@ $iLimit = $oStoreParams->getLimit(); $iStart = $oStoreParams->getStart(); $sSort = $oStoreParams->getSort( 'MAX(readers_ts)' ); + $sDirection = $oStoreParams->getDirection(); - if ( $sSort == 'user_page' ) $sSort = 'readers_user_name'; + if ( $sSort == 'pv_page' ) { + $sSort = 'page_title'; + } + if ( $sSort == 'pv_ts' ) { + $sSort = 'MAX( readers_ts )'; + } $res = $oDbr->select( - array( 'bs_readers', 'page' ), - array( 'readers_page_id', 'MAX(readers_ts) as readers_ts' ), - array( 'readers_user_id' => $iUserID ), - __METHOD__, - array( - 'GROUP BY' => 'readers_page_id', - 'ORDER BY' => 'MAX(readers_ts) DESC', - 'LIMIT' => $iLimit, - 'OFFSET' => $iStart - ), - array( 'page' => array( 'INNER JOIN', 'readers_page_id = page_id' ) ) + array( 'page', 'bs_readers' ), + array( + 'page_title', 'readers_page_id', 'readers_user_name', + 'MAX( readers_ts ) as readers_ts' + ), + array( + 'readers_page_id = page_id', + 'readers_user_id' => $iUserID + ), + __Method__, + array( + 'GROUP BY' => 'readers_page_id', + 'ORDER BY' => $sSort . " " . $sDirection, + 'LIMIT' => $iLimit, + 'OFFSET' => $iStart + ) ); $aPages = array(); -- To view, visit https://gerrit.wikimedia.org/r/237343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8eef2ecd42d572f3de4ce1c4283669b6363808a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_23 Gerrit-Owner: Dvogel hallowelt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions/skins is obsolete - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/237342 Change subject: mediawiki/extensions/skins is obsolete .. mediawiki/extensions/skins is obsolete Skins are now under mediawiki/skins and the original repo has been marked read only in Gerrit. Bug: T62927 Change-Id: Ic1bded68418776885948071509592bce8da35cb9 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/42/237342/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 5e75bf6..8b9770c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7038,10 +7038,6 @@ - name: jsonlint - name: extension-unittests-generic - - name: mediawiki/extensions/skins -template: - - name: extension-checks - - name: mediawiki/extensions/Solarium template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/237342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1bded68418776885948071509592bce8da35cb9 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] Add grants for new database designate_pool_manager - change (operations/puppet)
Jcrespo has submitted this change and it was merged. Change subject: Add grants for new database designate_pool_manager .. Add grants for new database designate_pool_manager designate_pool_manage has been requested by Andrew, with the same grants than designate. I have also added designate_pool_manage and nodepool to the mariadb backup process. Bug: T112041 Change-Id: Ie3c072eb22c52ff70e31002938692abe15ffa678 --- M templates/mariadb/dumps-misc.sh.erb M templates/mariadb/production-grants-m5.sql.erb 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/dumps-misc.sh.erb b/templates/mariadb/dumps-misc.sh.erb index ad725d0..fa19a78 100644 --- a/templates/mariadb/dumps-misc.sh.erb +++ b/templates/mariadb/dumps-misc.sh.erb @@ -23,7 +23,7 @@ --databases $($my "$sql" | tr '\n' ' ') | \ pigz > /srv/backups/m3-phabricator-phlegal-$(date +%Y%m%d%H%M%S).sql.gz -$dump_master -h m5-slave --databases ceilometer glance keystone neutron nova pdns designate | \ +$dump_master -h m5-slave --databases ceilometer glance keystone neutron nova pdns designate designate_pool_manager nodepool | \ pigz > /srv/backups/m5-$(date +%Y%m%d%H%M%S).sql.gz & sql="select schema_name from information_schema.schemata where schema_name regexp '^(wik|flowdb)'" diff --git a/templates/mariadb/production-grants-m5.sql.erb b/templates/mariadb/production-grants-m5.sql.erb index 046793b..1f1f92f 100644 --- a/templates/mariadb/production-grants-m5.sql.erb +++ b/templates/mariadb/production-grants-m5.sql.erb @@ -24,6 +24,11 @@ TABLES ON `designate`.* TO 'designate'@'208.80.154.12'; +-- designate_pool_manager + +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, CREATE TEMPORARY TABLES +ON `designate\_pool\_manager`.* TO 'designate'@'208.80.154.12'; + -- labnodepool1001 backend database CREATE USER 'nodepool'@'10.64.20.18' IDENTIFIED BY '<%= @nodepool_pass %>'; -- To view, visit https://gerrit.wikimedia.org/r/237339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3c072eb22c52ff70e31002938692abe15ffa678 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't log events during unit tests - change (mediawiki...Gather)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/237341 Change subject: Don't log events during unit tests .. Don't log events during unit tests EventLogging should be disabled during all of our unit tests but, for now, stub Schema.prototype.log during the CollectionsContentOverlay test, which was logging a GatherClicks event. This is a workaround for a bug in the Gather mediawiki-extensions-qunit build wherein the GatherClicks schema isn't being registered, i.e. the EventLogging::logEvent method isn't callable, but the EventLogging extension is definitely loaded, which is obvious from the error itself. Bug: T106759 Change-Id: Ic53bb343a9b703003a0310b74d8a9c5571defd13 --- M tests/qunit/ext.gather.collection.contentOverlay/test_CollectionsContentOverlay.js 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/41/237341/1 diff --git a/tests/qunit/ext.gather.collection.contentOverlay/test_CollectionsContentOverlay.js b/tests/qunit/ext.gather.collection.contentOverlay/test_CollectionsContentOverlay.js index 2153d39..6d0d841 100644 --- a/tests/qunit/ext.gather.collection.contentOverlay/test_CollectionsContentOverlay.js +++ b/tests/qunit/ext.gather.collection.contentOverlay/test_CollectionsContentOverlay.js @@ -6,7 +6,8 @@ ( function ( M, $ ) { var CollectionsApi = M.require( 'ext.gather.api/CollectionsApi' ), Page = M.require( 'Page' ), - CollectionsContentOverlay = M.require( 'ext.gather.watchstar/CollectionsContentOverlay' ); + CollectionsContentOverlay = M.require( 'ext.gather.watchstar/CollectionsContentOverlay' ), + Schema = M.require( 'Schema' ); QUnit.module( 'Gather: Add to collection overlay', { setup: function () { @@ -30,6 +31,9 @@ title: 'Foo', titleInCollection: false }; + + var logResult = $.Deferred().reject( 'ACCESS DENIED' ); + this.sandbox.stub( Schema.prototype, 'log' ).returns( logResult ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/237341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic53bb343a9b703003a0310b74d8a9c5571defd13 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Phuedx ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not send metrics by default. - change (performance/WebPageTest)
Phedenskog has uploaded a new change for review. https://gerrit.wikimedia.org/r/237340 Change subject: Do not send metrics by default. .. Do not send metrics by default. Do not send metrics by default and set --sendMetrics when you actually want to send them. This fix was somehow missed when merging so lets try this the 2nd time. Change-Id: Ie653049e5cab401e80630e0805ebfaf0e6167150 --- M lib/cli.js M lib/index.js M lib/util.js M test/utilTest.js 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest refs/changes/40/237340/1 diff --git a/lib/cli.js b/lib/cli.js index d6f8940..f4441cb 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -50,8 +50,8 @@ '(anonymous|authenticated) [anonymous]'); console.log(' --endpoint Where to send the statsv metrics ' + '[https://www.wikimedia.org/beacon/statsv]'); -console.log(' --dryRun Send metrics to statsv or not. Set to anything if ' + -'you don\'t wanna send metrics.'); +console.log(' --sendMetricsSend metrics to statsv or not. Set to send ' + +'metrics.'); console.log(' --customMetrics A file with custom WPT metrics. ' + 'https://sites.google.com/a/webpagetest.org/docs/using-webpagetest/custom-metrics '); console.log(' --verboseLog the full JSON from WebPageTest to the console\n'); diff --git a/lib/index.js b/lib/index.js index af30003..a0b99d7 100644 --- a/lib/index.js +++ b/lib/index.js @@ -23,7 +23,7 @@ 'use strict'; var WebPageTest = require('webpagetest'); -var argv = require('minimist')(process.argv.slice(2)); +var argv = require('minimist')(process.argv.slice(2), { boolean: 'sendMetrics' }); var util = require('./util'); var async = require('async'); var cli = require('./cli'); @@ -84,7 +84,7 @@ } var collectedMetrics = util.collectMetrics(data, userStatus, namespace); -if (!argv.dryRun) { +if (argv.sendMetrics) { util.sendMetrics(collectedMetrics, endpoint); } else { console.log('Dry run:' + collectedMetrics); diff --git a/lib/util.js b/lib/util.js index 29b4831..fa10c61 100644 --- a/lib/util.js +++ b/lib/util.js @@ -71,7 +71,7 @@ Object.keys(argv).forEach(function(param) { if (['webPageTestKey', 'webPageTestHost', '_', 'verbose', 'userStatus', -'dryRun', 'customMetrics', 'namespace'].indexOf(param) === -1) { +'sendMetrics', 'customMetrics', 'namespace'].indexOf(param) === -1) { wptOptions[param] = argv[param]; } }); diff --git a/test/utilTest.js b/test/utilTest.js index 59bb501..47f335a 100644 --- a/test/utilTest.js +++ b/test/utilTest.js @@ -39,7 +39,7 @@ it('Parameters specific for wptstatsv should be cleaned out from WebPageTest options', function() { -var keysToBeRemoved = ['webPageTestKey', 'webPageTestHost', '_', 'verbose', 'userStatus', 'dryRun', 'customMetrics', 'namespace']; +var keysToBeRemoved = ['webPageTestKey', 'webPageTestHost', '_', 'verbose', 'userStatus', 'sendMetrics', 'customMetrics', 'namespace']; var args = { webPageTestKey: 'aSupERSecrEtKey', webPageTestHost: 'http://our.wpt.org', -- To view, visit https://gerrit.wikimedia.org/r/237340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie653049e5cab401e80630e0805ebfaf0e6167150 Gerrit-PatchSet: 1 Gerrit-Project: performance/WebPageTest Gerrit-Branch: master Gerrit-Owner: Phedenskog ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] certificate/keystore generation script - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: certificate/keystore generation script .. certificate/keystore generation script cassandra-ca-mgr accepts a yaml-formatted manifest file as its only argument and generates a root CA and corresponding Java truststore, and an arbitrary number of Java keystores, signed by the root CA. The script is idempotent, so subsequent invocations with an identical manifest should effect no change; Invocations with additional keystore entity definitions will result only on the creation of the new keystores. Try `pydoc ./cassandra-ca-mgr' to see an example of how to format a manifest. Bug: T108953 Change-Id: I497ff7de13cb87e82cd7f6562f7abfdb7c97fcd2 --- A modules/cassandra/files/cassandra-ca-mgr 1 file changed, 382 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/cassandra/files/cassandra-ca-mgr b/modules/cassandra/files/cassandra-ca-mgr new file mode 100755 index 000..b76f8fe --- /dev/null +++ b/modules/cassandra/files/cassandra-ca-mgr @@ -0,0 +1,382 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +Cassandra certificate management + +First, you need a manifest that specifies the Certificate Authority, and +each of the keystores. For example: + +# The top-level working directory +base_directory: /path/to/base/directory + +# The Certificate Authority +authority: + key: +size: 2048 + cert: +subject: + organization: WMF + country: US + unit: Services +valid: 365 + password: qwerty + +# Java keystores +keystores: + - name: restbase1001-a +key: + size: 2048 +cert: + subject: +organization: WMF +country: US +unit: Services + valid: 365 +password: qwerty + + - name: restbase1001-b +key: + size: 2048 +cert: + subject: +organization: WMF +country: US +unit: Services + valid: 365 +password: qwerty + + - name: restbase1002-a +key: + size: 2048 +cert: + subject: +organization: WMF +country: US +unit: Services + valid: 365 +password: qwerty + +Next, run the script with the manifest as its only argument: + +$ cassandra-ca manifest.yaml +$ tree /path/to/base/directory +/path/to/base/directory +├── restbase1001-a +│ ├── restbase1001-a.crt +│ └── restbase1001-a.csr +│ └── restbase1001-a.kst +├── restbase1001-b +│ ├── restbase1001-b.crt +│ └── restbase1001-b.csr +│ └── restbase1001-b.kst +├── restbase1002-a +│ ├── restbase1002-a.crt +│ └── restbase1002-a.csr +│ └── restbase1002-a.kst +├── rootCa.crt +├── rootCa.key +├── rootCa.srl +└── truststore + +3 directories, 13 files + + +""" + +import logging +import os +import os.path +import subprocess +import yaml# PyYAML (python-yaml) + + +logging.basicConfig(level=logging.DEBUG) + + +class Subject(object): +def __init__(self, common_name, **kwargs): +self.common_name = common_name +self.organization = kwargs.get("organization", "WMF") +self.country = kwargs.get("country", "US") +self.unit = kwargs.get("unit", "Services") + +def __repr__(self): +return "%s(cn=%s, o=%s, c=%s, u=%s)" \ +% (self.__class__.__name__, self.common_name, self.organization, self.country, self.unit) + + +class KeytoolSubject(Subject): +def __str__(self): +return "cn=%s, ou=%s, o=%s, c=%s" % (self.common_name, self.unit, self.organization, self.country) + + +class Keystore(object): +def __init__(self, path, authority, **kwargs): +name = kwargs.get("name") +password = kwargs.get("password") + +if name is None: +raise RuntimeError("corrupt keystore entry; missing keystore name") +if password is None: +raise RuntimeError("corrupt keystore entry; missing keystore password") + +key = kwargs.get("key", dict(size=2048)) +size = int(key.get("size", 2048)) +cert = kwargs.get("cert", dict(valid=365)) + +self.base = os.path.abspath(path) +self.name = name +self.authority = authority +self.filename = os.path.join(self.base, name, "%s.kst" % self.name) +self.csr = os.path.join(self.base, name, "%s.csr" % name) +self.crt = os.path.join(self.base, name, "%s.crt" % name) +self.password = password +self.size = size +self.subject = KeytoolSubject(self.name, **cert) +self.valid = int(cert.get("valid", 365)) + +mkdirs(os.path.join(self.base, name)) + +def generate(self): +if os.path.exists
[MediaWiki-commits] [Gerrit] Add grants for new database designate_pool_manager - change (operations/puppet)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/237339 Change subject: Add grants for new database designate_pool_manager .. Add grants for new database designate_pool_manager designate_pool_manage has been requested by Andrew, with the same grants than designate. I have also added designate_pool_manage and nodepool to the mariadb backup process. Bug: T112041 Change-Id: Ie3c072eb22c52ff70e31002938692abe15ffa678 --- M templates/mariadb/dumps-misc.sh.erb M templates/mariadb/production-grants-m5.sql.erb 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/237339/1 diff --git a/templates/mariadb/dumps-misc.sh.erb b/templates/mariadb/dumps-misc.sh.erb index ad725d0..fa19a78 100644 --- a/templates/mariadb/dumps-misc.sh.erb +++ b/templates/mariadb/dumps-misc.sh.erb @@ -23,7 +23,7 @@ --databases $($my "$sql" | tr '\n' ' ') | \ pigz > /srv/backups/m3-phabricator-phlegal-$(date +%Y%m%d%H%M%S).sql.gz -$dump_master -h m5-slave --databases ceilometer glance keystone neutron nova pdns designate | \ +$dump_master -h m5-slave --databases ceilometer glance keystone neutron nova pdns designate designate_pool_manager nodepool | \ pigz > /srv/backups/m5-$(date +%Y%m%d%H%M%S).sql.gz & sql="select schema_name from information_schema.schemata where schema_name regexp '^(wik|flowdb)'" diff --git a/templates/mariadb/production-grants-m5.sql.erb b/templates/mariadb/production-grants-m5.sql.erb index 046793b..1f1f92f 100644 --- a/templates/mariadb/production-grants-m5.sql.erb +++ b/templates/mariadb/production-grants-m5.sql.erb @@ -24,6 +24,11 @@ TABLES ON `designate`.* TO 'designate'@'208.80.154.12'; +-- designate_pool_manager + +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, CREATE TEMPORARY TABLES +ON `designate\_pool\_manager`.* TO 'designate'@'208.80.154.12'; + -- labnodepool1001 backend database CREATE USER 'nodepool'@'10.64.20.18' IDENTIFIED BY '<%= @nodepool_pass %>'; -- To view, visit https://gerrit.wikimedia.org/r/237339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3c072eb22c52ff70e31002938692abe15ffa678 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LiveTranslate: use int-reference in msg refering to edit tab - change (mediawiki...LiveTranslate)
jenkins-bot has submitted this change and it was merged. Change subject: LiveTranslate: use int-reference in msg refering to edit tab .. LiveTranslate: use int-reference in msg refering to edit tab Motivated by: https://www.mediawiki.org/wiki/Localisation#Messages_quoting_each_other Bug: T28844 Change-Id: Ia448e10eec319dec0b1e3cc962e2a330c9d97cb0 --- M i18n/en.json 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Siebrand: Looks good to me, approved Nemo bis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 341dc13..71442b2 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ -"Jeroen De Dauw" +"Jeroen De Dauw", +"Purodha Blissenbach" ] }, "livetranslate-desc": "Enables live translation of page content using the Google Translate service", @@ -17,8 +18,8 @@ "livetranslate-button-translating": "Translating...", "livetranslate-button-revert": "Show original", "livetranslate-dictionary-error": "Could not obtain the live translate dictionary. No words will be treated as special during the translation process.", -"livetranslate-dictionary-empty": "There are no words in the dictionary yet. Click the \"edit\" tab to add some.", -"livetranslate-dictionary-count": "There {{PLURAL:$1|is $1 word|are $1 words}} in $2 {{PLURAL:$2|language|languages}}. Click the \"edit\" tab to add more.", +"livetranslate-dictionary-empty": "There are no words in the dictionary yet. Click the \"{{int:edit}}\" tab to add some.", +"livetranslate-dictionary-count": "There {{PLURAL:$1|is $1 word|are $1 words}} in $2 {{PLURAL:$2|language|languages}}. Click the \"{{int:edit}}\" tab to add more.", "livetranslate-dictionary-unallowed-langs": "{{PLURAL:$2|This language is|These languages are}} not currently set as allowed translation target: $1. Modify the allowed languages in your wikis configuration, or remove these from the dictionary.", "livetranslate-dictionary-goto-edit": "Modify the translation memories.", "special-livetranslate": "Live translate", -- To view, visit https://gerrit.wikimedia.org/r/216081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia448e10eec319dec0b1e3cc962e2a330c9d97cb0 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/LiveTranslate Gerrit-Branch: master Gerrit-Owner: Purodha Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install_server: provision restbase-test2* with raid1 - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: install_server: provision restbase-test2* with raid1 .. install_server: provision restbase-test2* with raid1 Bug: T111382 Change-Id: I6635f2bfb516ed7c66fed6f1dd3b5cc4c78c3de1 --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 2ac805b..216df53 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -105,6 +105,7 @@ rdb100[1-4]) echo partman/mw.cfg ;; \ restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \ restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \ + restbase-test2*) echo partman/raid1.cfg ;; \ rhenium) echo partman/raid1-gpt.cfg ;; \ snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \ stat1002) echo partman/lvm-noraid-large.a.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/237338 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6635f2bfb516ed7c66fed6f1dd3b5cc4c78c3de1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi Gerrit-Reviewer: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stats: Separate total and language graph, and show draft cou... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Stats: Separate total and language graph, and show draft count in graph .. Stats: Separate total and language graph, and show draft count in graph This is in preparation for showing deletion stats and weekly trend graphs. Showing both total and language specific stats is difficult to understand because the difference is widening fast. So separated them. ApiQueryContentTranslationLanguageTrend now return cumulative count for translations in progress as well. Soon it should retun cumulative deleted stats too. Bug: T105192 Bug: T90538 Change-Id: Ifd4bd0e3a92ac022428edf3915552ea99142dbfb --- M api/ApiQueryContentTranslationLanguageTrend.php M includes/Translation.php M modules/stats/ext.cx.stats.js M modules/stats/styles/ext.cx.stats.less 4 files changed, 230 insertions(+), 73 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/api/ApiQueryContentTranslationLanguageTrend.php b/api/ApiQueryContentTranslationLanguageTrend.php index cd5bf33..8bbf549 100644 --- a/api/ApiQueryContentTranslationLanguageTrend.php +++ b/api/ApiQueryContentTranslationLanguageTrend.php @@ -12,6 +12,8 @@ * * @ingroup API ContentTranslationAPI */ +use ContentTranslation\Translation; + class ApiQueryContentTranslationLanguageTrend extends ApiQueryBase { public function __construct( $query, $moduleName ) { @@ -32,7 +34,11 @@ $result->addValue( array( 'query' ), 'contenttranslationlangtrend', - ContentTranslation\Translation::getTrend( $source, $target, $interval ) + array( + 'translations' => + Translation::getPublishTrend( $source, $target, $interval ), + 'drafts' => Translation::getDraftTrend( $source, $target, $interval ) + ) ); } diff --git a/includes/Translation.php b/includes/Translation.php index c0a7c98..0f54508 100644 --- a/includes/Translation.php +++ b/includes/Translation.php @@ -211,10 +211,94 @@ } /** +* Get time-wise cumulative number of drafts for given +* language pairs, with given interval. +* @param string $source Source language code +* @param string $target Target language code +* @param string $interval 'weekly' or 'monthly' trend +* @return array +*/ + public static function getDraftTrend( $source, $target, $interval ) { + $dbr = Database::getConnection( DB_SLAVE ); + + $draftCondition = $dbr->makeList( + array( + 'translation_status' => 'draft', + 'translation_target_url IS NULL' + ), + LIST_AND + ); + + $conditions = array(); + $conditions[] = $draftCondition; + if ( $source !== null ) { + $conditions['translation_source_language'] = $source; + } + if ( $target !== null ) { + $conditions['translation_target_language'] = $target; + } + + $options = null; + if ( $interval === 'week' ) { +$options = array( + 'GROUP BY' => array( + 'YEARWEEK(translation_last_updated_timestamp)', + ), + ); + } elseif ( $interval === 'month' ) { +$options = array( + 'GROUP BY' => array( + 'YEAR(translation_last_updated_timestamp), MONTH(translation_last_updated_timestamp)', + ), + ); + } + + $subQuery = $dbr->selectSQLText( + 'cx_translations', + 'count(*)', + $dbr->makeList( array( + 'translation_last_updated_timestamp <= MAX(translations.translation_last_updated_timestamp)', + $dbr->makeList( $conditions, LIST_AND ), + ), + LIST_AND ) + ); + + $rows = $dbr->select( + array( 'translations' => 'cx_translations' ), + array( + "translations.translation_last_updated_timestamp AS date", + '(' . $subQuery . ') translatons_count', + ), + $dbr->makeList( $conditions, LIST_AND ), + __METHOD__
[MediaWiki-commits] [Gerrit] install_server: provision restbase-test2* with raid1 - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/237338 Change subject: install_server: provision restbase-test2* with raid1 .. install_server: provision restbase-test2* with raid1 Bug: T111382 Change-Id: I6635f2bfb516ed7c66fed6f1dd3b5cc4c78c3de1 --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/237338/1 diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 2ac805b..216df53 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -105,6 +105,7 @@ rdb100[1-4]) echo partman/mw.cfg ;; \ restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \ restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \ + restbase-test2*) echo partman/raid1.cfg ;; \ rhenium) echo partman/raid1-gpt.cfg ;; \ snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \ stat1002) echo partman/lvm-noraid-large.a.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/237338 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6635f2bfb516ed7c66fed6f1dd3b5cc4c78c3de1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix badly worded link anchors. - change (mediawiki...SpamDiffTool)
jenkins-bot has submitted this change and it was merged. Change subject: Fix badly worded link anchors. .. Fix badly worded link anchors. See also: * https://www.mediawiki.org/wiki/i18n#Use_meaningful_link_anchors * https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Spamdifftool-no-urls-detected/ksh Change-Id: I2b46825319189660a624f6e8e7f8678f07df690e --- M i18n/en.json 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Siebrand: Looks good to me, approved Nemo bis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index db00315..a96c942 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,15 +1,17 @@ { "@metadata": { - "authors": [] + "authors": [ + "Purodha" + ] }, "spamdifftool": "Manage Spam Blacklist", "spamdifftool-desc": "Provides a basic way of adding new entries to the Spam Blacklist from diff pages", "spamdifftool-block": "Block:", "spamdifftool-cant-edit": "Sorry - you don't have permission to edit the Spam Blacklist.", - "spamdifftool-confirm": "Confirm that you want to add these entries to the Spam Blacklist. (Click here to report a problem.)", - "spamdifftool-no-text": "There is no text to add to the Spam Blacklist. Click here to continue.", + "spamdifftool-confirm": "Confirm that you want to add these entries to the Spam Blacklist. (Report a problem.)", + "spamdifftool-no-text": "There is no text to add to the Spam Blacklist. Continue.", "spamdifftool-no-title": "'''Error:''' no page title was specified.", - "spamdifftool-no-urls-detected": "No URLs were detected. Click here to return.", + "spamdifftool-no-urls-detected": "No URLs were detected. Return.", "spamdifftool-option-domain": "all from this domain", "spamdifftool-option-subdomain": "all from this subdomain", "spamdifftool-option-directory": "this subdomain and directory", -- To view, visit https://gerrit.wikimedia.org/r/235351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b46825319189660a624f6e8e7f8678f07df690e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpamDiffTool Gerrit-Branch: master Gerrit-Owner: Purodha Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create ferm rules for Hadoop master and Hadoop standby (comm... - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/237335 Change subject: Create ferm rules for Hadoop master and Hadoop standby (common rules) .. Create ferm rules for Hadoop master and Hadoop standby (common rules) Also remove the temporary rules used for the Hadoop workers, we don't use Yarn mapreduce on the master, so can create fixed rules after all. Change-Id: I3784547d91de89f60755beb3e1b040b5f3871c4a --- M manifests/role/analytics/hadoop.pp 1 file changed, 47 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/237335/1 diff --git a/manifests/role/analytics/hadoop.pp b/manifests/role/analytics/hadoop.pp index 100390a..fa9cdd6 100644 --- a/manifests/role/analytics/hadoop.pp +++ b/manifests/role/analytics/hadoop.pp @@ -319,6 +319,50 @@ } } + +# This class provides the ferm rules which are common to +# all the Hadoop master and standby +class role::analytics::hadoop::ferm_master_standby { + +ferm::service{ 'hadoop-hdfs-namenode-jmx': +proto => 'tcp', +port => '9980', +srange => '$ANALYTICS_NETWORKS', +} + +ferm::service{ 'hadoop-mapreduce-history-admininterface': +proto => 'tcp', +port => '10033', +srange => '$ANALYTICS_NETWORKS', +} + +# config option mapreduce.jobhistory.webapp.address +ferm::service{ 'hadoop-mapreduce-jobhistory-admininterface': +proto => 'tcp', +port => '19888', +srange => '$ANALYTICS_NETWORKS', +} + +ferm::service{ 'hadoop-yarn-resourcemanager': +proto => 'tcp', +port => '9983', +srange => '$ANALYTICS_NETWORKS', +} + +ferm::service{ 'hadoop-httpfs': +proto => 'tcp', +port => '14000', +srange => '$ANALYTICS_NETWORKS', +} + +# Open up port for debugging +ferm::service{ 'jmxtrans-jmx': +proto => 'tcp', +port => '2101', +srange => '$INTERNAL', +} +} + # == Class role::analytics::hadoop # Installs Hadoop client pacakges and configuration. # @@ -486,6 +530,8 @@ require => Class['cdh::hadoop::master'], } +include role::analytics::hadoop::ferm_master_standby + # Hadoop nodes are spread across multiple rows # and need to be able to send multicast packets # multiple network hops. Hadoop GangliaContext @@ -508,13 +554,6 @@ minute => 5, hour=> 0, require => Class['cdh::hadoop::master'], -} - -# T111433 -ferm::service{ 'hadoop-access': -proto => 'tcp', -port => '1024:65535', -srange => '$ANALYTICS_NETWORKS', } # Include icinga alerts if production realm. @@ -545,13 +584,6 @@ critical=> '\!active', require => Class['cdh::hadoop::master'], } -} - -# Open up port for debugging -ferm::service{ 'jmxtrans-jmx': -proto => 'tcp', -port => '2101', -srange => '$INTERNAL', } # This will create HDFS user home directories @@ -678,6 +710,7 @@ # monitor disk statistics include role::analytics::monitor_disks +include role::analytics::hadoop::ferm_master_standby # Include icinga alerts if production realm. if $::realm == 'production' { @@ -688,20 +721,6 @@ require => Class['cdh::hadoop::namenode::standby'], critical => 'true', } -} - -# T111433 -ferm::service{ 'hadoop-access': -proto => 'tcp', -port => '1024:65535', -srange => '$ANALYTICS_NETWORKS', -} - -# Open up port for debugging -ferm::service{ 'jmxtrans-jmx': -proto => 'tcp', -port => '2101', -srange => '$INTERNAL', } # If this is a resourcemanager host, then go ahead -- To view, visit https://gerrit.wikimedia.org/r/237335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3784547d91de89f60755beb3e1b040b5f3871c4a 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] Extension:RSS make manual reference in message a link. - change (mediawiki...RSS)
jenkins-bot has submitted this change and it was merged. Change subject: Extension:RSS make manual reference in message a link. .. Extension:RSS make manual reference in message a link. See https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Rss-deprecated-wgrssallowedfeeds-found/ksh Change-Id: I037eaca2a536e4ad8efde3cab1122d950d7b5cd2 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved Nemo bis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 4b7ddf0..54e723b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -15,7 +15,7 @@ "rss-ns-permission": "RSS is not allowed in this namespace.", "rss-url-is-not-whitelisted": "\"$1\" is not in the whitelist of allowed feeds. {{PLURAL:$3|$2 is the only allowed feed|The allowed feeds are as follows: $2}}.", "rss-empty-whitelist": "\"$1\" is not in the whitelist of allowed feeds. There are no allowed feed URLs in the whitelist.", -"rss-deprecated-wgrssallowedfeeds-found": "The deprecated variable $wgRSSAllowedFeeds has been detected. Since RSS version 2.0 this variable has to be replaced by $wgRSSUrlWhitelist as described in the manual page Extension:RSS.", +"rss-deprecated-wgrssallowedfeeds-found": "The deprecated variable $wgRSSAllowedFeeds has been detected. Since RSS version 2.0 this variable has to be replaced by $wgRSSUrlWhitelist as described in the manual page [https://www.mediawiki.org/wiki/Extension:RSS Extension:RSS].", "rss-item": "{{$1 | title = {{{title}}} | link = {{{link}}} | date = {{{date}}} | author = {{{author}}} | description = {{{description}}} }}", "rss-feed": "; '''[{{{link}}} {{{title}}}]'''\n: {{{description}}}\n: {{{author}}} {{{date}}}" } -- To view, visit https://gerrit.wikimedia.org/r/199203 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I037eaca2a536e4ad8efde3cab1122d950d7b5cd2 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/RSS Gerrit-Branch: master Gerrit-Owner: Purodha Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Wikinaut Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update string to be more generic and correct - change (mediawiki...MsUpload)
Siebrand has submitted this change and it was merged. Change subject: Update string to be more generic and correct .. Update string to be more generic and correct A bug should be reported to request proper PLURAL implementation. Reported at https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Msu-upload-possible/en Change-Id: Icae8e9a73b5057a51105bf176cd6c2411edf4512 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/i18n/en.json b/i18n/en.json index 94ebea5..00f8c6c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -16,7 +16,7 @@ "msu-insert-movie": "Insert movie", "msu-cancel-upload": "Cancel upload", "msu-clean-all": "Clear list", - "msu-upload-possible": "File can be uploaded", + "msu-upload-possible": "The selected file(s) can be uploaded", "msu-ext-not-allowed": "Only the following file {{PLURAL:$1|type is|types are}} allowed:", "msu-upload-this": "Upload this file", "msu-upload-all": "Upload all files", -- To view, visit https://gerrit.wikimedia.org/r/225205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icae8e9a73b5057a51105bf176cd6c2411edf4512 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MsUpload Gerrit-Branch: master Gerrit-Owner: Siebrand Gerrit-Reviewer: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use plural and remove legacy code - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged. Change subject: Use plural and remove legacy code .. Use plural and remove legacy code Bug: T56679 Change-Id: I7dde8a131bb212fd1caa105eef45cbe9b6a0119b --- M i18n/en.json M modules/check_load_from_localstorage.js 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index b05a039..497cf14 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -117,7 +117,7 @@ "coll-suggest_article_remove": "Page $1 has been removed from your book ($2).", "coll-suggest_undo_tooltip": "Undo this action", "coll-suggest_undo": "undo", -"coll-load_local_book": "Click OK to continue with your book $1 which contains $2 wiki pages. Click Cancel to delete it and start with an empty book.", +"coll-load_local_book": "Click \"OK\" to continue with your book $1 which contains $2 wiki {{PLURAL:$2|page|pages}}. Click \"Cancel\" to delete it and start with an empty book.", "coll-format-rl": "e-book (PDF, mwlib renderer)", "coll-format-epub": "e-book (EPUB)", "coll-format-odf": "Word processor (OpenDocument)", diff --git a/modules/check_load_from_localstorage.js b/modules/check_load_from_localstorage.js index 54ef5ee..676ad2b 100644 --- a/modules/check_load_from_localstorage.js +++ b/modules/check_load_from_localstorage.js @@ -19,8 +19,6 @@ } if ( num_pages ) { message = mw.msg( 'coll-load_local_book', shownTitle, num_pages ); - // Legacy, remove once translations have caught up to using message parameters: - message = message.replace( /%TITLE%/, shownTitle ).replace( /%NUMPAGES%/, num_pages ); if ( confirm( message ) ) { $.post( script_url, { 'action': 'ajax', -- To view, visit https://gerrit.wikimedia.org/r/224959 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dde8a131bb212fd1caa105eef45cbe9b6a0119b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: Siebrand Gerrit-Reviewer: Cscott Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing special page aliases - change (mediawiki...InterwikiIntegration)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing special page aliases .. Add missing special page aliases Change-Id: I8e9afa4cd1cff5d8bc8b4a350baf280c65ded153 --- M InterwikiIntegration.alias.php 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/InterwikiIntegration.alias.php b/InterwikiIntegration.alias.php index ad8e177..8198171 100644 --- a/InterwikiIntegration.alias.php +++ b/InterwikiIntegration.alias.php @@ -12,7 +12,12 @@ * @author Tisane */ $specialPageAliases['en'] = array( - 'PopulateInterwikiIntegrationTable' => array( 'PopulateInterwikiIntegrationTable' ), + 'PopulateInterwikiIntegrationTable' => array( 'PopulateInterwikiIntegrationTable' ), + 'PopulateInterwikiWatchlistTable' => array( 'PopulateInterwikiWatchlistTable' ), + 'PopulateInterwikiRecentChangesTable' => array( 'PopulateInterwikiRecentChangesTable' ), + 'PopulateInterwikiPageTable' => array( 'PopulateInterwikiPageTable' ), + 'InterwikiWatchlist' => array( 'InterwikiWatchlist' ), + 'InterwikiRecentChanges' => array( 'InterwikiRecentChanges' ), ); /** Arabic (العربية) */ -- To view, visit https://gerrit.wikimedia.org/r/237101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e9afa4cd1cff5d8bc8b4a350baf280c65ded153 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/InterwikiIntegration Gerrit-Branch: master Gerrit-Owner: Siebrand Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change "article" to "page" in i18n - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Change "article" to "page" in i18n .. Change "article" to "page" in i18n Change-Id: I8ff414d96a4a2838ccad4cc3e456632144a00dbd --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 1d556a1..d8948db 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -109,7 +109,7 @@ "cx-translation-filter-published-translations": "Published", "cx-translation-filter-draft-translations": "In progress", "cx-translation-filter-suggested-translations": "Suggestions", - "cx-suggestionlist-empty-title": "Sorry, no articles to suggest", + "cx-suggestionlist-empty-title": "Sorry, no pages to suggest", "cx-suggestionlist-empty-desc": "You can pick any topic of your choice when starting a new translation", "cx-suggestionlist-featured": "Featured", "cx-suggestionlist-view-source-page": "View source page", @@ -134,7 +134,7 @@ "cx-translation-status-draft": "In progress", "cx-translation-status-published": "Published", "cx-translation-status-deleted": "Deleted", - "cx-magnus-tool-link-text": "Find articles missing in your language", + "cx-magnus-tool-link-text": "Find pages missing in your language", "cx-translation-already-in-progress": "This is an ongoing translation by $1.", "cx-translation-already-in-progress-collaborate": "Please make sure you coordinate with the user who translated the current translation.", "cx-publishing-dialog-publish-draft-button": "Publish as draft", -- To view, visit https://gerrit.wikimedia.org/r/237156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ff414d96a4a2838ccad4cc3e456632144a00dbd Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add i18n json files - change (mediawiki...SkelJS)
Siebrand has submitted this change and it was merged. Change subject: Add i18n json files .. Add i18n json files Fix extension name and also make extension name translatable. Add translatable description to extension. Change-Id: Ifc32bf3408fe2142d4851159166001d523a7abf8 --- M SkelJS.php A i18n/en.json A i18n/qqq.json 3 files changed, 19 insertions(+), 2 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/SkelJS.php b/SkelJS.php index 9334558..f88ea64 100644 --- a/SkelJS.php +++ b/SkelJS.php @@ -16,13 +16,16 @@ $wgExtensionCredits['specialpage'][] = array( 'path' => __FILE__, - 'name' => 'JavaScript-Driven MediaWiki Extension Skeleton', + 'name' => 'SkelJS', + 'namemsg'=> 'extensionname-skeljs', 'version'=> '0.0.1', 'url'=> 'https://www.mediawiki.org/wiki/Extension:SkelJS', 'author' => array( 'Ori Livneh' ), - //'descriptionmsg' => 'skeljs-desc', + 'descriptionmsg' => 'skeljs-desc', ); +$wgMessagesDirs['SkelJS'] = __DIR__ . '/i18n'; + $wgAutoloadClasses['SkelJSHooks'] = dirname( __FILE__ ) . '/SkelJS.hooks.php'; // TODO: Preconfigure 'top' and 'bottom' module. diff --git a/i18n/en.json b/i18n/en.json new file mode 100644 index 000..9b5997b --- /dev/null +++ b/i18n/en.json @@ -0,0 +1,7 @@ +{ + "@metadata": { + "authors": [] + }, + "extensionname-skeljs": "SkelJS", + "skeljs-desc": "Example JavaScript-centric MediaWiki extension" +} diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 000..e2dbb8b --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,7 @@ +{ + "@metadata": { + "authors": [] + }, + "extensionname-skeljs": "{{optional}}", + "skeljs-desc": "{{desc|what=extension|name=SkelJS|url=https://www.mediawiki.org/wiki/Extension:SkelJS}}"; +} -- To view, visit https://gerrit.wikimedia.org/r/228667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc32bf3408fe2142d4851159166001d523a7abf8 Gerrit-PatchSet: 9 Gerrit-Project: mediawiki/extensions/SkelJS Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Addshore Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Paladox Gerrit-Reviewer: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mocking of Serializable class in PHP 5.5+ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/237332 Change subject: Fix mocking of Serializable class in PHP 5.5+ .. Fix mocking of Serializable class in PHP 5.5+ Since I3a42a2a883e8eef900eeb02355fc3b064411f642, Message is serializable, which breaks mocking it without calling the constructor due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/171. Change-Id: I837b1860c03b7b51ca495b74fafcd97d45c1306e --- M lib/tests/phpunit/formatters/MessageSnakFormatterTest.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/32/237332/1 diff --git a/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php b/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php index 225ee0d..fa8a704 100644 --- a/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php +++ b/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php @@ -36,7 +36,7 @@ */ private function getFormatter( $snakType, $format ) { $message = $this->getMockBuilder( 'Message' ) - ->disableOriginalConstructor() + ->setConstructorArgs( array( 'message') ) ->getMock(); foreach ( array( 'parse', 'text', 'plain' ) as $method ) { -- To view, visit https://gerrit.wikimedia.org/r/237332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I837b1860c03b7b51ca495b74fafcd97d45c1306e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Whitelist MZMcBride - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Whitelist MZMcBride .. Whitelist MZMcBride Long term trusted user, etc. Change-Id: I067f0752efc3842adb4d7f0729dbb492c910ca69 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, but someone else must approve Hashar: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1ae3fa7..5e75bf6 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -164,6 +164,7 @@ | umherirrender_de\.wp@web\.de | v\.a\.ghaisas@gmail\.com | valhallasw@arctus\.nl +| w@mzmcbride\.com | wctaiwan@gmail\.com | wiki@physikerwelt\.de | wikiposta@gmail\.com @@ -362,6 +363,7 @@ - ^umherirrender_de\.wp@web\.de$ - ^v\.a\.ghaisas@gmail\.com$ # polybuildr - ^valhallasw@arctus\.nl$ # Merlijn van Deen + - ^w@mzmcbride\.com$ - ^wctaiwan@gmail\.com$ - ^wiki@physikerwelt\.de$ - ^yaron57@gmail\.com$ -- To view, visit https://gerrit.wikimedia.org/r/237293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I067f0752efc3842adb4d7f0729dbb492c910ca69 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: MZMcBride Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits