[MediaWiki-commits] [Gerrit] Actually use the parameter in wikieditor-toolbar-tool-table-... - change (mediawiki...WikiEditor)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210895 Change subject: Actually use the parameter in wikieditor-toolbar-tool-table-toomany .. Actually use the parameter in wikieditor-toolbar-tool-table-toomany https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikieditor-toolbar-tool-table-toomany/ksh Change-Id: Ibe8aaec4e5a2cd5986074ab4c5314af1c58c1041 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/95/210895/1 diff --git a/i18n/en.json b/i18n/en.json index 2138026..4c1443d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -121,7 +121,7 @@ wikieditor-toolbar-tool-table-insert: Insert, wikieditor-toolbar-tool-table-cancel: Cancel, wikieditor-toolbar-tool-table-example-text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod., -wikieditor-toolbar-tool-table-toomany: Inserting a table with more than 1000 cells is not possible with this dialog., +wikieditor-toolbar-tool-table-toomany: Inserting a table with more than $1 cells is not possible with this dialog., wikieditor-toolbar-tool-table-invalidnumber: You have not entered a valid number of rows or columns., wikieditor-toolbar-tool-table-zero: You cannot insert a table with zero rows or columns., wikieditor-toolbar-tool-replace: Search and replace, -- To view, visit https://gerrit.wikimedia.org/r/210895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe8aaec4e5a2cd5986074ab4c5314af1c58c1041 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename eeden.esams - eeden, switch to jessie - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Rename eeden.esams - eeden, switch to jessie .. Rename eeden.esams - eeden, switch to jessie Change-Id: I019d6387a7ce39ecbced20b74f6db3c54ace83d2 --- M manifests/misc/monitoring.pp M manifests/site.pp M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 3 files changed, 5 insertions(+), 3 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp index 923a319..45da4e1 100644 --- a/manifests/misc/monitoring.pp +++ b/manifests/misc/monitoring.pp @@ -115,7 +115,7 @@ } class misc::monitoring::views::dns { -$auth_dns_host_regex = '^(rubidium|baham|eeden.esams).wikimedia.org$' +$auth_dns_host_regex = '^(rubidium|baham|eeden).wikimedia.org$' $rec_dns_host_regex = '^(chromium|hydrogen).wikimedia.org$' ganglia_new::web::view { 'authoritative_dns': diff --git a/manifests/site.pp b/manifests/site.pp index fc01002..551e52f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -894,7 +894,7 @@ role cache::text } -node 'eeden.esams.wikimedia.org' { +node 'eeden.wikimedia.org' { interface::add_ip6_mapped { 'main': interface = 'eth0', } diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 46726a8..b9964e3 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -1896,7 +1896,9 @@ host eeden { hardware ethernet a4:ba:db:30:d8:80; - fixed-address eeden.esams.wikimedia.org; + fixed-address eeden.wikimedia.org; + option pxelinux.pathprefix jessie-installer/; + filename jessie-installer/debian-installer/amd64/pxelinux.0; } host einsteinium { -- To view, visit https://gerrit.wikimedia.org/r/210897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I019d6387a7ce39ecbced20b74f6db3c54ace83d2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Default mw.wikibase.* lua functions to the connected item of... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/210907 Change subject: Default mw.wikibase.* lua functions to the connected item of a page .. Default mw.wikibase.* lua functions to the connected item of a page untested, and no tests yet... default mw.wikibase.label, mw.wikibase.description, mw.wikibase.sitelink to use connected item, if id is not specified. Bug: T99078 Change-Id: Ief78b1c8f591d1da8a6ca03e6cb02c339954a99d --- M client/includes/DataAccess/Scribunto/mw.wikibase.lua 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/07/210907/1 diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.lua b/client/includes/DataAccess/Scribunto/mw.wikibase.lua index 03b0e47..e9a38b8 100644 --- a/client/includes/DataAccess/Scribunto/mw.wikibase.lua +++ b/client/includes/DataAccess/Scribunto/mw.wikibase.lua @@ -32,6 +32,12 @@ return pageEntityId end + local setEntityIdForCurrentPageIfNil = function( id ) + if id == nil then + id = getEntityIdForCurrentPage() + end + end + -- Get the mw.wikibase.entity object for a given id. Cached. local getEntityObject = function( id ) if entities[ id ] == nil then @@ -61,11 +67,8 @@ -- Get the mw.wikibase.entity object for the current page wikibase.getEntity = function( id ) - checkTypeMulti( 'getEntity', 1, id, { 'string', 'nil' } ) - - if id == nil then - id = getEntityIdForCurrentPage() - end + id = setToIdOfConnectedItemIfNil( id ) + checkTypeMulti( 'getEntity', 1, id, { 'string' } ) if not php.getSetting( 'allowArbitraryDataAccess' ) and id ~= getEntityIdForCurrentPage() then error( 'Access to arbitrary items has been disabled.', 2 ) @@ -85,6 +88,7 @@ -- -- @param id wikibase.label = function( id ) + id = setToIdOfConnectedItemIfNil( id ) checkType( 'label', 1, id, 'string' ) return php.getLabel( id ) @@ -94,6 +98,7 @@ -- -- @param id wikibase.description = function( id ) + id = setToIdOfConnectedItemIfNil( id ) checkType( 'description', 1, id, 'string' ) return php.getDescription( id ) @@ -103,6 +108,7 @@ -- -- @param id wikibase.sitelink = function( id ) + id = setToIdOfConnectedItemIfNil( id ) checkType( 'sitelink', 1, id, 'string' ) return php.getSiteLinkPageName( id ) -- To view, visit https://gerrit.wikimedia.org/r/210907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief78b1c8f591d1da8a6ca03e6cb02c339954a99d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Enable English-Spanish dictionary - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: CX: Enable English-Spanish dictionary .. CX: Enable English-Spanish dictionary Change-Id: I1a78b6c1c2ed16a719fadcf8ac55983545f46961 --- M hieradata/common/cxserver.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 0343a4b..ee45326 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -208,5 +208,7 @@ JsonDict: 'ca': - 'es' + 'en': +- 'es' 'es': - 'ca' -- To view, visit https://gerrit.wikimedia.org/r/210887 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a78b6c1c2ed16a719fadcf8ac55983545f46961 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Use RESTBase API for page fetch - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: CX: Use RESTBase API for page fetch .. CX: Use RESTBase API for page fetch Depends on: * https://gerrit.wikimedia.org/r/207039 Change-Id: Ib6b91adda5c486a090b7d7f11af82282b215653a --- M modules/cxserver/manifests/init.pp M modules/cxserver/templates/config.erb 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/cxserver/manifests/init.pp b/modules/cxserver/manifests/init.pp index c6f1d79..6d02056 100644 --- a/modules/cxserver/manifests/init.pp +++ b/modules/cxserver/manifests/init.pp @@ -18,6 +18,8 @@ # have write access to cxserver user. # [*parsoid*] # Url to Parsoid service. +# [*restbase*] +# Url to Restbase API. # [*apertium*] # Url to Apertium service. # [*yandex_url*] @@ -36,6 +38,7 @@ $conf_path = '/srv/deployment/cxserver/deploy/src/config.js', $log_dir = '/var/log/cxserver', $parsoid = 'http://parsoid-lb.eqiad.wikimedia.org', +$restbase = 'https://@lang.wikipedia.org/api/rest_v1/page/html/@title', $apertium = 'http://apertium.svc.eqiad.wmnet:2737', $yandex_url = undef, $yandex_api_key = undef, diff --git a/modules/cxserver/templates/config.erb b/modules/cxserver/templates/config.erb index 3d9cd11..72ecb21 100644 --- a/modules/cxserver/templates/config.erb +++ b/modules/cxserver/templates/config.erb @@ -11,6 +11,7 @@ %- end -% logDir: '%= @log_dir %', 'parsoid.api': '%= @parsoid %', + 'restbase.url': '%= @restbase %', 'mt.apertium.api': '%= @apertium %', %- if @yandex_url -% 'mt.yandex.api': '%= @yandex_url %', -- To view, visit https://gerrit.wikimedia.org/r/207378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6b91adda5c486a090b7d7f11af82282b215653a Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf_deploy - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'master' into wmf_deploy .. Merge branch 'master' into wmf_deploy Change-Id: Ibd4e6b3676ec7d41478d0ac98185882efd75aeb6 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: AndyRussG: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/210906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd4e6b3676ec7d41478d0ac98185882efd75aeb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added tagcloud result format - change (mediawiki...Cargo)
jenkins-bot has submitted this change and it was merged. Change subject: added tagcloud result format .. added tagcloud result format Change-Id: I76d34af8365690395a68494c638f23b8b69ccc18 --- M Cargo.php M CargoQueryDisplayer.php A formats/CargoTagcloudFormat.php 3 files changed, 124 insertions(+), 0 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/Cargo.php b/Cargo.php index ee43bb5..213fc6a 100644 --- a/Cargo.php +++ b/Cargo.php @@ -114,6 +114,7 @@ $wgAutoloadClasses['CargoCategoryFormat'] = $dir . '/formats/CargoCategoryFormat.php'; $wgAutoloadClasses['CargoBarChartFormat'] = $dir . '/formats/CargoBarChartFormat.php'; $wgAutoloadClasses['CargoGalleryFormat'] = $dir . '/formats/CargoGalleryFormat.php'; +$wgAutoloadClasses['CargoTagcloudFormat'] = $dir . '/formats/CargoTagcloudFormat.php'; $wgAutoloadClasses['CargoPageSchemas'] = $dir . '/CargoPageSchemas.php'; diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php index e626ae7..c5e8ac3 100644 --- a/CargoQueryDisplayer.php +++ b/CargoQueryDisplayer.php @@ -44,6 +44,7 @@ 'category' = 'CargoCategoryFormat', 'bar chart' = 'CargoBarChartFormat', 'gallery' = 'CargoGalleryFormat', + 'tag cloud' = 'CargoTagcloudFormat', ); return $formatClasses; } diff --git a/formats/CargoTagcloudFormat.php b/formats/CargoTagcloudFormat.php new file mode 100644 index 000..8bab7aa --- /dev/null +++ b/formats/CargoTagcloudFormat.php @@ -0,0 +1,122 @@ +?php +/** + * @author Cindy Cicalese + * @ingroup Cargo + */ + +class CargoTagcloudFormat extends CargoDisplayFormat { + + function allowedParameters() { + return array( + 'template', + 'min size', // size of the smallest tags in percent (default 80) + 'max size' // size of the biggest tags in percent (default 200) + ); + } + + /** +* +* @param array $valuesTagcloud Unused +* @param array $formattedValuesTagcloud +* @param array $fieldDescriptions +* @param array $displayParams +* @return string HTML +*/ + function display( $valuesTagcloud, $formattedValuesTagcloud, $fieldDescriptions, $displayParams ) { + + $this-mOutput-addModuleStyles( 'ext.cargo.main' ); + + if ( count( $fieldDescriptions ) 2 ) { + return ''; + } + + $fieldNames = array_keys( $fieldDescriptions ); + $tagFieldName = $fieldNames[0]; + $countFieldName = $fieldNames[1]; + + if ( $fieldDescriptions[$countFieldName]-mType != 'Integer' ) { + return ''; + } + + $tags = array(); + + foreach ( $formattedValuesTagcloud as $row ) { + + $tag = $row[$tagFieldName]; + $count = $row[$countFieldName]; + + if ( strlen( $tag ) 0 is_numeric( $count ) $count 0 ) { + + $tags[$tag] = $count; + + } + + } + + if ( $tags == array() ) { + return ''; + } + + if ( isset( $displayParams['max size'] ) ) { + $maxSize = $displayParams['max size']; + } else { + $maxSize = 200; + } + + if ( isset( $displayParams['min size'] ) ) { + $minSize = $displayParams['min size']; + } else { + $minSize = 80; + } + + $maxSizeIncrease = $maxSize - $minSize; + + $minCount = min( $tags ); + $maxCount = max( $tags ); + + if ( $maxCount == $minCount ) { + $size = $minSize + $maxSizeIncrease / 2; + } else { + $denominator = log( $maxCount ) - log( $minCount ); + $sizes = array(); + } + + $attrs = array ( + 'class' = 'cargoTagcloud', + 'align' = 'justify' + ); + + $text = Html::openElement( 'div', $attrs ); + + foreach ( $tags as $tag = $count ) { + if ( isset( $displayParams['template'] ) ) { + $tagstring = '{{' . $displayParams['template'] . + '|' . $tag . '|' . $count . '}}'; + $tagstring = CargoUtils::smartParse( $tagstring, null ); + } else { + $tagstring = $tag; + } +
[MediaWiki-commits] [Gerrit] Update cxserver to 74149f8 - change (mediawiki...deploy)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210893 Change subject: Update cxserver to 74149f8 .. Update cxserver to 74149f8 Changes: 74149f8 Dictionary: Enable en-es dictionary Change-Id: Ib90692b723a587a6544bf8ff2291f4f5fb2d2f95 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy refs/changes/93/210893/1 diff --git a/src b/src index a1d92f5..74149f8 16 --- a/src +++ b/src -Subproject commit a1d92f5551e8993dcff17c2c2686c27e494c3c70 +Subproject commit 74149f803bb9b710f9f7d4a81828d5ca96374637 -- To view, visit https://gerrit.wikimedia.org/r/210893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib90692b723a587a6544bf8ff2291f4f5fb2d2f95 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't log exception when missing permissions, just ignore it - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/210902 Change subject: Don't log exception when missing permissions, just ignore it .. Don't log exception when missing permissions, just ignore it Similar to format() formatApi() fails on a couple of occasions, one of which being when a user has insufficient permissions. That's an acceptable error: we shouldn't log it, just ignore that row. format() already counters this by first checking permissions, then passing it off to formatApi() - if that one fails, it's not a permission issue we should log the failure. I've just made getLogTextLinks do the same... Change-Id: Ibc45d1a81e023cd0942374fdc5e4fc6a978f936f --- M Hooks.php M includes/Formatter/RecentChanges.php 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/02/210902/1 diff --git a/Hooks.php b/Hooks.php index 245bca3..1c420aa 100644 --- a/Hooks.php +++ b/Hooks.php @@ -391,7 +391,7 @@ /** @var Flow\Formatter\RecentChanges $formatter */ $formatter = Container::get( 'formatter.recentchanges' ); - $links = $formatter-getLogTextLinks( $row, $changesList, $block, $links ); + $logTextLinks = $formatter-getLogTextLinks( $row, $changesList, $block, $links ); } catch ( Exception $e ) { wfDebugLog( 'Flow', __METHOD__ . ': Exception formatting rc logtext ' . $rc-getAttribute( 'rc_id' ) . ' ' . $e ); MWExceptionHandler::logException( $e ); @@ -400,6 +400,11 @@ } restore_error_handler(); + if ($logTextLinks === false) { + return false; + } + + $links = $logTextLinks; return true; } diff --git a/includes/Formatter/RecentChanges.php b/includes/Formatter/RecentChanges.php index 1c0d684..64a62ad 100644 --- a/includes/Formatter/RecentChanges.php +++ b/includes/Formatter/RecentChanges.php @@ -159,11 +159,15 @@ * @param IContextSource $ctx * @param array $block * @param array $links -* @return array +* @return array|false Links array, or false on failure * @throws FlowException * @throws \Flow\Exception\InvalidInputException */ public function getLogTextLinks( RecentChangesRow $row, IContextSource $ctx, array $block, array $links = array() ) { + if ( !$this-permissions-isAllowed( $row-revision, 'recentchanges' ) ) { + return false; + } + $old = unserialize( $block[count( $block ) - 1]-mAttribs['rc_params'] ); $oldId = $old ? UUID::create( $old['flow-workflow-change']['revision'] ) : $row-revision-getRevisionId(); -- To view, visit https://gerrit.wikimedia.org/r/210902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc45d1a81e023cd0942374fdc5e4fc6a978f936f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Fix the summary line in generate_user_files for use... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Fix the summary line in generate_user_files for user-fixes.py .. [IMPROV] Fix the summary line in generate_user_files for user-fixes.py Change-Id: I9bd2f99e5e11f3738869b0caa646f2c30e7e0095 --- M generate_user_files.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 8abd8c5..3d22553 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -320,7 +320,7 @@ fixes['example'] = { 'regex': True, 'msg': { -'_default':u'no summary specified', +'_default': u'no summary specified', }, 'replacements': [ (r'\bword\b', u'two words'), -- To view, visit https://gerrit.wikimedia.org/r/210858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bd2f99e5e11f3738869b0caa646f2c30e7e0095 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] On missing php-xml, don't mention Mandrake explicitly in the... - change (mediawiki/core)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210904 Change subject: On missing php-xml, don't mention Mandrake explicitly in the installer .. On missing php-xml, don't mention Mandrake explicitly in the installer Mandrake would be Mageia now, but the package advice may apply (or not) to other distributions as well as the package exists in multiple. https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Config-xml-bad/es Change-Id: I6910e0400f2ad9f97f54cb970165d1146d6bf0a2 --- M includes/installer/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/04/210904/1 diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json index 0dc8e88..c19e3ee 100644 --- a/includes/installer/i18n/en.json +++ b/includes/installer/i18n/en.json @@ -57,7 +57,7 @@ config-magic-quotes-sybase: strongFatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] is active!/strong\nThis option corrupts data input unpredictably.\nYou cannot install or use MediaWiki unless this option is disabled., config-mbstring: strongFatal: [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] is active!/strong\nThis option causes errors and may corrupt data unpredictably.\nYou cannot install or use MediaWiki unless this option is disabled., config-safe-mode: strongWarning:/strong PHP's [http://www.php.net/features.safe-mode safe mode] is active.\nIt may cause problems, particularly if using file uploads and codemath/code support., - config-xml-bad: PHP's XML module is missing.\nMediaWiki requires functions in this module and will not work in this configuration.\nIf you're running Mandrake, install the php-xml package., + config-xml-bad: PHP's XML module is missing.\nMediaWiki requires functions in this module and will not work in this configuration.\nYou may need to install the php-xml RPM package., config-pcre-old: strongFatal:/strong PCRE $1 or later is required.\nYour PHP binary is linked with PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE More information]., config-pcre-no-utf8: strongFatal:/strong PHP's PCRE module seems to be compiled without PCRE_UTF8 support.\nMediaWiki requires UTF-8 support to function correctly., config-memory-raised: PHP's codememory_limit/code is $1, raised to $2., -- To view, visit https://gerrit.wikimedia.org/r/210904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6910e0400f2ad9f97f54cb970165d1146d6bf0a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update CentralNotice - change (mediawiki/core)
AndyRussG has uploaded a new change for review. https://gerrit.wikimedia.org/r/210909 Change subject: Update CentralNotice .. Update CentralNotice Change-Id: I977d899e2f97a6e5e216a7a2b583d0b37a1c69ae --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/210909/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index a1ed003..bab5f9a 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit a1ed003191d3b6162e2e750facfb0b501be42917 +Subproject commit bab5f9ac1a2b6bd07ed49fac0cb460dd8992c1a6 -- To view, visit https://gerrit.wikimedia.org/r/210909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I977d899e2f97a6e5e216a7a2b583d0b37a1c69ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: AndyRussG andrew.green...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-add eeden to the active set of nameservers - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Re-add eeden to the active set of nameservers .. Re-add eeden to the active set of nameservers Change-Id: I044c7cf2e5588528ff7b221a136c4a45cad15d03 --- M manifests/role/authdns.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index 4ef54b3..b8ca0d1 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -12,6 +12,7 @@ $nameservers = [ 'rubidium.wikimedia.org', 'baham.wikimedia.org', +'eeden.wikimedia.org', 'multatuli.wikimedia.org', ] -- To view, visit https://gerrit.wikimedia.org/r/210898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I044c7cf2e5588528ff7b221a136c4a45cad15d03 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] authdns: fix user creation on pristine systems - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: authdns: fix user creation on pristine systems .. authdns: fix user creation on pristine systems Adding the user account with a git-shell as a shell requires that git-shell already exists. Thus, User['authdns'] needs a dependency to the git package. Change-Id: I8a7b6705ce2bf5a434b9a66a2aca91207f7f0db0 --- M modules/authdns/manifests/account.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/authdns/manifests/account.pp b/modules/authdns/manifests/account.pp index fd1b4dc..d0d46eb 100644 --- a/modules/authdns/manifests/account.pp +++ b/modules/authdns/manifests/account.pp @@ -13,6 +13,7 @@ system = true, managehome = true, shell = '/usr/bin/git-shell', +require= Package['git-core'], } group { $group: ensure = 'present', -- To view, visit https://gerrit.wikimedia.org/r/210911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a7b6705ce2bf5a434b9a66a2aca91207f7f0db0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cxserver to 74149f8 - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Update cxserver to 74149f8 .. Update cxserver to 74149f8 Changes: 74149f8 Dictionary: Enable en-es dictionary Change-Id: Ib90692b723a587a6544bf8ff2291f4f5fb2d2f95 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index a1d92f5..74149f8 16 --- a/src +++ b/src -Subproject commit a1d92f5551e8993dcff17c2c2686c27e494c3c70 +Subproject commit 74149f803bb9b710f9f7d4a81828d5ca96374637 -- To view, visit https://gerrit.wikimedia.org/r/210893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib90692b723a587a6544bf8ff2291f4f5fb2d2f95 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eeden.esams - eeden, add AAAA - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210900 Change subject: eeden.esams - eeden, add .. eeden.esams - eeden, add Change-Id: I8a8b400eb2ba2c101d18c071aca0d37f518853ea --- M templates/174.198.91.in-addr.arpa M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 3 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/00/210900/1 diff --git a/templates/174.198.91.in-addr.arpa b/templates/174.198.91.in-addr.arpa index 11a03ca..58d4f4a 100644 --- a/templates/174.198.91.in-addr.arpa +++ b/templates/174.198.91.in-addr.arpa @@ -34,7 +34,7 @@ 113 1H IN PTR hooft.esams.wikimedia.org. 114 1H IN PTR multatuli.wikimedia.org. -121 1H IN PTR eeden.esams.wikimedia.org. +121 1H IN PTR eeden.wikimedia.org. 122 1H IN PTR maerlant.wikimedia.org. ; unused 91.198.174.128/26 (91.198.174.128 - 91.198.174.191) diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 09e883f..657ce7e 100644 --- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -26,6 +26,7 @@ ; Machines +1.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR eeden.wikimedia.org. 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR nescio.wikimedia.org. 3.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR hooft.esams.wikimedia.org. 4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR multatuli.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index a30b620..63e273e 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -716,6 +716,8 @@ ; Servers +eeden1H IN A 91.198.174.121 + 1H IN 2620:0:862:1:91:198:174:121 maerlant 1H IN A 91.198.174.122 1H IN 2620:0:862:1:91:198:174:122 multatuli1H IN A 91.198.174.114 @@ -738,7 +740,6 @@ slauerhoff-array1H IN A91.198.174.107 hooft 1H IN A91.198.174.113 1H IN 2620:0:862:1:91:198:174:113 -eeden 1H IN A91.198.174.121 ; Management -- To view, visit https://gerrit.wikimedia.org/r/210900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a8b400eb2ba2c101d18c071aca0d37f518853ea Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove authdns role from multatuli - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210899 Change subject: Remove authdns role from multatuli .. Remove authdns role from multatuli Served its primary purpose. Change-Id: I9029f2b049438aa69278b446ec209a9205382e9e --- M manifests/role/authdns.pp M manifests/site.pp 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/210899/1 diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index b8ca0d1..89c6d2a 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -13,7 +13,6 @@ 'rubidium.wikimedia.org', 'baham.wikimedia.org', 'eeden.wikimedia.org', -'multatuli.wikimedia.org', ] # These are all of the public addresses the Internet finds us at diff --git a/manifests/site.pp b/manifests/site.pp index 551e52f..c1eb5bb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1715,7 +1715,6 @@ interface = 'eth0', } include standard -include role::authdns::server } node 'ms1001.wikimedia.org' { -- To view, visit https://gerrit.wikimedia.org/r/210899 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9029f2b049438aa69278b446ec209a9205382e9e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove eeden from the set of active NS - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210896 Change subject: Remove eeden from the set of active NS .. Remove eeden from the set of active NS About to be renamed, solves a chicken-and-egg loop. Change-Id: I24295c47d847b6154354ba9c1252c63f088ba975 --- M manifests/role/authdns.pp 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/210896/1 diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index 63dd237..4ef54b3 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -12,7 +12,6 @@ $nameservers = [ 'rubidium.wikimedia.org', 'baham.wikimedia.org', -'eeden.esams.wikimedia.org', 'multatuli.wikimedia.org', ] -- To view, visit https://gerrit.wikimedia.org/r/210896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24295c47d847b6154354ba9c1252c63f088ba975 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename eeden.esams - eeden, switch to jessie - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210897 Change subject: Rename eeden.esams - eeden, switch to jessie .. Rename eeden.esams - eeden, switch to jessie Change-Id: I019d6387a7ce39ecbced20b74f6db3c54ace83d2 --- M manifests/misc/monitoring.pp M manifests/site.pp M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/210897/1 diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp index 923a319..45da4e1 100644 --- a/manifests/misc/monitoring.pp +++ b/manifests/misc/monitoring.pp @@ -115,7 +115,7 @@ } class misc::monitoring::views::dns { -$auth_dns_host_regex = '^(rubidium|baham|eeden.esams).wikimedia.org$' +$auth_dns_host_regex = '^(rubidium|baham|eeden).wikimedia.org$' $rec_dns_host_regex = '^(chromium|hydrogen).wikimedia.org$' ganglia_new::web::view { 'authoritative_dns': diff --git a/manifests/site.pp b/manifests/site.pp index fc01002..551e52f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -894,7 +894,7 @@ role cache::text } -node 'eeden.esams.wikimedia.org' { +node 'eeden.wikimedia.org' { interface::add_ip6_mapped { 'main': interface = 'eth0', } diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 46726a8..b9964e3 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -1896,7 +1896,9 @@ host eeden { hardware ethernet a4:ba:db:30:d8:80; - fixed-address eeden.esams.wikimedia.org; + fixed-address eeden.wikimedia.org; + option pxelinux.pathprefix jessie-installer/; + filename jessie-installer/debian-installer/amd64/pxelinux.0; } host einsteinium { -- To view, visit https://gerrit.wikimedia.org/r/210897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I019d6387a7ce39ecbced20b74f6db3c54ace83d2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-add eeden to the active set of nameservers - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210898 Change subject: Re-add eeden to the active set of nameservers .. Re-add eeden to the active set of nameservers Change-Id: I044c7cf2e5588528ff7b221a136c4a45cad15d03 --- M manifests/role/authdns.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/210898/1 diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index 4ef54b3..b8ca0d1 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -12,6 +12,7 @@ $nameservers = [ 'rubidium.wikimedia.org', 'baham.wikimedia.org', +'eeden.wikimedia.org', 'multatuli.wikimedia.org', ] -- To view, visit https://gerrit.wikimedia.org/r/210898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I044c7cf2e5588528ff7b221a136c4a45cad15d03 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ContentTranslation to a27d44d - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210903 Change subject: Update ContentTranslation to a27d44d .. Update ContentTranslation to a27d44d Change-Id: I692b6328cc54549d72671e1a99ab7fad2e5c09cd --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/210903/1 diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index 0ee6dac..a27d44d 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit 0ee6dac83780bf174d34be978a8396beebc8945e +Subproject commit a27d44d8f27efa5800e81a0c2d2463033395ca74 -- To view, visit https://gerrit.wikimedia.org/r/210903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I692b6328cc54549d72671e1a99ab7fad2e5c09cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FEAT] PatchManager: Review like git --patch - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/210908 Change subject: [FEAT] PatchManager: Review like git --patch .. [FEAT] PatchManager: Review like git --patch Reviewing diffs is with this patch similar to git's --patch option in git checkout for example. It uses context and allows to split two adjacent hunks and to move freely through the hunks. Change-Id: I14065ab892a05284f92a5cce0fb4dc40bc7c42d7 --- M pywikibot/diff.py 1 file changed, 123 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/08/210908/1 diff --git a/pywikibot/diff.py b/pywikibot/diff.py index fb5667f..e09becf 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -11,6 +11,7 @@ import difflib +import math import sys from collections import Sequence @@ -358,53 +359,135 @@ def review_hunks(self): Review hunks. -help_msg = ['y - accept this hunk', -'n - do not accept this hunk', -'s - do not accept this hunk and stop reviewing', -'a - accept this hunk and all other pending', -'r - review later', -'h - help', -] +def find_pending(start, end): +step = -1 if start end else +1 +for pending in range(start, end, step): +if super_hunks[pending].reviewed == Hunk.PENDING: +return pending -question = 'Accept this hunk?' -answers = [('yes', 'y'), ('no', 'n'), ('stop', 's'), ('all', 'a'), - ('review', 'r'), ('help', 'h')] -actions = {'y': Hunk.APPR, - 'n': Hunk.NOT_APPR, - 's': Hunk.NOT_APPR, - 'a': Hunk.APPR, - 'r': Hunk.PENDING, - } +help_msg = {'y': 'accept this hunk', +'n': 'do not accept this hunk', +'q': 'do not accept this hunk and quit reviewing', +'a': 'accept this hunk and all other pending', +'d': 'do not apply this hunk or any of the later hunks in the file', +'g': 'select a hunk to go to', +#'/': 'search for a hunk matching the given regex', +'j': 'leave this hunk undecided, see next undecided hunk', +'J': 'leave this hunk undecided, see next hunk', +'k': 'leave this hunk undecided, see previous undecided hunk', +'K': 'leave this hunk undecided, see previous hunk', +'s': 'split this hunk into smaller ones', +'?': 'help', +} -pending = [h for h in self.hunks if h.reviewed == h.PENDING] +super_hunks = self._generate_super_hunks(h for h in self.hunks if h.reviewed == Hunk.PENDING) +position = 0 -while pending: +while any(any(hunk.reviewed == Hunk.PENDING for hunk in super_hunk) + for super_hunk in super_hunks): -hunk = pending.pop(0) +super_hunk = super_hunks[position] -pywikibot.output(self._generate_diff([hunk])) -choice = pywikibot.input_choice(question, answers, default='r', -automatic_quit=False) +next_pending = find_pending(position + 1, len(super_hunks)) +prev_pending = find_pending(position - 1, -1) -if choice in actions.keys(): -hunk.reviewed = actions[choice] -if choice == 's': -while pending: -hunk = pending.pop(0) -hunk.reviewed = hunk.NOT_APPR -break -elif choice == 'a': -while pending: -hunk = pending.pop(0) -hunk.reviewed = hunk.APPR -break -elif choice == 'h': -pywikibot.output(u'\03{purple}%s\03{default}' % u'\n'.join(help_msg)) -pending.insert(0, hunk) -elif choice == 'r': -pending.append(hunk) +answers = ['y', 'n', 'q', 'a', 'd', 'g'] +if next_pending is not None: +answers += ['j'] +if position len(super_hunks) - 1: +answers += ['J'] +if prev_pending is not None: +answers += ['k'] +if position 0: +answers += ['K'] +if len(super_hunk) 1: +answers += ['s'] +answers += ['?'] -return +pywikibot.output(self._generate_diff(super_hunk)) +choice = pywikibot.input('Accept this hunk [' + ','.join(answers) + ']?') +if choice not in answers: +choice = '?' + +if choice == 'y' or
[MediaWiki-commits] [Gerrit] authdns: fix user creation on pristine systems - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210911 Change subject: authdns: fix user creation on pristine systems .. authdns: fix user creation on pristine systems Adding the user account with a git-shell as a shell requires that git-shell already exists. Thus, User['authdns'] needs a dependency to the git package. Change-Id: I8a7b6705ce2bf5a434b9a66a2aca91207f7f0db0 --- M modules/authdns/manifests/account.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/11/210911/1 diff --git a/modules/authdns/manifests/account.pp b/modules/authdns/manifests/account.pp index fd1b4dc..d0d46eb 100644 --- a/modules/authdns/manifests/account.pp +++ b/modules/authdns/manifests/account.pp @@ -13,6 +13,7 @@ system = true, managehome = true, shell = '/usr/bin/git-shell', +require= Package['git-core'], } group { $group: ensure = 'present', -- To view, visit https://gerrit.wikimedia.org/r/210911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a7b6705ce2bf5a434b9a66a2aca91207f7f0db0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update namespace aliases for ne-wiki - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/210886 Change subject: Update namespace aliases for ne-wiki .. Update namespace aliases for ne-wiki Change-Id: Id4826ab6ba6d8fb1e1383820eb49a2f4a9a6ae0b --- M families/wikipedia_family.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/86/210886/1 diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index af90c5a..a520985 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -81,6 +81,10 @@ self.namespaces[14]['ja'] = [u'Category', u'カテゴリ'] self.namespaces[15]['ja'] = [u'Category‐ノート', u'カテゴリ・トーク'] self.namespaces[829]['ja'] = [u'モジュール‐ノート', u'モジュール・トーク'] +self.namespaces[2]['ne'] = [u'प्रयोगकर्ता', u'U', u'प्र', u'प्रवा'] +self.namespaces[3]['ne'] = [u'प्रयोगकर्ता वार्ता', u'UT'] +self.namespaces[10]['ne'] = [u'ढाँचा', u'T', u'ढाँ'] +self.namespaces[15]['ne'] = [u'श्रेणी वार्ता', u'CT'] self.namespaces[12]['nl'] = [u'Help', u'H'] self.namespaces[2]['ru'] = [u'Участник', u'U', u'У', u'Участница'] self.namespaces[3]['ru'] =[u'Обсуждение участника', u'UT', u'ОУ', u'Обсуждение участницы'] -- To view, visit https://gerrit.wikimedia.org/r/210886 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4826ab6ba6d8fb1e1383820eb49a2f4a9a6ae0b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update namespace aliases for ne-wiki - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: Update namespace aliases for ne-wiki .. Update namespace aliases for ne-wiki Change-Id: Id4826ab6ba6d8fb1e1383820eb49a2f4a9a6ae0b --- M families/wikipedia_family.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index af90c5a..a520985 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -81,6 +81,10 @@ self.namespaces[14]['ja'] = [u'Category', u'カテゴリ'] self.namespaces[15]['ja'] = [u'Category‐ノート', u'カテゴリ・トーク'] self.namespaces[829]['ja'] = [u'モジュール‐ノート', u'モジュール・トーク'] +self.namespaces[2]['ne'] = [u'प्रयोगकर्ता', u'U', u'प्र', u'प्रवा'] +self.namespaces[3]['ne'] = [u'प्रयोगकर्ता वार्ता', u'UT'] +self.namespaces[10]['ne'] = [u'ढाँचा', u'T', u'ढाँ'] +self.namespaces[15]['ne'] = [u'श्रेणी वार्ता', u'CT'] self.namespaces[12]['nl'] = [u'Help', u'H'] self.namespaces[2]['ru'] = [u'Участник', u'U', u'У', u'Участница'] self.namespaces[3]['ru'] =[u'Обсуждение участника', u'UT', u'ОУ', u'Обсуждение участницы'] -- To view, visit https://gerrit.wikimedia.org/r/210886 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4826ab6ba6d8fb1e1383820eb49a2f4a9a6ae0b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Xqt i...@gno.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Enable MT for newly updated Apertium packages - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210890 Change subject: CX: Enable MT for newly updated Apertium packages .. CX: Enable MT for newly updated Apertium packages Change-Id: I10e32054070b60ab573e6a3337bc9cafef7d6ce7 --- M hieradata/common/cxserver.yaml 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/210890/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 0343a4b..2bc6430 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -169,21 +169,40 @@ - 'zu' mt: Apertium: + 'an': +- 'es' + 'ast': +- 'es' 'bg': - 'mk' 'ca': - 'es' +- 'oc' - 'pt' 'en': - 'ca' - 'eo' +- 'gl' - 'es' - 'sh' 'es': +- 'an' +- 'ast' - 'ca' +- 'fr' +- 'gl' +- 'oc' - 'pt' + 'eu': +- 'es' + 'fr': +- 'es' + 'gl': +- 'es' 'id': - 'ms' + 'kk': +- 'tt' 'mk': - 'bg' - 'sh' @@ -196,14 +215,16 @@ 'no': - 'nn' 'pt': -- 'es' - 'ca' +- 'es' 'sh': - 'sl' 'sl': - 'sh' 'sv': - 'da' + 'tt': +- 'kk' dictionary: JsonDict: 'ca': -- To view, visit https://gerrit.wikimedia.org/r/210890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10e32054070b60ab573e6a3337bc9cafef7d6ce7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Enable MT for newly updated Apertium packages - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: CX: Enable MT for newly updated Apertium packages .. CX: Enable MT for newly updated Apertium packages Change-Id: I10e32054070b60ab573e6a3337bc9cafef7d6ce7 --- M hieradata/common/cxserver.yaml 1 file changed, 22 insertions(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index ee45326..d524a43 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -169,21 +169,40 @@ - 'zu' mt: Apertium: + 'an': +- 'es' + 'ast': +- 'es' 'bg': - 'mk' 'ca': - 'es' +- 'oc' - 'pt' 'en': - 'ca' - 'eo' +- 'gl' - 'es' - 'sh' 'es': +- 'an' +- 'ast' - 'ca' +- 'fr' +- 'gl' +- 'oc' - 'pt' + 'eu': +- 'es' + 'fr': +- 'es' + 'gl': +- 'es' 'id': - 'ms' + 'kk': +- 'tt' 'mk': - 'bg' - 'sh' @@ -196,14 +215,16 @@ 'no': - 'nn' 'pt': -- 'es' - 'ca' +- 'es' 'sh': - 'sl' 'sl': - 'sh' 'sv': - 'da' + 'tt': +- 'kk' dictionary: JsonDict: 'ca': -- To view, visit https://gerrit.wikimedia.org/r/210890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I10e32054070b60ab573e6a3337bc9cafef7d6ce7 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure input is encoded - change (mediawiki...citoid)
Mobrovac has submitted this change and it was merged. Change subject: Ensure input is encoded .. Ensure input is encoded In root.js: * Encode format as a URI component * Encode search field as a URI In CitoidService.js, modify encoding in distinguish method: * URI encode DOIs and URLs * Leave PMID and PMC alone as these are definitionally alphanumeric. Add test file encoding.js for cases when: * Javascript in search or format field * Non-fully url encoded url in search field * JSON in search or format field Bug: T98420 Change-Id: I5c0a9df01a3b71f1ed58200d3690648b516a0d8c --- M lib/CitoidService.js M routes/root.js A test/features/errors/encoding.js 3 files changed, 137 insertions(+), 17 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/lib/CitoidService.js b/lib/CitoidService.js index 2084481..d0dc979 100644 --- a/lib/CitoidService.js +++ b/lib/CitoidService.js @@ -316,10 +316,10 @@ if (matchHTTP || matchWWW){ this.stats.increment('input.url'); - callback(matchHTTP ? matchHTTP[0] : 'http://' + matchWWW[0], this.requestFromURL.bind(this)); + callback(matchHTTP ? encodeURI(matchHTTP[0]) : 'http://' + encodeURI(matchWWW[0]), this.requestFromURL.bind(this)); } else if (matchDOI) { this.stats.increment('input.doi'); - callback(matchDOI[0], this.requestFromDOI.bind(this)); + callback(encodeURI(matchDOI[0]), this.requestFromDOI.bind(this)); } else if (matchPMID) { this.stats.increment('input.pmid'); callback(matchPMID[0], this.requestFromPM.bind(this, 'PMID')); @@ -335,7 +335,7 @@ this.stats.increment('input.url'); var parsedURL = urlParse.parse(search); if (!parsedURL.protocol){ - search = 'http://'+ search; + search = 'http://'+ encodeURI(search); } callback(search, this.requestFromURL.bind(this)); //assume url if not doi } diff --git a/routes/root.js b/routes/root.js index 5744fca..f34c024 100644 --- a/routes/root.js +++ b/routes/root.js @@ -35,12 +35,13 @@ */ router.post('/url', function(req, res) { - var opts, - acceptLanguage = req.headers['accept-language'], - format = req.body.format, - requestedURL = req.body.url; + var opts; + var acceptLanguage = req.headers['accept-language']; + var format = req.body.format; + var requestedURL = req.body.url; + var eFormat = encodeURIComponent(format); - // temp backwards compatibility + // Temp backwards compatibility if (!format) { format = 'mwDeprecated'; } @@ -53,13 +54,13 @@ if (!app.formats[format]) { res.status(400).type('application/json'); - res.send({Error:'Invalid format requested ' + format}); + res.send({Error:'Invalid format requested ' + eFormat}); return; } opts = { search: requestedURL, - format: format, + format: eFormat, acceptLanguage: acceptLanguage }; @@ -77,10 +78,12 @@ */ router.get('/api', function(req, res) { - var dSearch, opts, - acceptLanguage = req.headers['accept-language'], - format = req.query.format, - search = req.query.search; + var dSearch; + var opts; + var acceptLanguage = req.headers['accept-language']; + var format = req.query.format; + var search = req.query.search; + var eFormat = encodeURIComponent(format); // Encoded format if (!search) { res.status(400).type('application/json'); @@ -92,14 +95,15 @@ return; } else if (!app.formats[format]) { res.status(400).type('application/json'); - res.send({Error:'Invalid format requested ' + format}); + res.send({Error:'Invalid format requested ' + eFormat}); return; } - dSearch = decodeURIComponent(search); //decode urlencoded search string + dSearch = decodeURIComponent(encodeURI(search)); // Decode urlencoded search string + opts = { search: dSearch, - format: format, + format: eFormat, acceptLanguage: acceptLanguage }; diff --git a/test/features/errors/encoding.js b/test/features/errors/encoding.js new file mode 100644 index 000..815c964 --- /dev/null +++ b/test/features/errors/encoding.js @@ -0,0 +1,116 @@ +'use strict'; + + +var preq = require('preq'); +var assert = require('../../utils/assert.js'); +var server =
[MediaWiki-commits] [Gerrit] Update CentralNotice - change (mediawiki/core)
AndyRussG has uploaded a new change for review. https://gerrit.wikimedia.org/r/210910 Change subject: Update CentralNotice .. Update CentralNotice Change-Id: I7634c8f6fb73dc3e9e885c49b343480ca8498320 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/10/210910/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index a1ed003..bab5f9a 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit a1ed003191d3b6162e2e750facfb0b501be42917 +Subproject commit bab5f9ac1a2b6bd07ed49fac0cb460dd8992c1a6 -- To view, visit https://gerrit.wikimedia.org/r/210910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7634c8f6fb73dc3e9e885c49b343480ca8498320 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: AndyRussG andrew.green...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: CX: Add Hebrew (he) as target language - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210914 Change subject: Beta: CX: Add Hebrew (he) as target language .. Beta: CX: Add Hebrew (he) as target language Bug: T99082 Change-Id: Ie507750cb791d475910cb029b5534ea08b30af68 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/210914/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index ed285b4..e9bf2b7 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -83,6 +83,7 @@ - 'gag' - 'gl' - 'gu' +- 'he' - 'hy' - 'id' - 'it' -- To view, visit https://gerrit.wikimedia.org/r/210914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie507750cb791d475910cb029b5534ea08b30af68 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Page.touch() for touch script - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/210913 Change subject: Use Page.touch() for touch script .. Use Page.touch() for touch script remove obsolete -redir parameter Change-Id: I771bd536cd3c9dd7383d8ecf24e72f630945e58c --- M scripts/touch.py 1 file changed, 4 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/13/210913/1 diff --git a/scripts/touch.py b/scripts/touch.py index 359d320..a10e241 100755 --- a/scripts/touch.py +++ b/scripts/touch.py @@ -12,8 +12,6 @@ -purgeDo not touch but purge the page --redirspecifies that the bot should work on redirect pages; - otherwise, they will be skipped. Cannot be used with -purge. # # (C) Pywikibot team, 2009-2015 @@ -37,26 +35,15 @@ def __init__(self, generator, **kwargs): Initialize a TouchBot instance with the options and generator. -self.availableOptions.update({ -'redir': False, # include redirect pages -}) - super(TouchBot, self).__init__(generator=generator, **kwargs) def treat(self, page): Touch the given page. try: -# get the page, and save it using the unmodified text. -# whether or not getting a redirect throws an exception -# depends on the variable self.touch_redirects. -page.get(get_redirect=self.getOption('redir')) -page.save(Pywikibot touch script) +page.touch() except pywikibot.NoPage: pywikibot.error(uPage %s does not exist. % page.title(asLink=True)) -except pywikibot.IsRedirectPage: -pywikibot.warning(uPage %s is a redirect; skipping. - % page.title(asLink=True)) except pywikibot.LockedPage: pywikibot.error(uPage %s is locked. % page.title(asLink=True)) @@ -96,6 +83,9 @@ for arg in local_args: if arg == '-purge': bot_class = PurgeBot +elif arg == '-redir': +pywikibot.output(u'-redirect option is deprecated, ' + don't use it anymore) elif not genFactory.handleArg(arg) and arg.startswith(-): options[arg[1:].lower()] = True -- To view, visit https://gerrit.wikimedia.org/r/210913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I771bd536cd3c9dd7383d8ecf24e72f630945e58c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Enable English-Spanish dictionary - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210887 Change subject: CX: Enable English-Spanish dictionary .. CX: Enable English-Spanish dictionary Change-Id: I1a78b6c1c2ed16a719fadcf8ac55983545f46961 --- M hieradata/common/cxserver.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/210887/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 0343a4b..ee45326 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -208,5 +208,7 @@ JsonDict: 'ca': - 'es' + 'en': +- 'es' 'es': - 'ca' -- To view, visit https://gerrit.wikimedia.org/r/210887 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a78b6c1c2ed16a719fadcf8ac55983545f46961 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add multatuli as temporary esams authdns - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Add multatuli as temporary esams authdns .. Add multatuli as temporary esams authdns Change-Id: Ib833478d5b120342965509692145d63cc3751022 --- M manifests/role/authdns.pp M manifests/site.pp 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index da916f3..63dd237 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -13,6 +13,7 @@ 'rubidium.wikimedia.org', 'baham.wikimedia.org', 'eeden.esams.wikimedia.org', +'multatuli.wikimedia.org', ] # These are all of the public addresses the Internet finds us at diff --git a/manifests/site.pp b/manifests/site.pp index 1776308..fc01002 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1711,11 +1711,11 @@ } node 'multatuli.wikimedia.org' { -include standard - interface::add_ip6_mapped { 'main': interface = 'eth0', } +include standard +include role::authdns::server } node 'ms1001.wikimedia.org' { -- To view, visit https://gerrit.wikimedia.org/r/210878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib833478d5b120342965509692145d63cc3751022 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] authdns: remove 1.x check from local-update/lint - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: authdns: remove 1.x check from local-update/lint .. authdns: remove 1.x check from local-update/lint authdns-local-update and, less importantly, authdns-lint, have guards for gdnsd 1.x. This, however, is broken on newly provisioned DNS servers as there is a catch-22: the initial authdns-local-update is triggered from puppet with a before = Package['gdnsd'] and the non-existence of the package breaks the check. Since 1.x is quite old by now and wouldn't show up in our infrastructure, remove the check entirely. Also while at it, add an mkdir -p /var/lib/gdnsd to fix another provisioning failure. This will, however, be moved into the packages on the next release and soon become redundant. Change-Id: I7cb7ac204d59773fb03285de7c19aa8f989c2df7 --- M modules/authdns/files/authdns-lint M modules/authdns/files/authdns-local-update 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/authdns/files/authdns-lint b/modules/authdns/files/authdns-lint index b2e08a4..2733cd1 100644 --- a/modules/authdns/files/authdns-lint +++ b/modules/authdns/files/authdns-lint @@ -22,9 +22,6 @@ WORKINGDIR=$1 TESTDIR=$2 -# 1.x and 2.x have different path-related flags... -(gdnsd -h 21 | grep -q 'gdnsd version 2') || die This script only supports gdnsd 2.x - if [ -z $WORKINGDIR ]; then die no template dir specified fi diff --git a/modules/authdns/files/authdns-local-update b/modules/authdns/files/authdns-local-update index c0607f6..230b2ad 100644 --- a/modules/authdns/files/authdns-local-update +++ b/modules/authdns/files/authdns-local-update @@ -20,9 +20,6 @@ die this script needs root fi -# 1.x and 2.x have differences -(gdnsd -h 21 | grep -q 'gdnsd version 2') || die This script only supports gdnsd 2.x - # setup locking; only one copy of this may be running at the same time LOCKFILE=/var/lock/authdns-local-update LOCKFD=9 @@ -105,6 +102,7 @@ fi echo Copying admin_state into place; will take effect immediately +mkdir -p /var/lib/gdnsd cp -f $WORKINGDIR/admin_state /var/lib/gdnsd/ ### reload -- To view, visit https://gerrit.wikimedia.org/r/210889 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7cb7ac204d59773fb03285de7c19aa8f989c2df7 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Fix the summary line in generate_user_files for use... - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Fix the summary line in generate_user_files for user-fixes.py .. [IMPROV] Fix the summary line in generate_user_files for user-fixes.py Also update some doc strings and code parts from core. Change-Id: Iac59759cbd08ff373879db0cddc3a333c5e4d9d2 --- M generate_user_files.py 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index d51f0fa..741f9fd 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- - Script to create user files (user-config.py, user-fixes.py) +Script to create user files (user-config.py, user-fixes.py). # -# (C) Pywikibot team, 2008-2013 +# (C) Pywikibot team, 2008-2015 # -# Distributed under the terms of the MIT license +# Distributed under the terms of the MIT license. # __version__ = '$Id$' # @@ -54,6 +54,7 @@ def file_exists(filename): +Return whether the file exists and print a message if it exists. if os.path.exists(filename): print('%s' already exists. % filename) return True @@ -149,10 +150,11 @@ def create_user_fixes(base_dir): +Create a basic user-fixes.py in base_dir. _fnf = os.path.join(base_dir, user-fixes.py) if not file_exists(_fnf): -f = codecs.open(_fnf, w, utf-8) -f.write(r# -*- coding: utf-8 -*- +with codecs.open(_fnf, w, utf-8) as f: +f.write(r# -*- coding: utf-8 -*- # # This is only an example. Don't use it. @@ -161,7 +163,7 @@ fixes['example'] = { 'regex': True, 'msg': { -'_default':u'no summary specified', +'_default': u'no summary specified', }, 'replacements': [ (ur'\bword\b', u'two words'), @@ -169,7 +171,6 @@ } ) -f.close() print('%s' written. % _fnf) -- To view, visit https://gerrit.wikimedia.org/r/210866 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac59759cbd08ff373879db0cddc3a333c5e4d9d2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix permission checks for recentchanges - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix permission checks for recentchanges .. Fix permission checks for recentchanges 1/ there's no need to manually check root post, that's part of RevisionActionPermissions::isAllowed already 2/ RevisionFormatter::formatApi recently got a 3rd argument: $action, which defaults to 'view'. That is stricter than 'recentchanges', which is the one we really want there. Because we lack 'view' permissions there fail to return formatted data, we had some exceptions. Bug: T98745 Change-Id: Ia238e2165b8f896d1b80af35a9882fb6eb57a198 --- M includes/Formatter/RecentChanges.php 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: Sbisson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Formatter/RecentChanges.php b/includes/Formatter/RecentChanges.php index b5817cf..1c0d684 100644 --- a/includes/Formatter/RecentChanges.php +++ b/includes/Formatter/RecentChanges.php @@ -27,15 +27,11 @@ if ( !$this-permissions-isAllowed( $row-revision, 'recentchanges' ) ) { return false; } - if ( $row-revision instanceof PostRevision - !$this-permissions-isAllowed( $row-rootPost, 'recentchanges' ) ) { - return false; - } $this-serializer-setIncludeHistoryProperties( true ); $this-serializer-setIncludeContent( false ); - $data = $this-serializer-formatApi( $row, $ctx ); + $data = $this-serializer-formatApi( $row, $ctx, 'recentchanges' ); if ( !$data ) { throw new FlowException( 'Could not format data for row ' . $row-revision-getRevisionId()-getAlphadecimal() ); } @@ -171,7 +167,7 @@ $old = unserialize( $block[count( $block ) - 1]-mAttribs['rc_params'] ); $oldId = $old ? UUID::create( $old['flow-workflow-change']['revision'] ) : $row-revision-getRevisionId(); - $data = $this-serializer-formatApi( $row, $ctx ); + $data = $this-serializer-formatApi( $row, $ctx, 'recentchanges' ); if ( !$data ) { throw new FlowException( 'Could not format data for row ' . $row-revision-getRevisionId()-getAlphadecimal() ); } -- To view, visit https://gerrit.wikimedia.org/r/210860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia238e2165b8f896d1b80af35a9882fb6eb57a198 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Sbisson sbis...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf_deploy - change (mediawiki...CentralNotice)
AndyRussG has uploaded a new change for review. https://gerrit.wikimedia.org/r/210906 Change subject: Merge branch 'master' into wmf_deploy .. Merge branch 'master' into wmf_deploy Change-Id: Ibd4e6b3676ec7d41478d0ac98185882efd75aeb6 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/06/210906/1 -- To view, visit https://gerrit.wikimedia.org/r/210906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd4e6b3676ec7d41478d0ac98185882efd75aeb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: AndyRussG andrew.green...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update CentralNotice - change (mediawiki/core)
Ejegg has submitted this change and it was merged. Change subject: Update CentralNotice .. Update CentralNotice Change-Id: I977d899e2f97a6e5e216a7a2b583d0b37a1c69ae --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index a1ed003..bab5f9a 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit a1ed003191d3b6162e2e750facfb0b501be42917 +Subproject commit bab5f9ac1a2b6bd07ed49fac0cb460dd8992c1a6 -- To view, visit https://gerrit.wikimedia.org/r/210909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I977d899e2f97a6e5e216a7a2b583d0b37a1c69ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] TerminalHandler: Expect str in Python 2 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [FIX] TerminalHandler: Expect str in Python 2 .. [FIX] TerminalHandler: Expect str in Python 2 The args of a record are str in Python 2 (so basically bytes). It now compared the str with unicode which works in Python 3 (as both are the same there) or Python 2 if the warning message contains only ASCII characters. With 1e54a7d6 unicode_literals was added to the module which changed the strings into unicode in Python 2. And Python converts the string into unicode when it tries to do a __contains__ test. It decodes it using ASCII which fails when there are non-ASCII characters in the string. Bug: T98955 Change-Id: Ia421c085897e14e01a59e3c2a14822b2a7cd0ddd --- M pywikibot/userinterfaces/terminal_interface_base.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 968a14b..c4468e3 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -491,7 +491,7 @@ msg = record.args[0] is_useless_source_output = any( s in msg for s in -('warn(', 'exceptions.', 'Warning)', 'Warning,')) +(str('warn('), str('exceptions.'), str('Warning)'), str('Warning,'))) if is_useless_source_output: record.args = ('\n'.join(record.args[0].splitlines()[0:-1]),) -- To view, visit https://gerrit.wikimedia.org/r/210681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia421c085897e14e01a59e3c2a14822b2a7cd0ddd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl 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 CentralNotice - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update CentralNotice .. Update CentralNotice Change-Id: I7634c8f6fb73dc3e9e885c49b343480ca8498320 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CentralNotice b/extensions/CentralNotice index a1ed003..bab5f9a 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit a1ed003191d3b6162e2e750facfb0b501be42917 +Subproject commit bab5f9ac1a2b6bd07ed49fac0cb460dd8992c1a6 -- To view, visit https://gerrit.wikimedia.org/r/210910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7634c8f6fb73dc3e9e885c49b343480ca8498320 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update namespaces for Wikidata - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: Update namespaces for Wikidata .. Update namespaces for Wikidata Change-Id: I4c26e7fc757703542d178662c891ca42f3d9295a --- M families/wikidata_family.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikidata_family.py b/families/wikidata_family.py index 0db371d..760bd2d 100644 --- a/families/wikidata_family.py +++ b/families/wikidata_family.py @@ -62,6 +62,10 @@ '_default': u'Translations talk', } +self.namespaces[2600] = { +'_default': u'Topic', +} + def shared_data_repository(self, code, transcluded=False): Always return a repository tupe. This enables testing whether the site object is the repository itself, see Site.is_data_repository() -- To view, visit https://gerrit.wikimedia.org/r/209409 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c26e7fc757703542d178662c891ca42f3d9295a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Putnik m...@putnik.ws Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove authdns role from multatuli - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Remove authdns role from multatuli .. Remove authdns role from multatuli Served its purpose. Change-Id: I9029f2b049438aa69278b446ec209a9205382e9e --- M manifests/role/authdns.pp M manifests/site.pp 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index b8ca0d1..89c6d2a 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -13,7 +13,6 @@ 'rubidium.wikimedia.org', 'baham.wikimedia.org', 'eeden.wikimedia.org', -'multatuli.wikimedia.org', ] # These are all of the public addresses the Internet finds us at diff --git a/manifests/site.pp b/manifests/site.pp index 551e52f..c1eb5bb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1715,7 +1715,6 @@ interface = 'eth0', } include standard -include role::authdns::server } node 'ms1001.wikimedia.org' { -- To view, visit https://gerrit.wikimedia.org/r/210899 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9029f2b049438aa69278b446ec209a9205382e9e Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eeden.esams - eeden, add AAAA - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: eeden.esams - eeden, add .. eeden.esams - eeden, add Change-Id: I8a8b400eb2ba2c101d18c071aca0d37f518853ea --- M templates/174.198.91.in-addr.arpa M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 3 files changed, 4 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/174.198.91.in-addr.arpa b/templates/174.198.91.in-addr.arpa index 11a03ca..58d4f4a 100644 --- a/templates/174.198.91.in-addr.arpa +++ b/templates/174.198.91.in-addr.arpa @@ -34,7 +34,7 @@ 113 1H IN PTR hooft.esams.wikimedia.org. 114 1H IN PTR multatuli.wikimedia.org. -121 1H IN PTR eeden.esams.wikimedia.org. +121 1H IN PTR eeden.wikimedia.org. 122 1H IN PTR maerlant.wikimedia.org. ; unused 91.198.174.128/26 (91.198.174.128 - 91.198.174.191) diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 09e883f..657ce7e 100644 --- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -26,6 +26,7 @@ ; Machines +1.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR eeden.wikimedia.org. 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR nescio.wikimedia.org. 3.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR hooft.esams.wikimedia.org. 4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR multatuli.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index a30b620..63e273e 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -716,6 +716,8 @@ ; Servers +eeden1H IN A 91.198.174.121 + 1H IN 2620:0:862:1:91:198:174:121 maerlant 1H IN A 91.198.174.122 1H IN 2620:0:862:1:91:198:174:122 multatuli1H IN A 91.198.174.114 @@ -738,7 +740,6 @@ slauerhoff-array1H IN A91.198.174.107 hooft 1H IN A91.198.174.113 1H IN 2620:0:862:1:91:198:174:113 -eeden 1H IN A91.198.174.121 ; Management -- To view, visit https://gerrit.wikimedia.org/r/210900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a8b400eb2ba2c101d18c071aca0d37f518853ea Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delimitate examples with quotation marks as stated in qqq - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210901 Change subject: Delimitate examples with quotation marks as stated in qqq .. Delimitate examples with quotation marks as stated in qqq https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-query%2Bmessagecollection-example-4/ksh Change-Id: I2a2ff0986b2b4e70fb333b5909b6055b0ec5fde9 --- M i18n/api/en.json 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/01/210901/1 diff --git a/i18n/api/en.json b/i18n/api/en.json index 8c18b51..a2c1252 100644 --- a/i18n/api/en.json +++ b/i18n/api/en.json @@ -30,9 +30,9 @@ apihelp-query+messagecollection-param-filter: Message collection filters. Use ! to negate condition. For example !fuzzy means list only all non-fuzzy messages. Filters are applied in the order given.\n;fuzzy:Messages with fuzzy tag.\n;optional:Messages which should be translated only if changes are necessary.\n;ignored:Messages which are never translated.\n;hastranslation:Messages which have a translation regardless if it is fuzzy or not.\n;translated:Messages which have a translation which is not fuzzy.\n;changed:Messages which has been translated or changed since last export.\n;reviewer#58;#:Messages where given user ID # is among reviewers.\n;last-translator#58;#:Messages where given user ID # is the last translator., apihelp-query+messagecollection-param-prop: Which properties to get:\n;definition:Message definition.\n;translation:Current translation (without $1 string if any, use the tags to check for outdated or broken translations).\n;tags:Message tags, like optional, ignored and fuzzy.\n;properties:Message properties, like status, revision, last-translator. Can vary between messages.\n;revision:span class=\deprecated\Deprecated!/span Use $2prop=properties., apihelp-query+messagecollection-example-1: List of supported languages, - apihelp-query+messagecollection-example-2: List of non-optional message definitions for group page-Example, - apihelp-query+messagecollection-example-3: List of optional messages in Finnish with tags for group page-Example, - apihelp-query+messagecollection-example-4: More information about latest translation revisions for group page-Example, + apihelp-query+messagecollection-example-2: List of non-optional message definitions for the group \page-Example\, + apihelp-query+messagecollection-example-3: List of optional messages in Finnish with tags for the group \page-Example\, + apihelp-query+messagecollection-example-4: More information about latest translation revisions for the group \page-Example\, apihelp-query+messagegroups-description: Return information about message groups.\n\nNote that the uselang parameter affects the output of language dependent parts., apihelp-query+messagegroups-param-depth: When using the tree format, limit the depth to this many levels. Value 0 means that no subgroups are shown. If the limit is reached, a prop groupcount is added and it states the number of direct children., apihelp-query+messagegroups-param-filter: Only return messages with IDs that match one or more of the inputs given (case-insensitive, separated by pipes, * wildcard)., @@ -44,10 +44,10 @@ apihelp-query+messagegroupstats-description: Query message group stats., apihelp-query+messagegroupstats-param-timelimit: Maximum time to spend calculating missing statistics. If zero, only the cached results from the beginning are returned., apihelp-query+messagegroupstats-param-group: Message group ID., - apihelp-query+messagegroupstats-example-1: List of translation completion statistics for group page-Example, + apihelp-query+messagegroupstats-example-1: List of translation completion statistics for the group \page-Example\, apihelp-query+messagetranslations-description: Query all translations for a single message., apihelp-query+messagetranslations-param-title: Full title of a known message., - apihelp-query+messagetranslations-example-1: List of translations in the wiki for MediaWiki:January, + apihelp-query+messagetranslations-example-1: List of translations in the wiki for \MediaWiki:January\, apihelp-translatesandbox-description: Signup and manage sandboxed users., apihelp-translatesandbox-param-do: What to do., apihelp-translatesandbox-param-userid: User IDs of the users being managed. Use 0 for creations., -- To view, visit https://gerrit.wikimedia.org/r/210901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a2ff0986b2b4e70fb333b5909b6055b0ec5fde9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master
[MediaWiki-commits] [Gerrit] There's more in a page than its title - change (mediawiki...Flow)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210912 Change subject: There's more in a page than its title .. There's more in a page than its title Use a wording similar to flow-error-invalid-title. https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Flow-special-enableflow-invalid-title/en Change-Id: Ic75a7519e050efe4b3caeef04278ded72f3f8c08 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/12/210912/1 diff --git a/i18n/en.json b/i18n/en.json index 1cbd260..03aa1d7 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -394,7 +394,7 @@ flow-special-enableflow-page: Page to enable Flow on, flow-special-enableflow-header: Initial description of Flow board (wikitext), flow-special-enableflow-board-already-exists: There is already a Flow board at [[$1]]., - flow-special-enableflow-invalid-title: The provided page is not a valid page title, + flow-special-enableflow-invalid-title: An invalid page title was provided, flow-special-enableflow-archive-title-format: Where to archive existing content, flow-special-enableflow-archive-title-format-default-value: %s/Archive_%d, flow-special-enableflow-board-creation-not-allowed: You are not allowed to create a Flow board at [[:$1]]., -- To view, visit https://gerrit.wikimedia.org/r/210912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic75a7519e050efe4b3caeef04278ded72f3f8c08 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clarify scope of action-mf-uploadbutton - change (mediawiki...MobileFrontend)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210894 Change subject: Clarify scope of action-mf-uploadbutton .. Clarify scope of action-mf-uploadbutton https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Action-mf-uploadbutton/ksh Change-Id: I01135bba2b53467b62eb79f0cb2ed786d0c3a303 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/94/210894/1 diff --git a/i18n/en.json b/i18n/en.json index 58701c2..f0c6917 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -37,7 +37,7 @@ ] }, abusefilter-edit-builder-vars-user-mobile: Whether or not a user is editing through the mobile interface, - action-mf-uploadbutton: use the upload button on mobile pages., + action-mf-uploadbutton: use the MobileFrontend-specific upload system., beta-feature-minerva: Enable mobile skin ({{int:skinname-minerva}}) on desktop, beta-feature-minerva-description: Make the skin used on mobile devices a selectable desktop skin under the \{{int:prefs-rendering}}\ preferences tab., mobile-frontend-account-create-captcha-placeholder: Enter confirmation code, -- To view, visit https://gerrit.wikimedia.org/r/210894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01135bba2b53467b62eb79f0cb2ed786d0c3a303 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove eeden from the set of active NS - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Remove eeden from the set of active NS .. Remove eeden from the set of active NS About to be renamed, solves a chicken-and-egg loop. Change-Id: I24295c47d847b6154354ba9c1252c63f088ba975 --- M manifests/role/authdns.pp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index 63dd237..4ef54b3 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -12,7 +12,6 @@ $nameservers = [ 'rubidium.wikimedia.org', 'baham.wikimedia.org', -'eeden.esams.wikimedia.org', 'multatuli.wikimedia.org', ] -- To view, visit https://gerrit.wikimedia.org/r/210896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24295c47d847b6154354ba9c1252c63f088ba975 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable cleanUpLinks in cosmetic_changes.py in Persian langu... - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: Disable cleanUpLinks in cosmetic_changes.py in Persian language wikis .. Disable cleanUpLinks in cosmetic_changes.py in Persian language wikis Community thinks this function has too many issues. I do this upon request of User:Yamaha5 The discussion is here: http://bit.ly/1KMVZ7J Change-Id: I4f40c7a89a6fd698009a6290e18948e3924f4f78 --- M cosmetic_changes.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/cosmetic_changes.py b/cosmetic_changes.py index b15c226..4a9f528 100644 --- a/cosmetic_changes.py +++ b/cosmetic_changes.py @@ -377,6 +377,10 @@ def cleanUpLinks(self, text): # helper function which works on one link and either returns it # unmodified, or returns a replacement. +if self.site.sitename() != u'wikipedia:fa': +# Per community discussion, this one is not allowed in fa.wp +return + def handleOneLink(match): titleWithSection = match.group('titleWithSection') label = match.group('label') -- To view, visit https://gerrit.wikimedia.org/r/206775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f40c7a89a6fd698009a6290e18948e3924f4f78 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ContentTranslation to a27d44d - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210905 Change subject: Update ContentTranslation to a27d44d .. Update ContentTranslation to a27d44d Change-Id: I9a596381aaf2c91076a233e742cca41d6f25b9e5 --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/05/210905/1 diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index dc9e647..a27d44d 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit dc9e64733b3158bdc5818dc83d44cda8da3adf78 +Subproject commit a27d44d8f27efa5800e81a0c2d2463033395ca74 -- To view, visit https://gerrit.wikimedia.org/r/210905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a596381aaf2c91076a233e742cca41d6f25b9e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Enable newarticle campaign except bawiki - change (operations/mediawiki-config)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210916 Change subject: CX: Enable newarticle campaign except bawiki .. CX: Enable newarticle campaign except bawiki Change-Id: Ic25183fc0f80697e284115119d778e481d4d964a --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/16/210916/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 817fbdc..dfa464a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14650,14 +14650,6 @@ 'wmgContentTranslationCampaigns' = array( 'default' = array( 'newarticle' ), 'bawiki' = array(), - 'cvwiki' = array(), - 'koiwiki' = array(), - 'kvwiki' = array(), - 'lezwiki' = array(), - 'sahwiki' = array(), - 'ttwiki' = array(), - 'tyvwiki' = array(), - 'udmwiki' = array(), ), // Namespace to publish article -- To view, visit https://gerrit.wikimedia.org/r/210916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic25183fc0f80697e284115119d778e481d4d964a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'ast' in Apertium.languagenames.json - change (mediawiki...cxserver)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210921 Change subject: Add 'ast' in Apertium.languagenames.json .. Add 'ast' in Apertium.languagenames.json Change-Id: I61a30e56a1c9722fc57fd709f6d033ac6f02abeb --- M mt/Apertium.languagenames.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/21/210921/1 diff --git a/mt/Apertium.languagenames.json b/mt/Apertium.languagenames.json index 7294e79..0bfdaf5 100644 --- a/mt/Apertium.languagenames.json +++ b/mt/Apertium.languagenames.json @@ -2,6 +2,7 @@ af: afr, an: arg, ar: ara, + as: ast, bg: bul, br: bre, bs: hbs_BS, -- To view, visit https://gerrit.wikimedia.org/r/210921 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61a30e56a1c9722fc57fd709f6d033ac6f02abeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert addition of APC as zh-hans alias - change (mediawiki...APC)
jenkins-bot has submitted this change and it was merged. Change subject: Revert addition of APC as zh-hans alias .. Revert addition of APC as zh-hans alias Per Niklas, to unbreak AdvancedTranslate: https://translatewiki.net/wiki/Thread:Support/Special:AdvancedTranslate_no_longer_possible_again/reply This reverts commit 1ffecc7fada43758a7cbb5bcbdee59f6b8234d0c. Change-Id: Ife2e59a372faaaf96e62bade91894a1d7c4a336d --- M APC.alias.php 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/APC.alias.php b/APC.alias.php index 6509546..14ed3cb 100644 --- a/APC.alias.php +++ b/APC.alias.php @@ -47,9 +47,4 @@ /** Sanskrit (संस्कृतम्) */ $specialPageAliases['sa'] = array( 'APC' = array( 'एपीसिपश्यति' ), -); - -/** Simplified Chinese (中文(简体)) */ -$specialPageAliases['zh-hans'] = array( - 'APC' = array( 'APC' ), ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/210925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife2e59a372faaaf96e62bade91894a1d7c4a336d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/APC Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Import daemonize from compat - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Import daemonize from compat .. Import daemonize from compat Minor pep changes. Bug: T89581 Change-Id: I8daac25c55ad4961b75641b44edbd218760d9186 --- A pywikibot/daemonize.py M tox.ini 2 files changed, 64 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/daemonize.py b/pywikibot/daemonize.py new file mode 100644 index 000..d0b5ae5 --- /dev/null +++ b/pywikibot/daemonize.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +Module to daemonize the current process on Unix. +# +# (C) Pywikibot team, 2007-2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# + +import os +import sys + +is_daemon = False + + +def daemonize(close_fd=True, chdir=True, write_pid=False, redirect_std=None): + +Daemonize the current process. + +Only works on POSIX compatible operating systems. +The process will fork to the background and return control to the terminal. + +Arguments: +- close_fd: Close the standard streams and replace them by /dev/null +- chdir: Change the current working directory to / +- write_pid: Write the pid to sys.argv[0] + '.pid' +- redirect_std: Filename to redirect stdout and stdin to + +# Fork away +if not os.fork(): +# Become session leader +os.setsid() +# Fork again to prevent the process from acquiring a +# controlling terminal +pid = os.fork() +if not pid: +global is_daemon +is_daemon = True + +if close_fd: +os.close(0) +os.close(1) +os.close(2) +os.open('/dev/null', os.O_RDWR) +if redirect_std: +os.open(redirect_std, os.O_WRONLY | os.O_APPEND) +else: +os.dup2(0, 1) +os.dup2(1, 2) +if chdir: +os.chdir('/') +return +else: +# Write out the pid +f = open(os.path.basename(sys.argv[0]) + '.pid', 'w') +f.write(str(pid)) +f.close() +os._exit(0) +else: +# Exit to return control to the terminal +# os._exit to prevent the cleanup to run +os._exit(0) diff --git a/tox.ini b/tox.ini index da80421..80ee993 100644 --- a/tox.ini +++ b/tox.ini @@ -42,6 +42,7 @@ pywikibot/comms/rcstream.py \ pywikibot/compat/ \ pywikibot/config2.py \ +pywikibot/daemonize.py \ pywikibot/data/__init__.py \ pywikibot/data/api.py \ pywikibot/data/wikistats.py \ -- To view, visit https://gerrit.wikimedia.org/r/190696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8daac25c55ad4961b75641b44edbd218760d9186 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: btongminh bryan.tongm...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add some docstrings, remove obsolete site.pageinterwiki() me... - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/210930 Change subject: Add some docstrings, remove obsolete site.pageinterwiki() method .. Add some docstrings, remove obsolete site.pageinterwiki() method Change-Id: I51ce5eb9827af03e491a364f87de5a6744ce1c38 --- M pywikibot/cosmetic_changes.py M pywikibot/family.py M pywikibot/page.py M pywikibot/site.py 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/30/210930/1 diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 9c471fe..cd6e545 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -213,6 +213,7 @@ @deprecate_arg('debug', 'diff') def __init__(self, site, diff=False, redirect=False, namespace=None, pageTitle=None, ignore=CANCEL_ALL): +Constructor. self.site = site self.diff = diff self.redirect = redirect @@ -624,6 +625,7 @@ return text def removeUselessSpaces(self, text): +Cleanup multiple or trailing spaces. multipleSpacesR = re.compile(' +') spaceAtLineEndR = re.compile(' $') exceptions = ['comment', 'math', 'nowiki', 'pre', 'startspace', 'table', diff --git a/pywikibot/family.py b/pywikibot/family.py index b978cc6..4cd1749 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -46,6 +46,7 @@ Parent class for all wiki families. def __init__(self): +Constructor. if not hasattr(self, 'name'): self.name = None diff --git a/pywikibot/page.py b/pywikibot/page.py index db5a1ef..812a41c 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1831,6 +1831,7 @@ @deprecated('Page.is_flow_page()') def isFlowPage(self): +DEPRECATED: use self.is_flow_page instead. return self.is_flow_page() def is_flow_page(self): diff --git a/pywikibot/site.py b/pywikibot/site.py index eae3500..bb03342 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3355,10 +3355,6 @@ raise NoPage(page) api.update_page(page, pagedata, rvgen.props) -def pageinterwiki(self, page): -# No such function in the API (this method isn't called anywhere) -raise NotImplementedError - def pagelanglinks(self, page, step=None, total=None, include_obsolete=False): Iterate all interlanguage links on page, yielding Link objects. -- To view, visit https://gerrit.wikimedia.org/r/210930 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51ce5eb9827af03e491a364f87de5a6744ce1c38 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Beta scripts/styles - resources - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Beta scripts/styles - resources .. Hygiene: Beta scripts/styles - resources Change-Id: I75bc8714587e2c0e081a8e9b20d81956b1abab00 --- M includes/Resources.php R resources/mobile.bannerImage/BannerImage.js R resources/mobile.bannerImage/Image.js R resources/mobile.bannerImage/MobileViewBannerImageRepository.js R resources/mobile.bannerImage/bannerImage.less R resources/skins.minerva.beta.scripts/bannerImage.js R tests/qunit/mobile.bannerImage/test_MobileViewBannerImageRepository.js 7 files changed, 5 insertions(+), 5 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index d0802c2..f5d06cf 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1394,12 +1394,12 @@ 'mobile.ajax', ), 'scripts' = array( - 'javascripts/modules/bannerImage/Image.js', - 'javascripts/modules/bannerImage/MobileViewBannerImageRepository.js', - 'javascripts/modules/bannerImage/BannerImage.js', + 'resources/mobile.bannerImage/Image.js', + 'resources/mobile.bannerImage/MobileViewBannerImageRepository.js', + 'resources/mobile.bannerImage/BannerImage.js', ), 'styles' = array( - 'less/modules/bannerImage.less', + 'resources/mobile.bannerImage/bannerImage.less', ), 'position' = 'top', ), @@ -1813,7 +1813,7 @@ 'mobile.bannerImage', ), 'scripts' = array( - 'javascripts/modules/bannerImage/init.js', + 'resources/skins.minerva.beta.scripts/bannerImage.js', ), ), // By mode. This should only ever be loaded in Minerva skin. diff --git a/javascripts/modules/bannerImage/BannerImage.js b/resources/mobile.bannerImage/BannerImage.js similarity index 100% rename from javascripts/modules/bannerImage/BannerImage.js rename to resources/mobile.bannerImage/BannerImage.js diff --git a/javascripts/modules/bannerImage/Image.js b/resources/mobile.bannerImage/Image.js similarity index 100% rename from javascripts/modules/bannerImage/Image.js rename to resources/mobile.bannerImage/Image.js diff --git a/javascripts/modules/bannerImage/MobileViewBannerImageRepository.js b/resources/mobile.bannerImage/MobileViewBannerImageRepository.js similarity index 100% rename from javascripts/modules/bannerImage/MobileViewBannerImageRepository.js rename to resources/mobile.bannerImage/MobileViewBannerImageRepository.js diff --git a/less/modules/bannerImage.less b/resources/mobile.bannerImage/bannerImage.less similarity index 100% rename from less/modules/bannerImage.less rename to resources/mobile.bannerImage/bannerImage.less diff --git a/javascripts/modules/bannerImage/init.js b/resources/skins.minerva.beta.scripts/bannerImage.js similarity index 100% rename from javascripts/modules/bannerImage/init.js rename to resources/skins.minerva.beta.scripts/bannerImage.js diff --git a/tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js b/tests/qunit/mobile.bannerImage/test_MobileViewBannerImageRepository.js similarity index 100% rename from tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js rename to tests/qunit/mobile.bannerImage/test_MobileViewBannerImageRepository.js -- To view, visit https://gerrit.wikimedia.org/r/210082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75bc8714587e2c0e081a8e9b20d81956b1abab00 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of MOBILEFRONTEND constant - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged. Change subject: Get rid of MOBILEFRONTEND constant .. Get rid of MOBILEFRONTEND constant Change-Id: I9a1cdc567aa06f4edd454e2c56f2acce7d19f0f7 --- M WikiGrok.php M includes/Hooks.php 2 files changed, 16 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/WikiGrok.php b/WikiGrok.php index 8d58d3e..d48aa28 100644 --- a/WikiGrok.php +++ b/WikiGrok.php @@ -26,12 +26,6 @@ die( -1 ); } -if ( !defined( 'MOBILEFRONTEND' ) ) { - echo This MediaWiki extension, WikiGrok, depends on the MobileFrontend extension. . -Please install it.\n; - die( -1 ); -} - $wgExtensionCredits['other'][] = array( 'path' = __FILE__, 'name' = 'WikiGrok', @@ -68,6 +62,7 @@ $wgAutoloadClasses[WikiGrok\\$className] = __DIR__ . /includes/$classFilename.php; } +$wgExtensionFunctions[] = 'WikiGrok\Hooks::onExtensionSetup'; $wgHooks['LoadExtensionSchemaUpdates'][] = 'WikiGrok\Hooks::onLoadExtensionSchemaUpdates'; $wgHooks['UnitTestsList'][] = function ( $files ) { $files[] = __DIR__ . '/tests/phpunit/'; diff --git a/includes/Hooks.php b/includes/Hooks.php index 9ebc90e..e759b8b 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -410,4 +410,19 @@ } return true; } + + /** +* Executes code to initialize WikiGrok. +*/ + public static function onExtensionSetup() { + // The reported error is This requires WikiGrok. + if ( + !defined( 'MOBILEFRONTEND' ) + !\ExtensionRegistry::getInstance()-isLoaded( 'MobileFrontend' ) + ) { + echo This MediaWiki extension, WikiGrok, depends on the MobileFrontend extension. . +Please install it.\n; + die( -1 ); + } + } } -- To view, visit https://gerrit.wikimedia.org/r/210097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a1cdc567aa06f4edd454e2c56f2acce7d19f0f7 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/WikiGrok Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (WIP) Add parser tests - change (mediawiki...Josa)
devunt has uploaded a new change for review. https://gerrit.wikimedia.org/r/210939 Change subject: (WIP) Add parser tests .. (WIP) Add parser tests Change-Id: I156669d32ee427e0f3550a88fbe5e4a88cd2cfff --- M Josa.php A tests/parserTests.txt 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Josa refs/changes/39/210939/1 diff --git a/Josa.php b/Josa.php index b80d57e..3c9b910 100644 --- a/Josa.php +++ b/Josa.php @@ -26,3 +26,4 @@ $wgExtensionMessagesFiles['JosaMagic'] = __DIR__ . '/Josa.i18n.magic.php'; $wgAutoloadClasses['Josa'] = __DIR__ . '/Josa.class.php'; +$wgParserTestFiles[] = __DIR__ . '/tests/parserTests.txt'; diff --git a/tests/parserTests.txt b/tests/parserTests.txt new file mode 100644 index 000..42bf368 --- /dev/null +++ b/tests/parserTests.txt @@ -0,0 +1,12 @@ +!! hooks +Eul/Ruel +!! endhooks + +!! test +Josa {{#Eul/Ruel:}} - Eul: Hangul +!! input +{{#을를:법원}} +!! result +p법원을 +/p +!! end -- To view, visit https://gerrit.wikimedia.org/r/210939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I156669d32ee427e0f3550a88fbe5e4a88cd2cfff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Josa Gerrit-Branch: master Gerrit-Owner: devunt dev...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use pywikibot.daemonize instead of external package - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Use pywikibot.daemonize instead of external package .. Use pywikibot.daemonize instead of external package Bug: T89581 Change-Id: I6ee5250edc852b04463994791f3d18404be7c62f --- M pywikibot/bot.py M requirements.txt M setup.py 3 files changed, 6 insertions(+), 12 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index de68ebd..b319e3c 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -39,6 +39,7 @@ from pywikibot import backports from pywikibot import config +from pywikibot import daemonize from pywikibot import version from pywikibot.tools import deprecated, deprecated_args @@ -795,12 +796,9 @@ config.debug_log.append(component) elif arg in ('-verbose', '-v'): config.verbose_output += 1 -elif arg == '-daemonize': -import daemonize -daemonize.daemonize() -elif arg.startswith('-daemonize:'): -import daemonize -daemonize.daemonize(redirect_std=arg[len('-daemonize:'):]) +elif arg.startswith('-daemonize'): +redirect_std = arg[len('-daemonize:'):] if ':' in arg else None +daemonize.daemonize(redirect_std=redirect_std) else: # the argument depends on numerical config settings # e.g. -maxlag: @@ -878,8 +876,8 @@ -user:xyz Log in as user 'xyz' instead of the default username. -daemonize:xyzImmediately return control to the terminal and redirect - stdout and stderr to xyz (only use for bots that require - no input from stdin). + stdout and stderr to file xyz. + (only use for bots that require no input from stdin). -help Show this help text. diff --git a/requirements.txt b/requirements.txt index e0f5680..47b8316 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,9 +21,6 @@ # mandatory; see README.conversion.txt httplib2=0.9.0 -# core option 'daemonize': -daemonize - # core interwiki_graph.py: pydot diff --git a/setup.py b/setup.py index 72e128d..fb92b4c 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,6 @@ extra_deps = { # Core library dependencies 'isbn': ['python-stdnum'], -'daemonize': ['daemonize'], 'Graphviz': ['pydot'], 'MySQL': ['oursql'], 'Yahoo': ['pYsearch'], -- To view, visit https://gerrit.wikimedia.org/r/190697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ee5250edc852b04463994791f3d18404be7c62f Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Mpaa mpaa.w...@gmail.com Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clarify scope of action-mf-uploadbutton - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Clarify scope of action-mf-uploadbutton .. Clarify scope of action-mf-uploadbutton https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Action-mf-uploadbutton/ksh Change-Id: I01135bba2b53467b62eb79f0cb2ed786d0c3a303 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 58701c2..f0c6917 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -37,7 +37,7 @@ ] }, abusefilter-edit-builder-vars-user-mobile: Whether or not a user is editing through the mobile interface, - action-mf-uploadbutton: use the upload button on mobile pages., + action-mf-uploadbutton: use the MobileFrontend-specific upload system., beta-feature-minerva: Enable mobile skin ({{int:skinname-minerva}}) on desktop, beta-feature-minerva-description: Make the skin used on mobile devices a selectable desktop skin under the \{{int:prefs-rendering}}\ preferences tab., mobile-frontend-account-create-captcha-placeholder: Enter confirmation code, -- To view, visit https://gerrit.wikimedia.org/r/210894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01135bba2b53467b62eb79f0cb2ed786d0c3a303 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove unused stub class - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove unused stub class .. Hygiene: Remove unused stub class Doesn't seem to get set anywhere. Legacy code. Change-Id: I194f141b0bc2a163bb4706a518c9e1c73d050bce --- M javascripts/modules/toggling/init.js M less/ui.less 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/javascripts/modules/toggling/init.js b/javascripts/modules/toggling/init.js index 4358b75..b9eb8d2 100644 --- a/javascripts/modules/toggling/init.js +++ b/javascripts/modules/toggling/init.js @@ -199,7 +199,6 @@ collapseSectionsByDefault = mw.config.get( 'wgMFCollapseSectionsByDefault' ); $container = $container || $( '#content' ); - $( 'html' ).removeClass( 'stub' ); // Also allow .section-heading if some extensions like Wikibase // want to toggle other headlines than direct descendants of $container. $firstHeading = $container.find( ' h1, h2, h3, h4, h5, h6,.section-heading' ).eq( 0 ); diff --git a/less/ui.less b/less/ui.less index fb91c1e..f8c2f99 100644 --- a/less/ui.less +++ b/less/ui.less @@ -215,11 +215,6 @@ } } -.stub .edit-page { - margin: 0; - display: block; -} - .stable { // Remove when/if page-secondary-actions are promoted to stable .languageSelector { -- To view, visit https://gerrit.wikimedia.org/r/210344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I194f141b0bc2a163bb4706a518c9e1c73d050bce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add grants on centralauth.* via production-grants-core - change (operations/puppet)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/210932 Change subject: Add grants on centralauth.* via production-grants-core .. Add grants on centralauth.* via production-grants-core This is not puppetized yet, but obviously needed. See also the grants on any s7 host (I checked db1033 as a reference). Change-Id: Ia411dac195b80a13ba3a7ba84fc99665de4d8418 --- M templates/mariadb/production-grants-core.sql.erb 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/210932/1 diff --git a/templates/mariadb/production-grants-core.sql.erb b/templates/mariadb/production-grants-core.sql.erb index d9a906f..0ec53fa 100644 --- a/templates/mariadb/production-grants-core.sql.erb +++ b/templates/mariadb/production-grants-core.sql.erb @@ -7,6 +7,9 @@ GRANT ALL PRIVILEGES ON `%wik%`.* TO 'wikiadmin'@'10.%'; +GRANT ALL PRIVILEGES +ON `centralauth`.* TO 'wikiadmin'@'10.%'; + -- wikiuser 10.64.% GRANT PROCESS, REPLICATION CLIENT @@ -16,6 +19,9 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON `%wik%`.* TO 'wikiuser'@'10.64.%'; +GRANT SELECT, INSERT, UPDATE, DELETE +ON `centralauth`.* TO 'wikiuser'@'10.64.%'; + -- wikiuser 10.192.% GRANT PROCESS, REPLICATION CLIENT @@ -24,3 +30,6 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON `%wik%`.* TO 'wikiuser'@'10.192.%'; + +GRANT SELECT, INSERT, UPDATE, DELETE +ON `centralauth`.* TO 'wikiuser'@'10.192.%'; -- To view, visit https://gerrit.wikimedia.org/r/210932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia411dac195b80a13ba3a7ba84fc99665de4d8418 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added having= parameter (for SQL HAVING clause) to #cargo_... - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/210933 Change subject: Added having= parameter (for SQL HAVING clause) to #cargo_query .. Added having= parameter (for SQL HAVING clause) to #cargo_query Change-Id: Ida18b807b3698fafb9a128d1d5e83b3698e8504c --- M CargoSQLQuery.php M i18n/en.json M i18n/qqq.json M parserfunctions/CargoQuery.php M specials/CargoViewData.php 5 files changed, 36 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/33/210933/1 diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php index 33f745c..ba7bc8c 100644 --- a/CargoSQLQuery.php +++ b/CargoSQLQuery.php @@ -22,6 +22,7 @@ public $mFieldDescriptions; public $mFieldTables; public $mGroupByStr; + public $mHavingStr; public $mOrderByStr; public $mQueryLimit; @@ -30,11 +31,11 @@ * object can be created without any values. */ public static function newFromValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ) { + $havingStr, $orderByStr, $limitStr ) { global $wgCargoDefaultQueryLimit, $wgCargoMaxQueryLimit; self::validateValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ); + $havingStr, $orderByStr, $limitStr ); $sqlQuery = new CargoSQLQuery(); $sqlQuery-mTablesStr = $tablesStr; @@ -51,6 +52,7 @@ $sqlQuery-mTableSchemas = CargoUtils::getTableSchemas( $sqlQuery-mTableNames ); $sqlQuery-setOrderBy( $orderByStr ); $sqlQuery-mGroupByStr = $groupByStr; + $sqlQuery-mHavingStr = $havingStr; $sqlQuery-setDescriptionsForFields(); $sqlQuery-handleVirtualFields(); $sqlQuery-handleVirtualCoordinateFields(); @@ -70,9 +72,9 @@ * no processing. */ public static function newFromValues2( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ) { + $havingStr, $orderByStr, $limitStr ) { self::validateValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ); + $havingStr, $orderByStr, $limitStr ); $sqlQuery = new CargoSQLQuery(); $sqlQuery-mTablesStr = $tablesStr; @@ -82,6 +84,7 @@ $sqlQuery-mWhereStr = $whereStr; $sqlQuery-mJoinOnStr = $joinOnStr; $sqlQuery-mGroupByStr = $groupByStr; + $sqlQuery-mHavingStr = $havingStr; $sqlQuery-mOrderByStr = $orderByStr; $sqlQuery-mQueryLimit = $limitStr; return $sqlQuery; @@ -94,7 +97,7 @@ // some of the parameters need to be checked for these strings, // but we might as well validate all of them. public static function validateValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ) { + $havingStr, $orderByStr, $limitStr ) { $regexps = array( '/\bselect\b/i' = 'SELECT', @@ -112,6 +115,7 @@ ( preg_match( $regexp, $whereStr ) $regexp != '/;/' ) || preg_match( $regexp, $joinOnStr ) || preg_match( $regexp, $groupByStr ) || + preg_match( $regexp, $havingStr ) || preg_match( $regexp, $orderByStr ) || preg_match( $regexp, $limitStr ) ) { throw new MWException( Error: the string \$displayString\ cannot be used within #cargo_query. ); @@ -454,15 +458,15 @@ } function handleVirtualFields() { - // The array-field alias can be found in the where, join on, - // fields or order by clauses. Handling depends on which - // clause it is: + // The array-field alias can be found in a number of different + // clauses. Handling depends on which clause it is: // where - make sure that HOLDS or HOlDS LIKE is // specified. If it is, translate it, and add the values // table to tables and join on. // join on - make sure that HOLDS is specified, If it is, // translate it, and add the values table to tables. // group by - always translate it into the single value. + // having - same as group by. // fields - translate it, where the translation (i.e. // the
[MediaWiki-commits] [Gerrit] API: Set HTMLForm when validating field in ApiOptions - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: API: Set HTMLForm when validating field in ApiOptions .. API: Set HTMLForm when validating field in ApiOptions Bug: T96583 Change-Id: I09507990827581b587c14b0f7283cdf0dc21436a --- M includes/api/ApiOptions.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: He7d3r: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php index 8ef0629..436f22a 100644 --- a/includes/api/ApiOptions.php +++ b/includes/api/ApiOptions.php @@ -75,11 +75,17 @@ $prefs = Preferences::getPreferences( $user, $this-getContext() ); $prefsKinds = $user-getOptionKinds( $this-getContext(), $changes ); + $htmlForm = null; foreach ( $changes as $key = $value ) { switch ( $prefsKinds[$key] ) { case 'registered': // Regular option. + if ( $htmlForm === null ) { + // We need a dummy HTMLForm for the validate callback... + $htmlForm = new HTMLForm( array(), $this ); + } $field = HTMLForm::loadInputFromParameters( $key, $prefs[$key] ); + $field-mParent = $htmlForm; $validation = $field-validate( $value, $user-getOptions() ); break; case 'registered-multiselect': -- To view, visit https://gerrit.wikimedia.org/r/205358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09507990827581b587c14b0f7283cdf0dc21436a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie bjor...@wikimedia.org Gerrit-Reviewer: He7d3r he7...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added having= parameter (for the SQL HAVING clause) to #ca... - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged. Change subject: Added having= parameter (for the SQL HAVING clause) to #cargo_query .. Added having= parameter (for the SQL HAVING clause) to #cargo_query Change-Id: Ida18b807b3698fafb9a128d1d5e83b3698e8504c --- M CargoSQLQuery.php M i18n/en.json M i18n/qqq.json M parserfunctions/CargoQuery.php M specials/CargoViewData.php 5 files changed, 36 insertions(+), 15 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php index 33f745c..059ffb5 100644 --- a/CargoSQLQuery.php +++ b/CargoSQLQuery.php @@ -22,6 +22,7 @@ public $mFieldDescriptions; public $mFieldTables; public $mGroupByStr; + public $mHavingStr; public $mOrderByStr; public $mQueryLimit; @@ -30,11 +31,11 @@ * object can be created without any values. */ public static function newFromValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ) { + $havingStr, $orderByStr, $limitStr ) { global $wgCargoDefaultQueryLimit, $wgCargoMaxQueryLimit; self::validateValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ); + $havingStr, $orderByStr, $limitStr ); $sqlQuery = new CargoSQLQuery(); $sqlQuery-mTablesStr = $tablesStr; @@ -51,6 +52,7 @@ $sqlQuery-mTableSchemas = CargoUtils::getTableSchemas( $sqlQuery-mTableNames ); $sqlQuery-setOrderBy( $orderByStr ); $sqlQuery-mGroupByStr = $groupByStr; + $sqlQuery-mHavingStr = $havingStr; $sqlQuery-setDescriptionsForFields(); $sqlQuery-handleVirtualFields(); $sqlQuery-handleVirtualCoordinateFields(); @@ -70,9 +72,9 @@ * no processing. */ public static function newFromValues2( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ) { + $havingStr, $orderByStr, $limitStr ) { self::validateValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ); + $havingStr, $orderByStr, $limitStr ); $sqlQuery = new CargoSQLQuery(); $sqlQuery-mTablesStr = $tablesStr; @@ -82,6 +84,7 @@ $sqlQuery-mWhereStr = $whereStr; $sqlQuery-mJoinOnStr = $joinOnStr; $sqlQuery-mGroupByStr = $groupByStr; + $sqlQuery-mHavingStr = $havingStr; $sqlQuery-mOrderByStr = $orderByStr; $sqlQuery-mQueryLimit = $limitStr; return $sqlQuery; @@ -94,7 +97,7 @@ // some of the parameters need to be checked for these strings, // but we might as well validate all of them. public static function validateValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, $groupByStr, - $orderByStr, $limitStr ) { + $havingStr, $orderByStr, $limitStr ) { $regexps = array( '/\bselect\b/i' = 'SELECT', @@ -112,6 +115,7 @@ ( preg_match( $regexp, $whereStr ) $regexp != '/;/' ) || preg_match( $regexp, $joinOnStr ) || preg_match( $regexp, $groupByStr ) || + preg_match( $regexp, $havingStr ) || preg_match( $regexp, $orderByStr ) || preg_match( $regexp, $limitStr ) ) { throw new MWException( Error: the string \$displayString\ cannot be used within #cargo_query. ); @@ -454,15 +458,15 @@ } function handleVirtualFields() { - // The array-field alias can be found in the where, join on, - // fields or order by clauses. Handling depends on which - // clause it is: + // The array-field alias can be found in a number of different + // clauses. Handling depends on which clause it is: // where - make sure that HOLDS or HOlDS LIKE is // specified. If it is, translate it, and add the values // table to tables and join on. // join on - make sure that HOLDS is specified, If it is, // translate it, and add the values table to tables. // group by - always translate it into the single value. + // having - same as group by. // fields - translate it, where the translation (i.e. // the true field) depends on whether or not the values
[MediaWiki-commits] [Gerrit] Update API tests to no longer rely on write API render output - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Update API tests to no longer rely on write API render output .. Update API tests to no longer rely on write API render output Change-Id: I2e3fa208dd298c2593d9e2ce9a439e415e7cc72a --- M autoload.php M tests/phpunit/api/ApiFlowEditHeaderTest.php M tests/phpunit/api/ApiFlowEditPostTest.php M tests/phpunit/api/ApiFlowEditTitleTest.php D tests/phpunit/api/ApiFlowEditTopicSummary.php A tests/phpunit/api/ApiFlowEditTopicSummaryTest.php M tests/phpunit/api/ApiFlowLockTopicTest.php M tests/phpunit/api/ApiFlowModeratePostTest.php M tests/phpunit/api/ApiFlowModerateTopicTest.php M tests/phpunit/api/ApiFlowReplyTest.php M tests/phpunit/api/ApiFlowViewHeaderTest.php M tests/phpunit/api/ApiFlowViewTopicListTest.php M tests/phpunit/api/ApiTestCase.php M tests/phpunit/api/ApiWatchTopicTest.php 14 files changed, 244 insertions(+), 173 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index 975f25f..0bb4d83 100644 --- a/autoload.php +++ b/autoload.php @@ -288,7 +288,7 @@ 'Flow\\Tests\\Api\\ApiFlowEditHeaderTest' = __DIR__ . '/tests/phpunit/api/ApiFlowEditHeaderTest.php', 'Flow\\Tests\\Api\\ApiFlowEditPostTest' = __DIR__ . '/tests/phpunit/api/ApiFlowEditPostTest.php', 'Flow\\Tests\\Api\\ApiFlowEditTitleTest' = __DIR__ . '/tests/phpunit/api/ApiFlowEditTitleTest.php', - 'Flow\\Tests\\Api\\ApiFlowEditTopicSummaryTest' = __DIR__ . '/tests/phpunit/api/ApiFlowEditTopicSummary.php', + 'Flow\\Tests\\Api\\ApiFlowEditTopicSummaryTest' = __DIR__ . '/tests/phpunit/api/ApiFlowEditTopicSummaryTest.php', 'Flow\\Tests\\Api\\ApiFlowLockTopicTest' = __DIR__ . '/tests/phpunit/api/ApiFlowLockTopicTest.php', 'Flow\\Tests\\Api\\ApiFlowModeratePostTest' = __DIR__ . '/tests/phpunit/api/ApiFlowModeratePostTest.php', 'Flow\\Tests\\Api\\ApiFlowModerateTopicTest' = __DIR__ . '/tests/phpunit/api/ApiFlowModerateTopicTest.php', diff --git a/tests/phpunit/api/ApiFlowEditHeaderTest.php b/tests/phpunit/api/ApiFlowEditHeaderTest.php index f4bcd3a..9e5cf66 100644 --- a/tests/phpunit/api/ApiFlowEditHeaderTest.php +++ b/tests/phpunit/api/ApiFlowEditHeaderTest.php @@ -13,7 +13,7 @@ class ApiFlowEditHeaderTest extends ApiTestCase { public function testEditHeader() { $data = $this-doApiRequest( array( - 'page' = Talk:Flow_QA, + 'page' = 'Talk:Flow_QA', 'token' = $this-getEditToken(), 'action' = 'flow', 'submodule' = 'edit-header', @@ -22,11 +22,19 @@ 'ehformat' = 'wikitext', ) ); - $result = $data[0]['flow']['edit-header']['result']['header']; - $debug = json_encode( $result ); - $this-assertArrayHasKey( 'errors', $result, $debug ); - $this-assertCount( 0, $result['errors'], $result ); + $debug = json_encode( $data ); + $this-assertEquals( 'ok', $data[0]['flow']['edit-header']['status'], $debug ); + $this-assertCount( 1, $data[0]['flow']['edit-header']['committed'], $debug ); + $data = $this-doApiRequest( array( + 'page' = 'Talk:Flow_QA', + 'action' = 'flow', + 'submodule' = 'view-header', + 'vhformat' = 'html', + ) ); + + $debug = json_encode( $data ); + $result = $data[0]['flow']['view-header']['result']['header']; $this-assertArrayHasKey( 'revision', $result, $debug ); $revision = $result['revision']; $this-assertArrayHasKey( 'changeType', $revision, $debug ); @@ -36,6 +44,6 @@ trim( strip_tags( $revision['content']['content'] ) ), $debug ); - $this-assertEquals( 'wikitext', $revision['content']['format'], $debug ); + $this-assertEquals( 'html', $revision['content']['format'], $debug ); } } diff --git a/tests/phpunit/api/ApiFlowEditPostTest.php b/tests/phpunit/api/ApiFlowEditPostTest.php index a2f5af8..311b6d6 100644 --- a/tests/phpunit/api/ApiFlowEditPostTest.php +++ b/tests/phpunit/api/ApiFlowEditPostTest.php @@ -12,32 +12,36 @@ */ class ApiFlowEditPostTest extends ApiTestCase { public function testEditPost() { - $result = $this-createTopic( 'result' ); - $workflowId = $result['roots'][0]; - $topicRevisionId = $result['posts'][$workflowId][0]; - $topic = $result['revisions'][$topicRevisionId]; - - $replyPostId = $topic['replies'][0]; - $replyRevisionId = $result['posts'][$replyPostId][0]; +
[MediaWiki-commits] [Gerrit] Logo configuration on ur.wikiquote - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/210934 Change subject: Logo configuration on ur.wikiquote .. Logo configuration on ur.wikiquote Logo imported from local [[File:Wiki.png]]. Bug: T97510 Change-Id: I01e82115d8a0a57b7d0cb5a235fda6bd75240345 --- M w/static/images/project-logos/urwikiquote.png M wmf-config/InitialiseSettings.php 2 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/34/210934/1 diff --git a/w/static/images/project-logos/urwikiquote.png b/w/static/images/project-logos/urwikiquote.png index 4184de0..e32064b 100644 --- a/w/static/images/project-logos/urwikiquote.png +++ b/w/static/images/project-logos/urwikiquote.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e4c0a1d..5fbd2c4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -858,6 +858,7 @@ 'thwikiquote' = '/static/images/project-logos/thwikiquote.png', 'trwikiquote' = '/static/images/project-logos/trwikiquote.png', 'ukwikiquote' = '/static/images/project-logos/ukwikiquote.png', + 'urwikiquote' = '/static/images/project-logos/urwikiquote.png', // T97510 'viwikiquote' = '/static/images/project-logos/viwikiquote.png', 'zhwikiquote' = '/static/images/project-logos/zhwikiquote.png', -- To view, visit https://gerrit.wikimedia.org/r/210934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01e82115d8a0a57b7d0cb5a235fda6bd75240345 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delimit proper name in apihelp-query+messagegroups-param-depth - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210936 Change subject: Delimit proper name in apihelp-query+messagegroups-param-depth .. Delimit proper name in apihelp-query+messagegroups-param-depth https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-query%2Bmessagegroups-param-depth/en Change-Id: I7c861ebb8114067f5bf88736c99db5ef90e700fa --- M i18n/api/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/36/210936/1 diff --git a/i18n/api/en.json b/i18n/api/en.json index 8c18b51..cc680cb 100644 --- a/i18n/api/en.json +++ b/i18n/api/en.json @@ -34,7 +34,7 @@ apihelp-query+messagecollection-example-3: List of optional messages in Finnish with tags for group page-Example, apihelp-query+messagecollection-example-4: More information about latest translation revisions for group page-Example, apihelp-query+messagegroups-description: Return information about message groups.\n\nNote that the uselang parameter affects the output of language dependent parts., - apihelp-query+messagegroups-param-depth: When using the tree format, limit the depth to this many levels. Value 0 means that no subgroups are shown. If the limit is reached, a prop groupcount is added and it states the number of direct children., + apihelp-query+messagegroups-param-depth: When using the tree format, limit the depth to this many levels. Value 0 means that no subgroups are shown. If the limit is reached, the output includes a \groupcount\ value, which states the number of direct children., apihelp-query+messagegroups-param-filter: Only return messages with IDs that match one or more of the inputs given (case-insensitive, separated by pipes, * wildcard)., apihelp-query+messagegroups-param-format: In a tree format message groups can exist multiple places in the tree., apihelp-query+messagegroups-param-iconsize: Preferred size of rasterised group icon., -- To view, visit https://gerrit.wikimedia.org/r/210936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c861ebb8114067f5bf88736c99db5ef90e700fa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use PostCollection in thankAction to get the author gender - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Use PostCollection in thankAction to get the author gender .. Use PostCollection in thankAction to get the author gender PostCollection::getLatestRevision() will fetch all posts including those of the topics, rather than fail on some posts where the UUID is not reused. Bug: T96527 Change-Id: I4a2547266bf6a428334921e21ab3672a8862d143 --- M container.php M includes/UrlGenerator.php M tests/phpunit/Formatter/FormatterTest.php 3 files changed, 7 insertions(+), 13 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/container.php b/container.php index c224d5a..d08bf15 100644 --- a/container.php +++ b/container.php @@ -44,8 +44,7 @@ $c['url_generator'] = function( $c ) { return new Flow\UrlGenerator( - $c['storage.workflow.mapper'], - $c['storage'] + $c['storage.workflow.mapper'] ); }; diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php index 9640587..f142a26 100644 --- a/includes/UrlGenerator.php +++ b/includes/UrlGenerator.php @@ -2,8 +2,8 @@ namespace Flow; -use Flow\Data\ManagerGroup; use Flow\Data\Mapper\CachingObjectMapper; +use Flow\Collection\PostCollection; use Flow\Exception\InvalidInputException; use Flow\Exception\FlowException; use Flow\Model\AbstractRevision; @@ -27,9 +27,8 @@ */ class UrlGenerator { - public function __construct( CachingObjectMapper $workflowMapper, ManagerGroup $managerGroup ) { + public function __construct( CachingObjectMapper $workflowMapper ) { $this-workflowMapper = $workflowMapper; - $this-storage = $managerGroup; } /** @@ -824,10 +823,9 @@ public function thankAction( UUID $postId ) { $sender = RequestContext::getMain()-getUser(); $recipient = $sender; // Default to current user's gender if we can't find the recipient - $postRevision = $this-storage-get( 'PostRevision', $postId ); - if ( $postRevision !== null ) { - $recipient = $postRevision-getCreatorTuple()-createUser(); - } + $postCollection = PostCollection::newFromId( $postId ); + $postRevision = $postCollection-getLastRevision(); + $recipient = $postRevision-getCreatorTuple()-createUser(); return new Anchor( wfMessage( 'flow-thank-link', $sender, $recipient )-text(), diff --git a/tests/phpunit/Formatter/FormatterTest.php b/tests/phpunit/Formatter/FormatterTest.php index 8bdd3bc..c98efbd 100644 --- a/tests/phpunit/Formatter/FormatterTest.php +++ b/tests/phpunit/Formatter/FormatterTest.php @@ -127,10 +127,7 @@ $workflowMapper = $this-getMockBuilder( 'Flow\Data\Mapper\CachingObjectMapper' ) -disableOriginalConstructor() -getMock(); - $managerGroup = $this-getMockBuilder( 'Flow\Data\ManagerGroup' ) - -disableOriginalConstructor() - -getMock(); - $urlGenerator = new UrlGenerator( $workflowMapper, $managerGroup, $occupier ); + $urlGenerator = new UrlGenerator( $workflowMapper, $occupier ); $templating-expects( $this-any() ) -method( 'getUrlGenerator' ) -will( $this-returnValue( $urlGenerator ) ); -- To view, visit https://gerrit.wikimedia.org/r/210839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a2547266bf6a428334921e21ab3672a8862d143 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mooeypoo mor...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiPageSet: Indicate why a title was invalid - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: ApiPageSet: Indicate why a title was invalid .. ApiPageSet: Indicate why a title was invalid May as well. Bug: T98198 Change-Id: Ib17088a9685c48d7db647896ecd59aced7911374 --- M includes/api/ApiImageRotate.php M includes/api/ApiPageSet.php M includes/api/ApiQuery.php M includes/api/ApiSetNotificationTimestamp.php 4 files changed, 32 insertions(+), 17 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php index 865d39f..c8390b6 100644 --- a/includes/api/ApiImageRotate.php +++ b/includes/api/ApiImageRotate.php @@ -60,7 +60,7 @@ $result = array(); - self::addValues( $result, $pageSet-getInvalidTitles(), 'invalid', 'title' ); + self::addValues( $result, $pageSet-getInvalidTitlesAndReasons(), 'invalid' ); self::addValues( $result, $pageSet-getSpecialTitles(), 'special', 'title' ); self::addValues( $result, $pageSet-getMissingPageIDs(), 'missing', 'pageid' ); self::addValues( $result, $pageSet-getMissingRevisionIDs(), 'missing', 'revid' ); diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index e6f218d..5efe788 100644 --- a/includes/api/ApiPageSet.php +++ b/includes/api/ApiPageSet.php @@ -58,7 +58,7 @@ private $mGoodTitles = array(); private $mMissingPages = array(); // [ns][dbkey] = fake page_id private $mMissingTitles = array(); - private $mInvalidTitles = array(); + private $mInvalidTitles = array(); // [fake_page_id] = array( 'title' = $title, 'invalidreason' = $reason ) private $mMissingPageIDs = array(); private $mRedirectTitles = array(); private $mSpecialTitles = array(); @@ -396,9 +396,22 @@ /** * Titles that were deemed invalid by Title::newFromText() * The array's index will be unique and negative for each item +* @deprecated since 1.26, use self::getInvalidTitlesAndReasons() * @return string[] Array of strings (not Title objects) */ public function getInvalidTitles() { + wfDeprecated( __METHOD__, '1.26' ); + return array_map( function ( $t ) { + return $t['title']; + }, $this-mInvalidTitles ); + } + + /** +* Titles that were deemed invalid by Title::newFromText() +* The array's index will be unique and negative for each item +* @return array[] Array of arrays with 'title' and 'invalidreason' properties +*/ + public function getInvalidTitlesAndReasons() { return $this-mInvalidTitles; } @@ -552,7 +565,7 @@ * * @param array $invalidChecks List of types of invalid titles to include. * Recognized values are: -* - invalidTitles: Titles from $this-getInvalidTitles() +* - invalidTitles: Titles and reasons from $this-getInvalidTitlesAndReasons() * - special: Titles from $this-getSpecialTitles() * - missingIds: ids from $this-getMissingPageIDs() * - missingRevIds: ids from $this-getMissingRevisionIDs() @@ -566,7 +579,7 @@ ) { $result = array(); if ( in_array( invalidTitles, $invalidChecks ) ) { - self::addValues( $result, $this-getInvalidTitles(), 'invalid', 'title' ); + self::addValues( $result, $this-getInvalidTitlesAndReasons(), 'invalid' ); } if ( in_array( special, $invalidChecks ) ) { self::addValues( $result, $this-getSpecialTitles(), 'special', 'title' ); @@ -1077,16 +1090,20 @@ foreach ( $titles as $title ) { if ( is_string( $title ) ) { - $titleObj = Title::newFromText( $title, $this-mDefaultNamespace ); + try { + $titleObj = Title::newFromTextThrow( $title, $this-mDefaultNamespace ); + } catch ( MalformedTitleException $ex ) { + // Handle invalid titles gracefully + $this-mAllPages[0][$title] = $this-mFakePageId; + $this-mInvalidTitles[$this-mFakePageId] = array( + 'title' = $title, + 'invalidreason' = $ex-getMessage(), + ); + $this-mFakePageId--; + continue; // There's nothing else we can do + } } else {
[MediaWiki-commits] [Gerrit] Update html-metadata to 0.1.3 - change (mediawiki...citoid)
Mobrovac has submitted this change and it was merged. Change subject: Update html-metadata to 0.1.3 .. Update html-metadata to 0.1.3 Update html-metadata to 0.1.3 as prior version provided corrupted data. Change-Id: I171e82a45c4c85794fdda035322c2f76b1578a3d --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Looks good to me, approved diff --git a/package.json b/package.json index 359011b..9727bf7 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ compression: 1.4.3, content-type: 1.0.1, express: 4.12.3, -html-metadata: 0.1.1, +html-metadata: 0.1.3, iconv-lite: 0.4.8, js-yaml: 3.2.7, node-uuid: 1.4.3, -- To view, visit https://gerrit.wikimedia.org/r/210929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I171e82a45c4c85794fdda035322c2f76b1578a3d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/citoid Gerrit-Branch: master Gerrit-Owner: Mvolz mv...@wikimedia.org Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explain P3P compact policy in message - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Explain P3P compact policy in message .. Explain P3P compact policy in message https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralauth-centralautologin-p3p-explanation/ksh Change-Id: If2289b1b2fc8c8e946a8a004d4fbdfa357a877d4 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 437434b..9626539 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -263,7 +263,7 @@ centralauth-centralautologin-badstate-local: State \$1\ is not valid on the local wiki, centralauth-centralautologin-badwiki: The wiki \$1\ is not valid for central login, centralauth-centralautologin-corsfail: CORS origin check failed, - centralauth-centralautologin-p3p-explanation: Certain browsers require a P3P compact policy for cookies to be sent or received in some cases, including the situation involved in the SUL login check. This is a needless hoop to jump through in this situation, considering that all pages involved are in the same wiki group and P3P itself is mostly obsolete and abandoned; fortunately, the invalid policy linking to this page is currently considered \good enough\ by these browsers' default configurations.\n\nPlease review this site's human-readable privacy policy to determine how any information collected might be used., + centralauth-centralautologin-p3p-explanation: Certain browsers require a [https://www.w3.org/TR/P3P/#compact_policies P3P compact policy] for cookies to be sent or received in some cases, including the situation involved in the SUL login check. This is a needless hoop to jump through in this situation, considering that all pages involved are in the same wiki group and P3P itself is mostly obsolete and abandoned; fortunately, the invalid policy linking to this page is currently considered \good enough\ by these browsers' default configurations.\n\nPlease review this site's human-readable privacy policy to determine how any information collected might be used., centralauth-centralautologin-logged-in: You are centrally logged in as $1. Reload the page to apply your user settings., centralauth-centralautologin-logged-in-nouser: You are centrally logged in. Reload the page to apply your user settings., globalgroupmembership: Membership in global groups, -- To view, visit https://gerrit.wikimedia.org/r/210867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2289b1b2fc8c8e946a8a004d4fbdfa357a877d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl 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 file if it doesn't exist in daemonize.py - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Create file if it doesn't exist in daemonize.py .. Create file if it doesn't exist in daemonize.py Change-Id: I5c9a6afa2aaa9456c2302f9a6d7dc1e4ad12174f --- M pywikibot/daemonize.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/daemonize.py b/pywikibot/daemonize.py index d0b5ae5..d8c050a 100644 --- a/pywikibot/daemonize.py +++ b/pywikibot/daemonize.py @@ -44,7 +44,8 @@ os.close(2) os.open('/dev/null', os.O_RDWR) if redirect_std: -os.open(redirect_std, os.O_WRONLY | os.O_APPEND) +os.open(redirect_std, +os.O_WRONLY | os.O_APPEND | os.O_CREAT) else: os.dup2(0, 1) os.dup2(1, 2) -- To view, visit https://gerrit.wikimedia.org/r/191531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c9a6afa2aaa9456c2302f9a6d7dc1e4ad12174f Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-05-14T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 2015-05-14T10:00:01+ .. New Wikidata Build - 2015-05-14T10:00:01+ Change-Id: I806dfab008d802a730d5bd445a64ada335dcc3cf --- M composer.lock M extensions/Wikibase/client/i18n/an.json M extensions/Wikibase/client/i18n/eu.json M extensions/Wikibase/client/includes/Hooks/ParserAfterParseHookHandler.php M extensions/Wikibase/repo/i18n/be-tarask.json M extensions/Wikibase/repo/i18n/gl.json M extensions/Wikibase/repo/i18n/mk.json M extensions/Wikibase/repo/i18n/nap.json M extensions/Wikibase/repo/i18n/ru.json M extensions/Wikibase/repo/i18n/yi.json M vendor/composer/installed.json 11 files changed, 68 insertions(+), 23 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index 59f883a..5e53906 100644 --- a/composer.lock +++ b/composer.lock @@ -1213,12 +1213,12 @@ source: { type: git, url: https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -reference: 78941d50702f655c0ccaef338919071e4469dea2 +reference: 456ca4c59e191b0904b5fd35c8d88d53034f6acf }, dist: { type: zip, -url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/78941d50702f655c0ccaef338919071e4469dea2;, -reference: 78941d50702f655c0ccaef338919071e4469dea2, +url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/456ca4c59e191b0904b5fd35c8d88d53034f6acf;, +reference: 456ca4c59e191b0904b5fd35c8d88d53034f6acf, shasum: }, require: { @@ -1286,7 +1286,7 @@ wikibaserepo, wikidata ], -time: 2015-05-12 20:32:19 +time: 2015-05-13 20:41:00 }, { name: wikibase/wikimedia-badges, diff --git a/extensions/Wikibase/client/i18n/an.json b/extensions/Wikibase/client/i18n/an.json index 0631f52..3c529b2 100644 --- a/extensions/Wikibase/client/i18n/an.json +++ b/extensions/Wikibase/client/i18n/an.json @@ -4,6 +4,7 @@ Carlos Cristia ] }, + wikibase-rc-hide-wikidata: $1 {{WBREPONAME}}, wikibase-rc-hide-wikidata-show: Amostrar, wikibase-rc-wikibase-edit-letter: D } diff --git a/extensions/Wikibase/client/i18n/eu.json b/extensions/Wikibase/client/i18n/eu.json index 43c08f6..ea45627 100644 --- a/extensions/Wikibase/client/i18n/eu.json +++ b/extensions/Wikibase/client/i18n/eu.json @@ -6,6 +6,7 @@ Sator ] }, + wikibase-dataitem: {{WBREPONAME}} itema, wikibase-editlinks: Aldatu loturak, wikibase-editlinkstitle: Aldatu hizkuntzen arteko loturak, wikibase-linkitem-input-site: Hizkuntza:, diff --git a/extensions/Wikibase/client/includes/Hooks/ParserAfterParseHookHandler.php b/extensions/Wikibase/client/includes/Hooks/ParserAfterParseHookHandler.php index d29cad5..f192897 100644 --- a/extensions/Wikibase/client/includes/Hooks/ParserAfterParseHookHandler.php +++ b/extensions/Wikibase/client/includes/Hooks/ParserAfterParseHookHandler.php @@ -72,22 +72,17 @@ * @return bool */ public static function onParserAfterParse( Parser $parser = null, $text = null, StripState $stripState = null ) { - if ( $parser === null ) { + // this hook tries to access repo SiteLinkTable + // it interferes with any test that parses something, like a page or a message + if ( $parser === null || defined( 'MW_PHPUNIT_TEST' ) ) { return true; } - // This hook tries to access repo SiteLinkTable - // it interferes with any test that parses something, like a page or a message. - if ( defined( 'MW_PHPUNIT_TEST' ) ) { - return true; - } + // Only run this once, for the article content and not interface stuff - // We only care about existing page content being rendered to HTML, not interface - // messages or dynamic text or template expansion via the API. - if ( $parser-getRevisionId() === null || $parser-OutputType() !== Parser::OT_HTML ) { - // CAVEAT: This means we also bail out on edit previews. To fix that, we would need - // a way to detect preview parses by looking at the Parser object. - // Perhaps WikitextContent could set some flag in the ParserOptions. + // This check needs to be here as this method is being invoked a lot, + // thus calling
[MediaWiki-commits] [Gerrit] [IMPROV] More sensible input() - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/210935 Change subject: [IMPROV] More sensible input() .. [IMPROV] More sensible input() Instead of stripping text from both sides it just strips from from the right (as there a space is actually added). It now also checks whether there is a color code at the end. In that case it checks the character before that color code instead of checking the last character to insert the default value. Change-Id: I7447bf199a89bfe67702778203511b96ee1df530 --- M pywikibot/userinterfaces/terminal_interface_base.py 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/35/210935/1 diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 968a14b..1f10c9a 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -221,13 +221,20 @@ @rtype: unicode assert(not password or not default) -end_marker = ':' -question = question.strip() -if question[-1] == ':': +end_marker = '' +question = question.rstrip() +if question[-1] == '}': +color_start = question.rfind('\03{') +if color_start == question.rfind('{') - 1: +end_marker = question[color_start:] +question = question[:color_start] +if question[-1] == '?': +end_marker = '?' + end_marker question = question[:-1] -elif question[-1] == '?': -question = question[:-1] -end_marker = '?' +else: +if question[-1] == ':': +question = question[:-1] +end_marker = ':' + end_marker if default: question = question + ' (default: %s)' % default question = question + end_marker -- To view, visit https://gerrit.wikimedia.org/r/210935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7447bf199a89bfe67702778203511b96ee1df530 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Major improvement - change (mediawiki...Josa)
devunt has uploaded a new change for review. https://gerrit.wikimedia.org/r/210937 Change subject: Major improvement .. Major improvement * Change josaonly algorithm * Add pronounciation map * Change == to === * Ignore all ascii characters except '(' and ')' * Bump up version to 0.2.0 Change-Id: I477dadb200612ace40b91358bf1fd19ace4d42e4 --- M Josa.class.php M Josa.php 2 files changed, 42 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Josa refs/changes/37/210937/1 diff --git a/Josa.class.php b/Josa.class.php index fa85966..d76aff8 100644 --- a/Josa.class.php +++ b/Josa.class.php @@ -17,18 +17,43 @@ 'E/' = array( '이', '', '(이)' ), # 태준이가 / 철수가 ); + // This dictionary matches each numbers and alphabets to correspoding hangul pronounce + private static $pronounceMap = array( + '0' = '영', '1' = '일', '2' = '이', + '3' = '삼', '4' = '사', '5' = '오', + '6' = '육', '7' = '칠', '8' = '팔', + '9' = '구', + + 'A' = '이', 'B' = '비', 'C' = '씨', + 'D' = '디', 'E' = '이', 'F' = '프', + 'G' = '지', 'H' = '치', 'I' = '이', + 'J' = '이', 'K' = '이', 'L' = '엘', + 'M' = '엠', 'N' = '엔', 'O' = '오', + 'P' = '피', 'Q' = '큐', 'R' = '알', + 'S' = '스', 'T' = '티', 'U' = '유', + 'V' = '이', 'W' = '유', 'X' = '스', + 'Y' = '이', 'Z' = '지', + ); + /** * @param Parser $parser * @return bool */ public static function onParserFirstCallInit( Parser $parser ) { foreach ( self::$josaMap as $key = $value ) { - $parser-setFunctionHook( $key, function( $parser, $str, $with_str = true ) use ( $key ) { + $parser-setFunctionHook( $key, function( $parser, $str, $override = NULL) use ( $key ) { $josa = Josa::getJosa( $key, $str ); - if ( $with_str ) { - return $str . $josa; - } else { + if ( $override !== NULL ) { + if ( $override === 'josaonly' ) { + $josaonly = true; + } else { + $josa = $override; + } + } + if ( $josaonly ) { return $josa; + } else { + return $str . $josa; } } ); } @@ -41,16 +66,18 @@ * @return string Josa */ public static function getJosa( $type, $str ) { - if ( mb_substr( $str, -2, 2, 'utf-8' ) == ']]' ) { # if end with internel link - $str = mb_substr( $str, 0, -2, 'utf-8' ); + $str = preg_replace( '/[\x{}-\x{0027}\x{002A}-\x{002F}\x{003A}-\x{0040}\x{005B}-\x{0060}\x{007B}-\x{00FF}]/u', '', $str ); + $chr = mb_substr( $str, -1, 1, 'utf-8' ); + if ( array_key_exists( $chr, self::$pronounceMap ) ) { + $chr = self::$pronounceMap[$chr]; } - $chr = self::convertToJohabCode( mb_substr( $str, -1, 1, 'utf-8' ) ); - if ( !$chr ) { + $code = self::convertToJohabCode( $chr ); + if ( !$code ) { $idx = 2; # Not hangul - } elseif ( ( $chr - 0xAC00 ) % 28 == 0 ) { + } elseif ( ( $code - 0xAC00 ) % 28 === 0 ) { $idx = 1; # No trailing consonant - } elseif ( ( $type === 'Eu/Euro' ) ( ( $chr - 0xAC00 ) % 28 == 8 ) ) { - $idx = 1; # $type is Eu/Euro and trailing consonant is rieul(ㄹ). This is exception on Korean postposition rules. + } elseif ( ( $type === 'Eu/Euro' ) ( ( $code - 0xAC00 ) % 28 === 8 ) ) { + $idx = 1; # $type is Eu/Euro and trailing consonant is rieul(ㄹ). This is exception on Korean postposition rules. } else { $idx = 0; # Trailing consonant exists } @@ -70,12 +97,12 @@ if ( $thisValue 128 ) { return false; } else { - if ( count( $values ) == 0 ) { + if ( count( $values ) === 0 ) { $lookingFor = ( $thisValue 224 ) ? 2 : 3; } $values[] = $thisValue; -
[MediaWiki-commits] [Gerrit] Hygiene: Reorganise mobile.head modules - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Reorganise mobile.head modules .. Hygiene: Reorganise mobile.head modules Change-Id: I2fc5095bce131ed3c15fc0ae73d67634a2118337 --- M includes/Resources.php D javascripts/modules/mainMenu/init.js R resources/mobile.head/init.js R resources/mobile.modifiedBar/time.js R tests/qunit/mobile.head/test_time.js 5 files changed, 27 insertions(+), 31 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 870c834..76b59ad 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -271,7 +271,7 @@ 'mediawiki.jqueryMsg', ), 'scripts' = array( - 'javascripts/modules/lastEdited/time.js', + 'resources/mobile.modifiedBar/time.js', ), 'messages' = array( // lastEdited.js @@ -1790,8 +1790,7 @@ 'mobile.context', ), 'scripts' = array( - 'javascripts/modules/mainMenu/init.js', - 'javascripts/modules/lastEdited/init.js', + 'resources/mobile.head/init.js', ), 'messages' = array( // lastEdited.js diff --git a/javascripts/modules/mainMenu/init.js b/javascripts/modules/mainMenu/init.js deleted file mode 100644 index 34ccca4..000 --- a/javascripts/modules/mainMenu/init.js +++ /dev/null @@ -1,24 +0,0 @@ -( function ( M, $ ) { - var MainMenu = M.require( 'MainMenu' ), - mainMenu = new MainMenu(); - - M.on( 'header-loaded', function () { - // Render MainMenu when needed - // In alpha there is no #mw-mf-main-menu-button, the user can click on the header - // search icon or the site name in the header to open the main menu - $( '#mw-mf-main-menu-button, .alpha .header a.header-icon, .alpha .header .header-title a' ) - .on( 'click', function ( ev ) { - mainMenu.openNavigationDrawer(); - ev.preventDefault(); - // Stop propagation, otherwise the Skin will close the open menus on page center click - ev.stopPropagation(); - } ); - } ); - - $( function () { - if ( !$( '#mw-mf-page-left' ).find( '.menu' ).length ) { - mainMenu.appendTo( '#mw-mf-page-left' ); - } - } ); - -}( mw.mobileFrontend, jQuery ) ); diff --git a/javascripts/modules/lastEdited/init.js b/resources/mobile.head/init.js similarity index 68% rename from javascripts/modules/lastEdited/init.js rename to resources/mobile.head/init.js index 72cca77..bbc21d6 100644 --- a/javascripts/modules/lastEdited/init.js +++ b/resources/mobile.head/init.js @@ -1,6 +1,7 @@ ( function ( M, $ ) { - - var time = M.require( 'modules/lastEdited/time' ); + var time = M.require( 'modules/lastEdited/time' ), + MainMenu = M.require( 'MainMenu' ), + mainMenu = new MainMenu(); /** * Initialisation function for last modified module. @@ -10,7 +11,7 @@ * months or years * @ignore */ - function init() { + function initHistoryLink() { var $lastModified = $( '#mw-mf-last-modified' ), historyUrl = $lastModified.attr( 'href' ), ts = $lastModified.data( 'timestamp' ), @@ -53,6 +54,26 @@ $lastModified.remove(); } } - M.on( 'history-link-loaded', init ); + + // bind events + M.on( 'history-link-loaded', initHistoryLink ); + M.on( 'header-loaded', function () { + // Render MainMenu when needed + // In alpha there is no #mw-mf-main-menu-button, the user can click on the header + // search icon or the site name in the header to open the main menu + $( '#mw-mf-main-menu-button, .alpha .header a.header-icon, .alpha .header .header-title a' ) + .on( 'click', function ( ev ) { + mainMenu.openNavigationDrawer(); + ev.preventDefault(); + // Stop propagation, otherwise the Skin will close the open menus on page center click + ev.stopPropagation(); + } ); + } ); + + $( function () { + if ( !$( '#mw-mf-page-left' ).find( '.menu' ).length ) { + mainMenu.appendTo( '#mw-mf-page-left' ); + } + } ); }(
[MediaWiki-commits] [Gerrit] Hygiene: More reorganisation of folders - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: More reorganisation of folders .. Hygiene: More reorganisation of folders * Gallery * Preferred languages Change-Id: Icc3524a6b88e83079bd3097ff65ef012ebf918f5 --- M includes/Resources.php R resources/mobile.gallery/PhotoItem.hogan R resources/mobile.gallery/PhotoItem.js R resources/mobile.gallery/PhotoList.hogan R resources/mobile.gallery/PhotoList.js R resources/mobile.gallery/PhotoListApi.js R resources/mobile.gallery/gallery.less R resources/mobile.preferredLanguages/init.js R tests/qunit/mobile.gallery/test_PhotoListApi.js R tests/qunit/mobile.preferredLanguages/test_init.js 10 files changed, 7 insertions(+), 7 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index b437fb8..870c834 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -717,7 +717,7 @@ 'mobile.settings', ), 'scripts' = array( - 'javascripts/modules/preferredLanguages/init.js', + 'resources/mobile.preferredLanguages/init.js', ), ), @@ -1277,19 +1277,19 @@ 'mobile.infiniteScroll', ), 'templates' = array( - 'PhotoItem.hogan' = 'templates/modules/gallery/PhotoItem.hogan', - 'PhotoList.hogan' = 'templates/modules/gallery/PhotoList.hogan', + 'PhotoItem.hogan' = 'resources/mobile.gallery/PhotoItem.hogan', + 'PhotoList.hogan' = 'resources/mobile.gallery/PhotoList.hogan', ), 'messages' = array( 'mobile-frontend-donate-image-nouploads', ), 'styles' = array( - 'less/modules/gallery.less', + 'resources/mobile.gallery/gallery.less', ), 'scripts' = array( - 'javascripts/modules/gallery/PhotoListApi.js', - 'javascripts/modules/gallery/PhotoItem.js', - 'javascripts/modules/gallery/PhotoList.js', + 'resources/mobile.gallery/PhotoListApi.js', + 'resources/mobile.gallery/PhotoItem.js', + 'resources/mobile.gallery/PhotoList.js', ), ), diff --git a/templates/modules/gallery/PhotoItem.hogan b/resources/mobile.gallery/PhotoItem.hogan similarity index 100% rename from templates/modules/gallery/PhotoItem.hogan rename to resources/mobile.gallery/PhotoItem.hogan diff --git a/javascripts/modules/gallery/PhotoItem.js b/resources/mobile.gallery/PhotoItem.js similarity index 100% rename from javascripts/modules/gallery/PhotoItem.js rename to resources/mobile.gallery/PhotoItem.js diff --git a/templates/modules/gallery/PhotoList.hogan b/resources/mobile.gallery/PhotoList.hogan similarity index 100% rename from templates/modules/gallery/PhotoList.hogan rename to resources/mobile.gallery/PhotoList.hogan diff --git a/javascripts/modules/gallery/PhotoList.js b/resources/mobile.gallery/PhotoList.js similarity index 100% rename from javascripts/modules/gallery/PhotoList.js rename to resources/mobile.gallery/PhotoList.js diff --git a/javascripts/modules/gallery/PhotoListApi.js b/resources/mobile.gallery/PhotoListApi.js similarity index 100% rename from javascripts/modules/gallery/PhotoListApi.js rename to resources/mobile.gallery/PhotoListApi.js diff --git a/less/modules/gallery.less b/resources/mobile.gallery/gallery.less similarity index 100% rename from less/modules/gallery.less rename to resources/mobile.gallery/gallery.less diff --git a/javascripts/modules/preferredLanguages/init.js b/resources/mobile.preferredLanguages/init.js similarity index 100% rename from javascripts/modules/preferredLanguages/init.js rename to resources/mobile.preferredLanguages/init.js diff --git a/tests/qunit/modules/gallery/test_PhotoListApi.js b/tests/qunit/mobile.gallery/test_PhotoListApi.js similarity index 100% rename from tests/qunit/modules/gallery/test_PhotoListApi.js rename to tests/qunit/mobile.gallery/test_PhotoListApi.js diff --git a/tests/qunit/modules/preferredLanguages/test_init.js b/tests/qunit/mobile.preferredLanguages/test_init.js similarity index 100% rename from tests/qunit/modules/preferredLanguages/test_init.js rename to tests/qunit/mobile.preferredLanguages/test_init.js -- To view, visit https://gerrit.wikimedia.org/r/210295 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc3524a6b88e83079bd3097ff65ef012ebf918f5 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
[MediaWiki-commits] [Gerrit] html2wt should not need access to original source - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: html2wt should not need access to original source .. html2wt should not need access to original source Bug: T96923 Change-Id: I104982e061abf20c63a6342caa5600a090c9ced7 --- M lib/dom.cleanup.js M lib/mediawiki.WikitextSerializer.js M lib/wts.SerializerState.js M lib/wts.TagHandlers.js 4 files changed, 25 insertions(+), 32 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/dom.cleanup.js b/lib/dom.cleanup.js index e888aab..1af70c0 100644 --- a/lib/dom.cleanup.js +++ b/lib/dom.cleanup.js @@ -91,11 +91,14 @@ DU.setDataMw( node, undefined ); } - // Remove dp.src from elements that have valid data-mw and dsr. This - // should reduce data-parsoid bloat. - if ( validDataMW Util.isValidDSR(dp.dsr) ) { + // Remove dp.src from elements that have valid data-mw and dsr. + // This should reduce data-parsoid bloat. + var validDSR = validDataMW Util.isValidDSR(dp.dsr); + var isPageProp = (node.nodeName === 'META' + /^mw\:PageProp\/(.*)$/.test(node.getAttribute('property'))); + if (validDSR !isPageProp) { dp.src = undefined; - } else if ( tplInfo tplInfo.first === node (!atTopLevel || !dp.tsr) ) { + } else if (tplInfo tplInfo.first === node (!atTopLevel || !dp.tsr)) { // Transcluded nodes will not have dp.tsr set // and don't need dp.src either. dp.src = undefined; diff --git a/lib/mediawiki.WikitextSerializer.js b/lib/mediawiki.WikitextSerializer.js index 7e3d796..d51f4c5 100644 --- a/lib/mediawiki.WikitextSerializer.js +++ b/lib/mediawiki.WikitextSerializer.js @@ -650,8 +650,7 @@ if (/(?:^|\s)mw:Transclusion(?=$|\s)/.test(typeOf)) { dataMW = DU.getDataMw(node); if (dataMW.parts) { - src = state.serializer._buildTemplateWT(node, - state, dataMW.parts ); + src = state.serializer._buildTemplateWT(node, state, dataMW.parts); } else if (dp.src) { self.env.log(error, data-mw missing in: + node.outerHTML); src = dp.src; @@ -659,7 +658,11 @@ throw new Error(Cannot serialize transclusion without data-mw.parts or data-parsoid.src.); } } else if (/(?:^|\s)mw:Param(?=$|\s)/.test(typeOf)) { - src = dp.src; + if (dp.src) { + src = dp.src; + } else { + throw new Error(No source for params.); + } } else if (/(?:^|\s)mw:Extension\/LabeledSectionTransclusion/.test(typeOf)) { // FIXME: Special case for section until LST is implemented // natively in Parsoid @@ -698,24 +701,10 @@ throw new Error(Should never reach here); } - // FIXME: Just adding this here temporarily till we go in and - // clean this up and strip this out if we can verify that data-mw - // is going to be present always when necessary and indicate that - // a missing data-mw is either a parser bug or a client error. - // - // Fallback: should be exercised only in exceptional situations. - if (src === undefined state.env.page.src Util.isValidDSR(dp.dsr) !dp.fostered) { - src = state.getOrigSrc(dp.dsr[0], dp.dsr[1]); - } - if (src !== undefined) { - state.singleLineContext.disable(); - self.emitWikitext(src, state, cb, node); - state.singleLineContext.pop(); - return DU.skipOverEncapsulatedContent(node); - } else { - self.env.log( error, Serializing as HTML. No handler for: + node.outerHTML ); -
[MediaWiki-commits] [Gerrit] Remove uploads - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Remove uploads .. Remove uploads They are not getting the support they deserve. Given UploadWizard is being rewritten by the new editing team it makes sense to support efforts there instead. Retain Special:Uploads due to link from special user profile. Only surface it in menu if uploading is enabled. Bug: T98874 Bug: T98402 Change-Id: I29ae18e2b8cd8e9b91d20c4f85d42c79dc70d6fd --- M includes/MobileFrontend.hooks.php M includes/Resources.php M includes/skins/SkinMinerva.php D javascripts/modules/uploads/LeadPhoto.js D javascripts/modules/uploads/LeadPhotoUploaderButton.js D javascripts/modules/uploads/PhotoApi.js D javascripts/modules/uploads/PhotoUploadOverlay.js D javascripts/modules/uploads/PhotoUploadProgress.js D javascripts/modules/uploads/PhotoUploaderButton.js D javascripts/modules/uploads/ProgressBar.js D javascripts/modules/uploads/UploadTutorial.js D javascripts/modules/uploads/init.js D javascripts/modules/uploads/routes.js M javascripts/specials/uploads.js D less/modules/uploads/PhotoUploadOverlay.less D less/modules/uploads/PhotoUploadProgress.less D less/modules/uploads/PhotoUploaderButton.less D less/modules/uploads/UploadTutorial.less M less/pageactions.less D resources/mobile.loggingSchemas/SchemaMobileWebUploads.js M resources/mobile.startup/Page.js M resources/skins.minerva.icons.images.legacy/icons.less D templates/modules/uploads/LeadPhoto.hogan D templates/modules/uploads/LeadPhotoUploaderButton.hogan D templates/modules/uploads/PhotoUploadOverlay.hogan D templates/modules/uploads/PhotoUploadProgress.hogan D templates/modules/uploads/PhotoUploaderButton.hogan D templates/modules/uploads/UploadTutorial.hogan D templates/modules/uploads/commons-upload.hogan D tests/browser/features/step_definitions/uploads_steps.rb D tests/browser/features/uploads_copyvio.feature D tests/browser/features/uploads_lead.feature D tests/qunit/modules/uploads/test_PhotoApi.js D tests/qunit/modules/uploads/test_ProgressBar.js D tests/qunit/modules/uploads/test_UploadTutorial.js D tests/qunit/modules/uploads/test_init.js 36 files changed, 2 insertions(+), 2,113 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index 94d814a..c186f7a 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -965,7 +965,6 @@ $scripts = array( 'resources/mobile.loggingSchemas/SchemaMobileWeb.js', - 'resources/mobile.loggingSchemas/SchemaMobileWebUploads.js', 'resources/mobile.loggingSchemas/SchemaMobileWebClickTracking.js', 'resources/mobile.loggingSchemas/SchemaMobileWebEditing.js', 'resources/mobile.loggingSchemas/SchemaMobileWebWatching.js', diff --git a/includes/Resources.php b/includes/Resources.php index 76b59ad..06a3e0f 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -473,19 +473,6 @@ ), ), - 'mobile.leadPhotoUploader' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.startup', - 'mobile.user', - 'mobile.upload.ui', - ), - 'scripts' = array( - 'javascripts/modules/uploads/init.js', - ), - // This is a logged in user feature only. - 'group' = 'user', - ), - 'mobile.editor' = $wgMFResourceParsedMessageModuleBoilerplate + array( 'dependencies' = array( 'mobile.startup', @@ -624,71 +611,6 @@ ), 'messages' = array( 'mobile-frontend-editor-viewing-source-page', - ), - ), - - 'mobile.uploads' = $wgMFResourceParsedMessageModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.startup', - 'mobile.editor.api', - 'mobile.contentOverlays', - 'mobile.foreignApi', - 'mobile.microAutoSize', - 'mobile.loggingSchemas', - ), - 'scripts' = array( - 'javascripts/modules/uploads/PhotoApi.js', - 'javascripts/modules/uploads/LeadPhoto.js', - 'javascripts/modules/uploads/UploadTutorial.js', - 'javascripts/modules/uploads/PhotoUploadProgress.js', - 'javascripts/modules/uploads/PhotoUploadOverlay.js', - 'javascripts/externals/exif-js/binaryajax.js', -
[MediaWiki-commits] [Gerrit] Remove deprecated RL modules - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Remove deprecated RL modules .. Remove deprecated RL modules Bug: T98867 Change-Id: Ie8673e57b8f8f81c0029c4fcae3b89fdd0132bc4 --- M includes/Resources.php 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 76b59ad..81cf0a5 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1857,18 +1857,6 @@ 'resources/skins.minerva.alpha.scripts/projects.js', ) ), - // FIXME: Alias. Remove when cache cleared. - 'mobile.stable' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( 'skins.minerva.scripts' ), - ), - // FIXME: Alias.Remove when cache cleared. - 'mobile.beta' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( 'skins.minerva.beta.scripts' ), - ), - // FIXME: Alias. Remove when cache cleared. - 'mobile.alpha' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( 'skins.minerva.alpha.scripts' ), - ), 'tablet.scripts' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( // Feature modules that should be loaded on tablets should be listed below here. -- To view, visit https://gerrit.wikimedia.org/r/210355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8673e57b8f8f81c0029c4fcae3b89fdd0132bc4 Gerrit-PatchSet: 9 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com Gerrit-Reviewer: Yurik yu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mira to mediawiki-installation dsh - change (operations/puppet)
John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210938 Change subject: Add mira to mediawiki-installation dsh .. Add mira to mediawiki-installation dsh Bug: T95436 Change-Id: I91a501c048b26e4d1bd0c86d8a201bba4f74dde2 --- M modules/dsh/files/group/mediawiki-installation 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/210938/1 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index a021155..d7cec49 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -1,5 +1,6 @@ # !all names added here must be FQDN's now (T93983) ! +mira.codfw.wmnet silver.wikimedia.org tin.eqiad.wmnet terbium.eqiad.wmnet -- To view, visit https://gerrit.wikimedia.org/r/210938 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91a501c048b26e4d1bd0c86d8a201bba4f74dde2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis johnflewi...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] There's more in a page than its title - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: There's more in a page than its title .. There's more in a page than its title Use a wording similar to flow-error-invalid-title. https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Flow-special-enableflow-invalid-title/en Change-Id: Ic75a7519e050efe4b3caeef04278ded72f3f8c08 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 1cbd260..03aa1d7 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -394,7 +394,7 @@ flow-special-enableflow-page: Page to enable Flow on, flow-special-enableflow-header: Initial description of Flow board (wikitext), flow-special-enableflow-board-already-exists: There is already a Flow board at [[$1]]., - flow-special-enableflow-invalid-title: The provided page is not a valid page title, + flow-special-enableflow-invalid-title: An invalid page title was provided, flow-special-enableflow-archive-title-format: Where to archive existing content, flow-special-enableflow-archive-title-format-default-value: %s/Archive_%d, flow-special-enableflow-board-creation-not-allowed: You are not allowed to create a Flow board at [[:$1]]., -- To view, visit https://gerrit.wikimedia.org/r/210912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic75a7519e050efe4b3caeef04278ded72f3f8c08 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore speedy non-selser serialization - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Restore speedy non-selser serialization .. Restore speedy non-selser serialization * Fixes the large perf regression Flow was/is seeing. * In I104982e061abf20c63a6342caa5600a090c9ced7, we made sure that non-selser didn't need the original source. * Now, if an oldid isn't supplied, we don't fetch the source and fall back to non-selser. This used to be case before the refactor in I27176bd4b62562a7aead3d40679d31ad0b8f3ab8 (see the review there where this was all discussed). Bug: T98408 Change-Id: I44834aed117de810eaa8dba596cf8337ee423f9d --- M api/routes.js M lib/mediawiki.DOMUtils.js M lib/mediawiki.SelectiveSerializer.js M tests/mocha/api.js M tests/roundtrip-test.js M tests/rttest.localsettings.js 6 files changed, 23 insertions(+), 30 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved Matthias Mullie: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/api/routes.js b/api/routes.js index 9e07508..8d921c9 100644 --- a/api/routes.js +++ b/api/routes.js @@ -267,14 +267,7 @@ } } - // This isn't part of the public API. Just a convenience to enable - // selser for roundtrip testing. - var useSelser = parsoidConfig.useSelser; - if (parsoidConfig.rtTestMode req.body.hasOwnProperty('_rtSelser')) { - useSelser = !(!req.body._rtSelser || req.body._rtSelser === false); - } - - var p = DU.serializeDOM(env, doc.body, useSelser) + var p = DU.serializeDOM(env, doc.body, parsoidConfig.useSelser) .timeout(REQ_TIMEOUT) .then(function(output) { var contentType = 'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0;charset=utf-8'; diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js index ce0ab1f..e81c8fc 100644 --- a/lib/mediawiki.DOMUtils.js +++ b/lib/mediawiki.DOMUtils.js @@ -2550,23 +2550,19 @@ console.assert(DU.isBody(body), 'Expected a body node.'); + var hasOldId = (env.page.id env.page.id !== '0'); var needsWt = (env.page.src === null); - var needsDOM = useSelser !(env.page.dom || env.page.domdiff); - var useCache = env.conf.parsoid.parsoidCacheURI - (env.page.id env.page.id !== '0'); + var needsDOM = !(env.page.dom || env.page.domdiff); + var useCache = env.conf.parsoid.parsoidCacheURI hasOldId; var steps = []; - if (needsWt) { + if (needsWt hasOldId) { steps.push(function() { var target = env.resolveTitle(env.normalizeTitle(env.page.name), ''); return TemplateRequest.setPageSrcInfo( env, target, env.page.id ).catch(function(err) { env.log('error', 'Error while fetching page source.'); - // Set the env.page.src to the empty string. - // An alternative would be to audit all the uses to handle - // it as uninitialized (ie. null). - env.setPageSrcInfo(null); }); }); } @@ -2583,6 +2579,11 @@ }); } else { steps.push(function() { + if (env.page.src === null) { + // The src fetch failed or we never had an oldid. + // We'll just fallback to non-selser. + return; + } return env.pipelineFactory.parse( env, env.page.src ).then(function(doc) { @@ -2596,7 +2597,9 @@ // If we can, perform these steps in parallel (w/ map). var p; - if (useCache) { + if (!useSelser) { + p = Promise.resolve(); + } else if (useCache) { p = Promise.map(steps, function(func) { return func(); }); } else { p = Promise.reduce(steps, function(prev, func) { @@ -2606,7 +2609,7 @@ return p.then(function() { var Serializer = useSelser ? SelectiveSerializer : WikitextSerializer; - var serializer = new Serializer({ env: env, oldid: env.page.id }); + var serializer = new Serializer({ env: env }); return serializer.serializeDOMSync(body); }).nodify(cb); }; diff --git a/lib/mediawiki.SelectiveSerializer.js b/lib/mediawiki.SelectiveSerializer.js index de3e142..5bb0fc4 100644 ---
[MediaWiki-commits] [Gerrit] resourceloader: Remove only=messages - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: resourceloader: Remove only=messages .. resourceloader: Remove only=messages This isn't needed. * Deprecate 'modulemessages' API, return empty result and warning. * Remove half-implemented only=templates. Change-Id: Ia6c87d687c6670b3ebf24251572191732651e8f5 --- M includes/OutputPage.php M includes/api/ApiParse.php M includes/parser/ParserOutput.php M includes/resourceloader/ResourceLoader.php M includes/resourceloader/ResourceLoaderContext.php M includes/resourceloader/ResourceLoaderModule.php 6 files changed, 24 insertions(+), 41 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 8f9f9c6..2d90147 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -162,9 +162,6 @@ /** @var array */ protected $mModuleStyles = array(); - /** @var array */ - protected $mModuleMessages = array(); - /** @var ResourceLoader */ protected $mResourceLoader; @@ -613,24 +610,24 @@ /** * Get the list of module messages to include on this page * +* @deprecated since 1.26 Obsolete * @param bool $filter * @param string|null $position -* * @return array Array of module names */ public function getModuleMessages( $filter = false, $position = null ) { - return $this-getModules( $filter, $position, 'mModuleMessages' ); + wfDeprecated( __METHOD__, '1.26' ); + return array(); } /** -* Add only messages of one or more modules recognized by the resource loader. -* Module messages added through this function will be loaded by the resource -* loader when the page loads. +* Load messages of one or more ResourceLoader modules. * +* @deprecated since 1.26 Use addModules() instead * @param string|array $modules Module name (string) or array of module names */ public function addModuleMessages( $modules ) { - $this-mModuleMessages = array_merge( $this-mModuleMessages, (array)$modules ); + wfDeprecated( __METHOD__, '1.26' ); } /** @@ -1758,7 +1755,6 @@ $this-addModules( $parserOutput-getModules() ); $this-addModuleScripts( $parserOutput-getModuleScripts() ); $this-addModuleStyles( $parserOutput-getModuleStyles() ); - $this-addModuleMessages( $parserOutput-getModuleMessages() ); $this-addJsConfigVars( $parserOutput-getJsConfigVars() ); $this-mPreventClickjacking = $this-mPreventClickjacking || $parserOutput-preventClickjacking(); @@ -1805,7 +1801,6 @@ $this-addModules( $parserOutput-getModules() ); $this-addModuleScripts( $parserOutput-getModuleScripts() ); $this-addModuleStyles( $parserOutput-getModuleStyles() ); - $this-addModuleMessages( $parserOutput-getModuleMessages() ); $this-addJsConfigVars( $parserOutput-getJsConfigVars() ); } @@ -2980,11 +2975,6 @@ $links[] = $this-makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED ); // Scripts and messages only requests marked for top inclusion - // Messages should go first - $links[] = $this-makeResourceLoaderLink( - $this-getModuleMessages( true, 'top' ), - ResourceLoaderModule::TYPE_MESSAGES - ); $links[] = $this-makeResourceLoaderLink( $this-getModuleScripts( true, 'top' ), ResourceLoaderModule::TYPE_SCRIPTS @@ -3018,14 +3008,9 @@ * @return string */ function getScriptsForBottomQueue( $inHead ) { - // Scripts and messages only requests marked for bottom inclusion + // Scripts only requests marked for bottom inclusion // If we're in the head, use load() calls rather than script src=... tags - // Messages should go first $links = array(); - $links[] = $this-makeResourceLoaderLink( $this-getModuleMessages( true, 'bottom' ), - ResourceLoaderModule::TYPE_MESSAGES, /* $useESI = */ false, /* $extraQuery = */ array(), - /* $loadCall = */ $inHead - ); $links[] = $this-makeResourceLoaderLink( $this-getModuleScripts( true, 'bottom' ), ResourceLoaderModule::TYPE_SCRIPTS, /* $useESI = */ false, /* $extraQuery = */ array(), /* $loadCall = */ $inHead diff --git a/includes/api/ApiParse.php
[MediaWiki-commits] [Gerrit] moving to 0.0.2 for 0.0.1 release - change (wikidata...rdf)
Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/210940 Change subject: moving to 0.0.2 for 0.0.1 release .. moving to 0.0.2 for 0.0.1 release Change-Id: I81ad8e12159618c4e5796e7524307ac895eec1ae --- M .gitreview M blazegraph/pom.xml M common/pom.xml M dist/pom.xml M pom.xml M tools/pom.xml 6 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/40/210940/1 diff --git a/.gitreview b/.gitreview index 6839d50..461e3e0 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=wikidata/query/rdf.git -defaultbranch=v0.0.1 +defaultbranch=master defaultrebase=0 diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml index 079c591..3fe3158 100644 --- a/blazegraph/pom.xml +++ b/blazegraph/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.wikidata.query.rdf/groupId artifactIdparent/artifactId -version0.0.1/version +version0.0.2-SNAPSHOT/version /parent artifactIdblazegraph/artifactId packagingjar/packaging diff --git a/common/pom.xml b/common/pom.xml index f7eda21..6cd4738 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.wikidata.query.rdf/groupId artifactIdparent/artifactId -version0.0.1/version +version0.0.2-SNAPSHOT/version /parent artifactIdcommon/artifactId packagingjar/packaging diff --git a/dist/pom.xml b/dist/pom.xml index f0065b9..99536e2 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.wikidata.query.rdf/groupId artifactIdparent/artifactId -version0.0.1/version +version0.0.2-SNAPSHOT/version /parent artifactIdservice/artifactId packagingpom/packaging diff --git a/pom.xml b/pom.xml index 9c89dc1..7a3c6f8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ /parent groupIdorg.wikidata.query.rdf/groupId artifactIdparent/artifactId - version0.0.1/version + version0.0.2-SNAPSHOT/version packagingpom/packaging modules diff --git a/tools/pom.xml b/tools/pom.xml index fe192c7..95aeb85 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.wikidata.query.rdf/groupId artifactIdparent/artifactId -version0.0.1/version +version0.0.2-SNAPSHOT/version /parent artifactIdtools/artifactId packagingjar/packaging -- To view, visit https://gerrit.wikimedia.org/r/210940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81ad8e12159618c4e5796e7524307ac895eec1ae Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev smalys...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Translate to a6f0a63 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Translate to a6f0a63 .. Update Translate to a6f0a63 Change-Id: Ic6c87abad9f21f939c9ca9fbd98f2659a9797f5d --- M extensions/Translate 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Translate b/extensions/Translate index bbfec6f..a6f0a63 16 --- a/extensions/Translate +++ b/extensions/Translate -Subproject commit bbfec6fd0a3484807d8edf4a0d12bb8e7e028f98 +Subproject commit a6f0a6312ddedd636fbf2c820f59e9b31086075d -- To view, visit https://gerrit.wikimedia.org/r/210919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6c87abad9f21f939c9ca9fbd98f2659a9797f5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'ast' in Apertium.languagenames.json - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged. Change subject: Add 'ast' in Apertium.languagenames.json .. Add 'ast' in Apertium.languagenames.json Change-Id: I61a30e56a1c9722fc57fd709f6d033ac6f02abeb --- M mt/Apertium.languagenames.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/mt/Apertium.languagenames.json b/mt/Apertium.languagenames.json index 7294e79..0bfdaf5 100644 --- a/mt/Apertium.languagenames.json +++ b/mt/Apertium.languagenames.json @@ -2,6 +2,7 @@ af: afr, an: arg, ar: ara, + as: ast, bg: bul, br: bre, bs: hbs_BS, -- To view, visit https://gerrit.wikimedia.org/r/210921 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61a30e56a1c9722fc57fd709f6d033ac6f02abeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Additional edit summary for syntax correction - change (pywikibot/i18n)
jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Additional edit summary for syntax correction .. [IMPROV] Additional edit summary for syntax correction Edit summary when the bot corrects the syntax of a references / tag Change-Id: Ia10f70985e9b4fb687467e7a7d906b36e202bbd8 --- M noreferences.py M noreferences/de.json M noreferences/en.json M noreferences/qqq.json 4 files changed, 22 insertions(+), 5 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/noreferences.py b/noreferences.py index 9b72f15..36aa5bf 100644 --- a/noreferences.py +++ b/noreferences.py @@ -1,13 +1,16 @@ # -*- coding: utf-8 -*- i18n message bundle. msg = { +# Author: Xqt 'en': { 'noreferences-add-tag': u'Bot: Adding missing references / tag', +'noreferences-fix-tag': u'Bot: Fix invalid syntax of references / tag', }, # Author: Csisc # Author: Xqt 'qqq': { 'noreferences-add-tag': u'Edit summary when the bot adds a missing codereferences //code tag to the references section and if needed the section itself.\n\nDo not translate codereferences //code.', +'noreferences-fix-tag': u'Edit summary when the bot corrects the syntax of a codereferences //code tag.\n\nDo not translate codereferences //code.', }, # Author: Csisc 'aeb': { @@ -100,8 +103,10 @@ 'da': { 'noreferences-add-tag': u'Robot: Tilføjer manglende references /-tag', }, +# Author: Xqt 'de': { 'noreferences-add-tag': u'Bot: Trage fehlendes references / nach', +'noreferences-fix-tag': u'Bot: Korrigiere Syntax des references /-Tags', }, # Author: Erdemaslancan 'diq': { diff --git a/noreferences/de.json b/noreferences/de.json index 00397f5..b5dcea8 100644 --- a/noreferences/de.json +++ b/noreferences/de.json @@ -1,4 +1,9 @@ { - @metadata: [], - noreferences-add-tag: Bot: Trage fehlendes references / nach + @metadata: { + authors: [ + Xqt + ] + }, + noreferences-add-tag: Bot: Trage fehlendes references / nach, + noreferences-fix-tag: Bot: Korrigiere Syntax des references /-Tags } diff --git a/noreferences/en.json b/noreferences/en.json index 6375688..b54c33a 100644 --- a/noreferences/en.json +++ b/noreferences/en.json @@ -1,4 +1,9 @@ { - @metadata: [], - noreferences-add-tag: Bot: Adding missing references / tag + @metadata: { + authors: [ + Xqt + ] + }, + noreferences-add-tag: Bot: Adding missing references / tag, + noreferences-fix-tag: Bot: Fix invalid syntax of references / tag } diff --git a/noreferences/qqq.json b/noreferences/qqq.json index 2c5939c..5b24307 100644 --- a/noreferences/qqq.json +++ b/noreferences/qqq.json @@ -4,5 +4,7 @@ Xqt ] }, - noreferences-add-tag: Edit summary when the bot adds a missing codereferences //code tag to the references section and if needed the section itself.\n\nDo not translate codereferences //code. + noreferences-add-tag: Edit summary when the bot adds a missing codereferences //code tag to the references section and if needed the section itself.\n\nDo not translate codereferences //code., + noreferences-fix-tag: Edit summary when the bot corrects the syntax of a codereferences //code tag.\n\nDo not translate codereferences //code. + } -- To view, visit https://gerrit.wikimedia.org/r/210652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia10f70985e9b4fb687467e7a7d906b36e202bbd8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Let bigbrother ignore empty lines and comments - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Tools: Let bigbrother ignore empty lines and comments .. Tools: Let bigbrother ignore empty lines and comments Bug: T94990 Change-Id: I5ba8725d691137f915ba240f6537b880e4a6a6ea --- M modules/toollabs/files/bigbrother 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/files/bigbrother b/modules/toollabs/files/bigbrother index b5f4417..b4ca696 100755 --- a/modules/toollabs/files/bigbrother +++ b/modules/toollabs/files/bigbrother @@ -78,7 +78,9 @@ $line++; my $expect; my $start; -if(m/^webservice(:?\s+-([a-z]+(?:-[a-z]+)*))?$/) { +if (m/^\s*(?:#.*)?$/) { # Ignore empty lines and comments. +next; +} elsif(m/^webservice(:?\s+-([a-z]+(?:-[a-z]+)*))?$/) { my $name = $2 // lighttpd; unless($username =~ m/^tools\.(.*)$/) { ulog $username, 'error', $rcfile:$line: unable to figure out webgrid name! (not possible); -- To view, visit https://gerrit.wikimedia.org/r/202363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ba8725d691137f915ba240f6537b880e4a6a6ea Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed Tagcloud to TagCloud - follow-up to a28d391 - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/210917 Change subject: Renamed Tagcloud to TagCloud - follow-up to a28d391 .. Renamed Tagcloud to TagCloud - follow-up to a28d391 Change-Id: Ibfa990f573efe38de0d7285560fcba337bd47022 --- M Cargo.php M CargoQueryDisplayer.php R formats/CargoTagCloudFormat.php 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/17/210917/1 diff --git a/Cargo.php b/Cargo.php index 213fc6a..80c11c9 100644 --- a/Cargo.php +++ b/Cargo.php @@ -114,7 +114,7 @@ $wgAutoloadClasses['CargoCategoryFormat'] = $dir . '/formats/CargoCategoryFormat.php'; $wgAutoloadClasses['CargoBarChartFormat'] = $dir . '/formats/CargoBarChartFormat.php'; $wgAutoloadClasses['CargoGalleryFormat'] = $dir . '/formats/CargoGalleryFormat.php'; -$wgAutoloadClasses['CargoTagcloudFormat'] = $dir . '/formats/CargoTagcloudFormat.php'; +$wgAutoloadClasses['CargoTagCloudFormat'] = $dir . '/formats/CargoTagCloudFormat.php'; $wgAutoloadClasses['CargoPageSchemas'] = $dir . '/CargoPageSchemas.php'; diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php index c5e8ac3..d3d094e 100644 --- a/CargoQueryDisplayer.php +++ b/CargoQueryDisplayer.php @@ -44,7 +44,7 @@ 'category' = 'CargoCategoryFormat', 'bar chart' = 'CargoBarChartFormat', 'gallery' = 'CargoGalleryFormat', - 'tag cloud' = 'CargoTagcloudFormat', + 'tag cloud' = 'CargoTagCloudFormat', ); return $formatClasses; } diff --git a/formats/CargoTagcloudFormat.php b/formats/CargoTagCloudFormat.php similarity index 89% rename from formats/CargoTagcloudFormat.php rename to formats/CargoTagCloudFormat.php index 8bab7aa..37d1f23 100644 --- a/formats/CargoTagcloudFormat.php +++ b/formats/CargoTagCloudFormat.php @@ -4,7 +4,7 @@ * @ingroup Cargo */ -class CargoTagcloudFormat extends CargoDisplayFormat { +class CargoTagCloudFormat extends CargoDisplayFormat { function allowedParameters() { return array( @@ -16,13 +16,13 @@ /** * -* @param array $valuesTagcloud Unused -* @param array $formattedValuesTagcloud +* @param array $valuesTagCloud Unused +* @param array $formattedValuesTagCloud * @param array $fieldDescriptions * @param array $displayParams * @return string HTML */ - function display( $valuesTagcloud, $formattedValuesTagcloud, $fieldDescriptions, $displayParams ) { + function display( $valuesTagCloud, $formattedValuesTagCloud, $fieldDescriptions, $displayParams ) { $this-mOutput-addModuleStyles( 'ext.cargo.main' ); @@ -40,7 +40,7 @@ $tags = array(); - foreach ( $formattedValuesTagcloud as $row ) { + foreach ( $formattedValuesTagCloud as $row ) { $tag = $row[$tagFieldName]; $count = $row[$countFieldName]; @@ -82,7 +82,7 @@ } $attrs = array ( - 'class' = 'cargoTagcloud', + 'class' = 'cargoTagCloud', 'align' = 'justify' ); -- To view, visit https://gerrit.wikimedia.org/r/210917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfa990f573efe38de0d7285560fcba337bd47022 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cxserver to f87913e - change (mediawiki...deploy)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210923 Change subject: Update cxserver to f87913e .. Update cxserver to f87913e Changes: * f87913e Add 'ast' in Apertium.languagenames.json Change-Id: I3ee1b84513869981761377d1e1695683ea15293b --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy refs/changes/23/210923/1 diff --git a/src b/src index 74149f8..f87913e 16 --- a/src +++ b/src -Subproject commit 74149f803bb9b710f9f7d4a81828d5ca96374637 +Subproject commit f87913ee0ad7270ced89c22b213ede11b33deac9 -- To view, visit https://gerrit.wikimedia.org/r/210923 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ee1b84513869981761377d1e1695683ea15293b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix completely broken SSH host key collection - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/210926 Change subject: Fix completely broken SSH host key collection .. Fix completely broken SSH host key collection SSH host key collection basically exhibits the Naginator problem: it's extremely slow, due to needing to parse the whole file N times, and hence we were only supposed to collect on every run on bastions and on the rest of the fleet using the position of the moon. Supposed because: - This seems to be only enabled on every run for tin and bast1001, not other bastions. - Does not run at all on *any* host (and thus the potm logic is useless). Many hosts have their ssh_known_hosts with a Oct 18, 2013 mtime, which is 36c7f7d90c551755fee90234ad1c4abf8e32cb4e got merged. This patch adds an sshknowngen, copied over from naggen2 and modified extensively. It then replaces the ssh_known_hosts generation with a File resource and a generate() statement. Finally, it (re-)enables it for every host on the fleet, unconditionally (no potm, should be fast enough by now). A diff between bast1001's ssh_known_hosts and sshknowngen's output showed no functional differences and the current logic is quite broken already, so this should be safe. Change-Id: Ieaede0c9356c46661ddb3c236da4c5f0c3ce350a --- M manifests/site.pp A modules/puppetmaster/files/sshknowngen A modules/puppetmaster/manifests/generators.pp D modules/puppetmaster/manifests/naggen2.pp M modules/puppetmaster/manifests/scripts.pp M modules/ssh/manifests/client.pp M modules/ssh/manifests/hostkeys-collect.pp 7 files changed, 156 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/210926/1 diff --git a/manifests/site.pp b/manifests/site.pp index c1eb5bb..1e9b948 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -246,7 +246,6 @@ include standard include subversion::client include dsh -include ssh::hostkeys-collect class { 'nfs::netapp::home': mountpoint = '/srv/home_pmtpa', mount_site = 'pmtpa', @@ -2356,7 +2355,6 @@ include role::deployment::server include mysql include role::labsdb::manager -include ssh::hostkeys-collect include role::releases::upload interface::add_ip6_mapped { 'main': diff --git a/modules/puppetmaster/files/sshknowngen b/modules/puppetmaster/files/sshknowngen new file mode 100755 index 000..915f0dc --- /dev/null +++ b/modules/puppetmaster/files/sshknowngen @@ -0,0 +1,115 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +import os +import sys +# python 3 compatibility +try: +import ConfigParser as configparser +except ImportError: +import configparser + +import sqlalchemy +from collections import defaultdict +import argparse +import logging +from logging.handlers import SysLogHandler + + +class SshKnownHostsGen(object): +query = +SELECT resources.title as title, + GROUP_CONCAT(CONCAT(param_names.name, \t, param_values.value) + SEPARATOR \n) AS service_content +FROM param_values + JOIN param_names ON param_names.id = param_values.param_name_id + JOIN resources ON param_values.resource_id = resources.id +WHERE restype = 'Sshkey' +GROUP BY resources.id ORDER BY resources.title ASC + +def load_config(self, configfile): +self.config = configparser.SafeConfigParser() +self.config.read(configfile) +self.dsn = {}://{}:{}@{}:3306/puppet.format( +self.config.get('master', 'dbadapter'), +self.config.get('master', 'dbuser'), +self.config.get('master', 'dbpassword'), +self.config.get('master', 'dbserver') +) + +def __init__(self, configfile, debug): +self.log = logging.getLogger('sshknowngen') +self.log.debug('Loading configfile %s', configfile) +self.load_config(configfile) +self.db_engine = sqlalchemy.create_engine( +self.dsn, +echo=debug +) + +def _query(self): +connection = self.db_engine.connect() +connection.execute('set group_concat_max_len = @@max_allowed_packet') +res = connection.execute(self.query) +connection.close() +return res + +def render(self): +try: +for entity in self._query(): +self.log.debug('Working on resource %s', entity['title']) +attrs = defaultdict(list) +for restuple in entity['service_content'].split(\n): +(k, v) = restuple.split(\t) +attrs[k].append(v) + +if attrs['ensure'][0] != 'present': +continue + +hostname = entity['title'] +aliases = [ +a +for a in attrs['host_aliases'] +if not a.startswith('---') +] +host_part =
[MediaWiki-commits] [Gerrit] Hygiene: Move editor to resources - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Move editor to resources .. Hygiene: Move editor to resources Bug: T98838 Change-Id: I595564157d5e988591be9ef194847724d6d4f807 --- M includes/Resources.php R resources/mobile.abusefilter/AbuseFilterOverlay.hogan R resources/mobile.abusefilter/AbuseFilterOverlay.js R resources/mobile.abusefilter/AbuseFilterPanel.hogan R resources/mobile.abusefilter/AbuseFilterPanel.js R resources/mobile.editor.api/EditorApi.js R resources/mobile.editor.overlay.codemirror/EditorOverlayCodeMirror.js R resources/mobile.editor.overlay/EditorOverlay.js R resources/mobile.editor.overlay/content.hogan R resources/mobile.editor.ve/VisualEditorOverlay.js R resources/mobile.editor.ve/VisualEditorOverlay.less R resources/mobile.editor.ve/contentVE.hogan R resources/mobile.editor/init.js R tests/qunit/mobile.editor.api/test_EditorApi.js R tests/qunit/mobile.editor.overlay/test_EditorOverlay.js 15 files changed, 12 insertions(+), 12 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 17ca1fd..7c7c82f 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -513,7 +513,7 @@ 'mobile-frontend-editor-edit', ), 'scripts' = array( - 'javascripts/modules/editor/init.js', + 'resources/mobile.editor/init.js', ), ), @@ -523,12 +523,12 @@ 'mobile.startup', ), 'templates' = array( - 'Overlay.hogan' = 'templates/modules/editor/AbuseFilterOverlay.hogan', - 'Panel.hogan' = 'templates/modules/editor/AbuseFilterPanel.hogan', + 'Overlay.hogan' = 'resources/mobile.abusefilter/AbuseFilterOverlay.hogan', + 'Panel.hogan' = 'resources/mobile.abusefilter/AbuseFilterPanel.hogan', ), 'scripts' = array( - 'javascripts/modules/editor/AbuseFilterOverlay.js', - 'javascripts/modules/editor/AbuseFilterPanel.js', + 'resources/mobile.abusefilter/AbuseFilterOverlay.js', + 'resources/mobile.abusefilter/AbuseFilterPanel.js', ), 'messages' = array( // AbuseFilterOverlay @@ -547,7 +547,7 @@ 'mobile.abusefilter', ), 'scripts' = array( - 'javascripts/modules/editor/EditorApi.js', + 'resources/mobile.editor.api/EditorApi.js', ), ), @@ -617,10 +617,10 @@ 'mobile.microAutoSize', ), 'scripts' = array( - 'javascripts/modules/editor/EditorOverlay.js', + 'resources/mobile.editor.overlay/EditorOverlay.js', ), 'templates' = array( - 'content.hogan' = 'templates/modules/editor/content.hogan', + 'content.hogan' = 'resources/mobile.editor.overlay/content.hogan', ), 'messages' = array( 'mobile-frontend-editor-viewing-source-page', @@ -1530,13 +1530,13 @@ 'mobile.overlays', ), 'styles' = array( - 'less/modules/editor/VisualEditorOverlay.less', + 'resources/mobile.editor.ve/VisualEditorOverlay.less', ), 'scripts' = array( - 'javascripts/modules/editor/VisualEditorOverlay.js', + 'resources/mobile.editor.ve/VisualEditorOverlay.js', ), 'templates' = array( - 'contentVE.hogan' = 'templates/modules/editor/contentVE.hogan', + 'contentVE.hogan' = 'resources/mobile.editor.ve/contentVE.hogan', ), 'messages' = array( 'mobile-frontend-page-edit-summary', @@ -1558,7 +1558,7 @@ 'ext.CodeMirror.lib', ), 'scripts' = array( - 'javascripts/modules/editor/EditorOverlayCodeMirror.js', + 'resources/mobile.editor.overlay.codemirror/EditorOverlayCodeMirror.js', ), ), ); diff --git a/templates/modules/editor/AbuseFilterOverlay.hogan b/resources/mobile.abusefilter/AbuseFilterOverlay.hogan similarity index 100% rename from templates/modules/editor/AbuseFilterOverlay.hogan rename to resources/mobile.abusefilter/AbuseFilterOverlay.hogan diff --git a/javascripts/modules/editor/AbuseFilterOverlay.js
[MediaWiki-commits] [Gerrit] tools: make seperate /tmp hiera-configurable - change (operations/puppet)
Merlijn van Deen has uploaded a new change for review. https://gerrit.wikimedia.org/r/210918 Change subject: tools: make seperate /tmp hiera-configurable .. tools: make seperate /tmp hiera-configurable This enables us to re-enable puppet on specialty exec hosts without a) requiring them to be m1.large, and b) requiring a restart + manual fix of /tmp Bug: T99069 Bug: T97445 Change-Id: I1e55facacd9082ab57baaa1b91b60061c7b58244 --- A hieradata/labs/tools/tools-exec-catscan.yaml A hieradata/labs/tools/tools-exec-cyberbot.yaml A hieradata/labs/tools/tools-exec-gift.yaml A hieradata/labs/tools/tools-exec-wmt.yaml M modules/toollabs/manifests/node/compute/general.pp 5 files changed, 20 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/210918/1 diff --git a/hieradata/labs/tools/tools-exec-catscan.yaml b/hieradata/labs/tools/tools-exec-catscan.yaml new file mode 100644 index 000..4d717ab --- /dev/null +++ b/hieradata/labs/tools/tools-exec-catscan.yaml @@ -0,0 +1 @@ +toollabs::node::compute::general::separate_tmp: false diff --git a/hieradata/labs/tools/tools-exec-cyberbot.yaml b/hieradata/labs/tools/tools-exec-cyberbot.yaml new file mode 100644 index 000..4d717ab --- /dev/null +++ b/hieradata/labs/tools/tools-exec-cyberbot.yaml @@ -0,0 +1 @@ +toollabs::node::compute::general::separate_tmp: false diff --git a/hieradata/labs/tools/tools-exec-gift.yaml b/hieradata/labs/tools/tools-exec-gift.yaml new file mode 100644 index 000..4d717ab --- /dev/null +++ b/hieradata/labs/tools/tools-exec-gift.yaml @@ -0,0 +1 @@ +toollabs::node::compute::general::separate_tmp: false diff --git a/hieradata/labs/tools/tools-exec-wmt.yaml b/hieradata/labs/tools/tools-exec-wmt.yaml new file mode 100644 index 000..4d717ab --- /dev/null +++ b/hieradata/labs/tools/tools-exec-wmt.yaml @@ -0,0 +1 @@ +toollabs::node::compute::general::separate_tmp: false diff --git a/modules/toollabs/manifests/node/compute/general.pp b/modules/toollabs/manifests/node/compute/general.pp index 922ae76..22c15c8 100644 --- a/modules/toollabs/manifests/node/compute/general.pp +++ b/modules/toollabs/manifests/node/compute/general.pp @@ -10,7 +10,9 @@ # # Sample Usage: # -class toollabs::node::compute::general { +class toollabs::node::compute::general ( +$separate_tmp = true, +){ system::role { 'toollabs::node::compute::general': description = 'General computation node' } @@ -28,16 +30,21 @@ source = 'puppet:///modules/toollabs/jobkill', } -# 16G /tmp for everyone! Note that we need new nodes to be at least a large (80G total space) -labs_lvm::volume { 'separate-tmp': -size = '16GB', -mountat = '/tmp', -mountmode = '1777', -options = 'nosuid,noexec,nodev,rw', +if $separate_tmp { +# add seperate 16G /tmp! Note that this needs nodes to be at least +# m1.large (80G total space). Old smaller nodes can keep their +# /tmp on / by providing +# toollabs::node::compute::general::separate_tmp: false +# via hiera. +labs_lvm::volume { 'separate-tmp': +size = '16GB', +mountat = '/tmp', +mountmode = '1777', +options = 'nosuid,noexec,nodev,rw', +} } - + labs_lvm::swap { 'big': size = inline_template('%= @memorysize_mb.to_i * 3 %MB'), } - } -- To view, visit https://gerrit.wikimedia.org/r/210918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e55facacd9082ab57baaa1b91b60061c7b58244 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Build for both PHP 5.5 and PHP and HHVM - change (mediawiki...luasandbox)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/210920 Change subject: Build for both PHP 5.5 and PHP and HHVM .. Build for both PHP 5.5 and PHP and HHVM Allow on build time detection of HHVM existence, allowing the luasandbox to be built for non HHVM-enabled distributions as well. Achieve this by detecting HHVM via the presence of hphpize binary and define the already split split in this patch makefile's targets accordingly. In order to achieve Debian package build dependency satisfaction, use boolean algebra rules to break down the: PHP5.3 or (HHVM - and dependenies - and PHP5.5) expression to the equivalent ones. The | (or) operator takes precedence when calculating dependencies so this installs either PHP5 versions less than 5.5 (precise has 5.3) or PHP5 5.5 and HHVM and dependencies. Bug: T88798 Change-Id: I445fc75f66c470da5dbe32fd8a4f8c2c7606bada --- M debian/control M debian/rules 2 files changed, 48 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox refs/changes/20/210920/1 diff --git a/debian/control b/debian/control index 7b1760c..7c3b82a 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,14 @@ Build-Depends: debhelper (= 9), liblua5.1-0-dev, pkg-config, - php5-dev, - hhvm-dev, - cmake, - libboost-dev, - libgoogle-glog-dev, - libdouble-conversion-dev, - libjemalloc-dev, - libtbb-dev + php5-dev ( 5.5) | php5-dev (= 5.5), + php5-dev ( 5.5) | hhvm-dev, + php5-dev ( 5.5) | cmake, + php5-dev ( 5.5) | libboost-dev, + php5-dev ( 5.5) | libgoogle-glog-dev, + php5-dev ( 5.5) | libdouble-conversion-dev, + php5-dev ( 5.5) | libjemalloc-dev, + php5-dev ( 5.5) | libtbb-dev Standards-Version: 3.9.5 Homepage: https://www.mediawiki.org/wiki/Extension:Scribunto diff --git a/debian/rules b/debian/rules index 303bffb..b99b488 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,34 @@ #!/usr/bin/make -f +HHVM=$(shell test -f /usr/bin/hphpize echo HHVM) + +ifeq ($(HHVM), HHVM) + configure_targets = php_configure hhvm_configure + build_targets = php_build hhvm_build + install_targets = php_install hhvm_install + gencontrol_targets = php_gencontrol hhvm_gencontrol +else + configure_targets = php_configure + build_targets = php_build + install_targets = php_install + gencontrol_targets = php_gencontrol hhvm_gencontrol +endif + %: dh $@ -override_dh_auto_configure: - mkdir -p debian/build-php debian/build-hhvm +override_dh_auto_configure: $(configure_targets) + +php_configure: + mkdir -p debian/build-php ## PHP tar -cf - --exclude=debian/build* --exclude=.pc . \ | tar -xf - -C debian/build-php cd debian/build-php /usr/bin/phpize dh_auto_configure + +hhvm_configure: ## HHVM + mkdir -p debian/build-hhvm tar -cf - --exclude=debian/build* --exclude=.pc . \ | tar -xf - -C debian/build-hhvm cd debian/build-hhvm /usr/bin/hphpize @@ -22,24 +41,36 @@ -DLUA_USE_CPP=1 cd debian/build-hhvm dh_auto_configure -override_dh_auto_build: +override_dh_auto_build: $(build_targets) + +php_build: cd debian/build-php dh_auto_build + +hhvm_build: cd debian/build-hhvm dh_auto_build override_dh_auto_test: -override_dh_auto_install: +override_dh_auto_install: $(install_targets) + +php_install: INSTALL_ROOT=$(CURDIR)/debian/php-luasandbox make -C debian/build-php install + +hhvm_install: DESTDIR=$(CURDIR)/debian/hhvm-luasandbox make -C debian/build-hhvm install -override_dh_gencontrol: - echo php:Depends=phpapi-$(shell php-config5 --phpapi) debian/php-luasandbox.substvars - # HHVM does *not* ensure binary compatibility - echo hhvm:ApiVersion=hhvm-api-$(shell /usr/bin/hhvm --version | sed -ne 's/^Extension API:\ //p') debian/hhvm-luasandbox.substvars +override_dh_gencontrol: $(gencontrol_targets) dh_gencontrol +php_gencontrol: + echo php:Depends=phpapi-$(shell php-config5 --phpapi) debian/php-luasandbox.substvars + +hhvm_gencontrol: + # HHVM does *not* ensure binary compatibility + echo hhvm:ApiVersion=hhvm-api-$(shell /usr/bin/hhvm --version | sed -ne 's/^Extension API:\ //p') debian/hhvm-luasandbox.substvars + override_dh_auto_clean: - -rm -r debian/build* + rm -rf debian/build* dh_auto_clean .PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_gencontrol -- To view, visit https://gerrit.wikimedia.org/r/210920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I445fc75f66c470da5dbe32fd8a4f8c2c7606bada
[MediaWiki-commits] [Gerrit] Add *.bl.uk to wgCopyUploadsDomains - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/210922 Change subject: Add *.bl.uk to wgCopyUploadsDomains .. Add *.bl.uk to wgCopyUploadsDomains This domain serves the British Library media files and is used in various GLAM workshops. Change-Id: If64eb227274d59dc5f7bc82c809baa25c63a07a4 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/22/210922/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f38ca35..b4f8dcd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11358,6 +11358,7 @@ 'medialib.naturalis.nl',// Naturalis Biodiversity Center - T97995 'www.jacar.go.jp', // Japan Center for Asian Historical Records - T98733 '*.sl.nsw.gov.au', // New South Wales State Library - T98744 + '*.bl.uk', // British Library - T98734 ), ), -- To view, visit https://gerrit.wikimedia.org/r/210922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If64eb227274d59dc5f7bc82c809baa25c63a07a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update html-metadata to 0.1.3 - change (mediawiki...citoid)
Mvolz has uploaded a new change for review. https://gerrit.wikimedia.org/r/210929 Change subject: Update html-metadata to 0.1.3 .. Update html-metadata to 0.1.3 Update html-metadata to 0.1.3 as prior version provided corrupted data. Change-Id: I171e82a45c4c85794fdda035322c2f76b1578a3d --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid refs/changes/29/210929/1 diff --git a/package.json b/package.json index 359011b..9727bf7 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ compression: 1.4.3, content-type: 1.0.1, express: 4.12.3, -html-metadata: 0.1.1, +html-metadata: 0.1.3, iconv-lite: 0.4.8, js-yaml: 3.2.7, node-uuid: 1.4.3, -- To view, visit https://gerrit.wikimedia.org/r/210929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I171e82a45c4c85794fdda035322c2f76b1578a3d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/citoid Gerrit-Branch: master Gerrit-Owner: Mvolz mv...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix crash Bug T99081 when removing an item from history. - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review. https://gerrit.wikimedia.org/r/210931 Change subject: Fix crash Bug T99081 when removing an item from history. .. Fix crash Bug T99081 when removing an item from history. Crash was caused by querying a dictionary for a nil key (nil article title). Now checking that the title is non-nil before attempting to remove the history item. Also fixed the corollary method for adding a history item. Change-Id: I4a481780f8937f48eaae3935fde881e2f5522cd1 --- M MediaWikiKit/MediaWikiKit/MWKHistoryList.m 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/31/210931/1 diff --git a/MediaWikiKit/MediaWikiKit/MWKHistoryList.m b/MediaWikiKit/MediaWikiKit/MWKHistoryList.m index 7ac6d68..c2d1952 100644 --- a/MediaWikiKit/MediaWikiKit/MWKHistoryList.m +++ b/MediaWikiKit/MediaWikiKit/MWKHistoryList.m @@ -58,6 +58,9 @@ #pragma mark - update methods - (void)addEntry:(MWKHistoryEntry*)entry { +if (entry.title == nil) { +return; +} MWKHistoryEntry* oldEntry = [self entryForTitle:entry.title]; if (oldEntry) { // Replace the old entry and move to top @@ -69,6 +72,9 @@ } - (void)removeEntry:(MWKHistoryEntry*)entry { +if (entry.title == nil) { +return; +} [entries removeObject:entry]; [entriesByTitle removeObjectForKey:entry.title]; _dirty = YES; -- To view, visit https://gerrit.wikimedia.org/r/210931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a481780f8937f48eaae3935fde881e2f5522cd1 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Fjalapeno cfl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Open external links on voteWiki in new tab/window - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Open external links on voteWiki in new tab/window .. Open external links on voteWiki in new tab/window To help compensate for complaints about SecurePoll session issues when user clicks links and keeps coming back via back button. Bug: T98013 Change-Id: Icb835d50dca95c1465199f0f27d2ce8d1089852a --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f38ca35..808e4f6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15459,6 +15459,14 @@ 'default' = '//bits.wikimedia.org/beacon/media', ), +// open external/specific links on voteWiki in new tab or window +// Partially for T98013 and in general help SecurePoll fail less often +'wgExternalLinkTarget' = array( + 'default' = false, + 'votewiki' = '_blank', +), + + ); -- To view, visit https://gerrit.wikimedia.org/r/210849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb835d50dca95c1465199f0f27d2ce8d1089852a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jalexander jalexan...@wikimedia.org Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Translate to a6f0a63 - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/210919 Change subject: Update Translate to a6f0a63 .. Update Translate to a6f0a63 Change-Id: Ic6c87abad9f21f939c9ca9fbd98f2659a9797f5d --- M extensions/Translate 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/210919/1 diff --git a/extensions/Translate b/extensions/Translate index bbfec6f..a6f0a63 16 --- a/extensions/Translate +++ b/extensions/Translate -Subproject commit bbfec6fd0a3484807d8edf4a0d12bb8e7e028f98 +Subproject commit a6f0a6312ddedd636fbf2c820f59e9b31086075d -- To view, visit https://gerrit.wikimedia.org/r/210919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6c87abad9f21f939c9ca9fbd98f2659a9797f5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits