[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Removed extensions from default config #2
Robert Vogel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386592 ) Change subject: Removed extensions from default config #2 .. Removed extensions from default config #2 Removed extensions that now have their own repositories Change-Id: I7c13edb76448c962ac0ce3ea8bd4e07d948ed7d5 --- M BlueSpiceExtensions.default.php 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/BlueSpiceExtensions.default.php b/BlueSpiceExtensions.default.php index c6b62ee..dd69508 100644 --- a/BlueSpiceExtensions.default.php +++ b/BlueSpiceExtensions.default.php @@ -8,10 +8,6 @@ require_once( __DIR__."/StateBar/StateBar.setup.php" ); require_once( __DIR__."/RSSFeeder/RSSFeeder.setup.php" ); require_once( __DIR__."/AboutBlueSpice/AboutBlueSpice.setup.php" ); -require_once( __DIR__."/Blog/Blog.setup.php" ); -require_once( __DIR__."/Checklist/Checklist.setup.php" ); -require_once( __DIR__."/ContextMenu/ContextMenu.setup.php" ); -require_once( __DIR__."/CountThings/CountThings.setup.php" ); require_once( __DIR__."/CSyntaxHighlight/CSyntaxHighlight.setup.php" ); require_once( __DIR__."/Dashboards/Dashboards.setup.php" ); require_once( __DIR__."/Emoticons/Emoticons.setup.php" ); -- To view, visit https://gerrit.wikimedia.org/r/386592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c13edb76448c962ac0ce3ea8bd4e07d948ed7d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert VogelGerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ShortUrl and WikiLove Extension on pa.wiki
Jayprakash12345 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386779 ) Change subject: Enable ShortUrl and WikiLove Extension on pa.wiki .. Enable ShortUrl and WikiLove Extension on pa.wiki Change-Id: I2409a56c433561093b2dc5ff31bd247017875f3c --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/79/386779/2 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a263862..b6dcbe4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15336,6 +15336,7 @@ 'officewiki' => true, 'outreachwiki' => true, // T106264 'orwiki' => true, // T33172 + 'pawiki' => true, // T178919 'ptwiki' => true, // T33178 'sewikimedia' => true, // T32491 'siwiki' => true, // T35485 @@ -17034,6 +17035,7 @@ 'orwiki' => true, 'orwikisource' => true, // T124429 'orwiktionary' => true, // T103644 + 'pawiki' => true, // T178919 'sawiki' => true, // T94660 'sawikibooks' => true, // T94660 'sawikiquote' => true, // T94660 -- To view, visit https://gerrit.wikimedia.org/r/386779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2409a56c433561093b2dc5ff31bd247017875f3c Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jayprakash12345 <0freerunn...@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] mediawiki...BlueSpiceSubPageTree[master]: Add MessagesDirs to extension.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386678 ) Change subject: Add MessagesDirs to extension.json .. Add MessagesDirs to extension.json Also add banana checker and jsonlint for valid i18n files Change-Id: I05b4a78c5043a7ff78634c255f9f43d79aab26fd --- A Gruntfile.js M extension.json A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/extension.json b/extension.json index 1d9b578..1b29c5b 100644 --- a/extension.json +++ b/extension.json @@ -8,6 +8,11 @@ "AutoloadClasses": { "BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php" }, + "MessagesDirs": { + "BlueSpiceSubPageTree": [ + "i18n" + ] + }, "ResourceModules": { "ext.bluespice.subpagetree": { "scripts": [ diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/386678 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05b4a78c5043a7ff78634c255f9f43d79aab26fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Removed "ExtendedEditbar" due to end of development
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386589 ) Change subject: Removed "ExtendedEditbar" due to end of development .. Removed "ExtendedEditbar" due to end of development In BlueSpice 3.0 WMF VisualEditor and WikiEditor extensions will be used. Change-Id: Ia8af664b6c0567ce4e2a96b9840126197d60af2c --- D ExtendedEditBar/ExtendedEditBar.class.php D ExtendedEditBar/ExtendedEditBar.setup.php D ExtendedEditBar/extension.json D ExtendedEditBar/i18n/ais.json D ExtendedEditBar/i18n/ast.json D ExtendedEditBar/i18n/ba.json D ExtendedEditBar/i18n/bn.json D ExtendedEditBar/i18n/br.json D ExtendedEditBar/i18n/ca.json D ExtendedEditBar/i18n/ce.json D ExtendedEditBar/i18n/ckb.json D ExtendedEditBar/i18n/de.json D ExtendedEditBar/i18n/diq.json D ExtendedEditBar/i18n/en.json D ExtendedEditBar/i18n/es.json D ExtendedEditBar/i18n/eu.json D ExtendedEditBar/i18n/fa.json D ExtendedEditBar/i18n/fr.json D ExtendedEditBar/i18n/fy.json D ExtendedEditBar/i18n/gl.json D ExtendedEditBar/i18n/he.json D ExtendedEditBar/i18n/hu.json D ExtendedEditBar/i18n/ia.json D ExtendedEditBar/i18n/id.json D ExtendedEditBar/i18n/it.json D ExtendedEditBar/i18n/ja.json D ExtendedEditBar/i18n/ko.json D ExtendedEditBar/i18n/ksh.json D ExtendedEditBar/i18n/ku-latn.json D ExtendedEditBar/i18n/lb.json D ExtendedEditBar/i18n/lt.json D ExtendedEditBar/i18n/lv.json D ExtendedEditBar/i18n/mk.json D ExtendedEditBar/i18n/mwl.json D ExtendedEditBar/i18n/nan.json D ExtendedEditBar/i18n/nds-nl.json D ExtendedEditBar/i18n/nl.json D ExtendedEditBar/i18n/oc.json D ExtendedEditBar/i18n/pl.json D ExtendedEditBar/i18n/ps.json D ExtendedEditBar/i18n/pt-br.json D ExtendedEditBar/i18n/pt.json D ExtendedEditBar/i18n/qqq.json D ExtendedEditBar/i18n/roa-tara.json D ExtendedEditBar/i18n/ru.json D ExtendedEditBar/i18n/sd.json D ExtendedEditBar/i18n/sl.json D ExtendedEditBar/i18n/sv.json D ExtendedEditBar/i18n/tcy.json D ExtendedEditBar/i18n/tr.json D ExtendedEditBar/i18n/tt-cyrl.json D ExtendedEditBar/i18n/uk.json D ExtendedEditBar/i18n/yi.json D ExtendedEditBar/i18n/zh-hans.json D ExtendedEditBar/i18n/zh-hant.json D ExtendedEditBar/resources/bluespice.extendedEditBar.css D ExtendedEditBar/resources/bluespice.extendedEditBar.js D ExtendedEditBar/resources/images/button_break.png D ExtendedEditBar/resources/images/button_external-link.png D ExtendedEditBar/resources/images/button_filelink.png D ExtendedEditBar/resources/images/button_format-bold.png D ExtendedEditBar/resources/images/button_format-h2.png D ExtendedEditBar/resources/images/button_format-italic.png D ExtendedEditBar/resources/images/button_format-struck.png D ExtendedEditBar/resources/images/button_gallery.png D ExtendedEditBar/resources/images/button_hidden-comment.png D ExtendedEditBar/resources/images/button_internal-link.png D ExtendedEditBar/resources/images/button_medialink.png D ExtendedEditBar/resources/images/button_redirect.png D ExtendedEditBar/resources/images/button_signatur.png D ExtendedEditBar/resources/images/button_table.png 71 files changed, 0 insertions(+), 1,665 deletions(-) Approvals: Robert Vogel: Looks good to me, approved Raimond Spekking: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/ExtendedEditBar/ExtendedEditBar.class.php b/ExtendedEditBar/ExtendedEditBar.class.php deleted file mode 100644 index bc7cb95..000 --- a/ExtendedEditBar/ExtendedEditBar.class.php +++ /dev/null @@ -1,299 +0,0 @@ -http://www.bluespice.com - * - * @author Markus Glaser- * @author MediaWiki Extension - * @version2.23.1 - * @packageBlueSpice_Extensions - * @subpackage ExtendedEditBar - * @copyright Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved. - * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or later - * @filesource - */ - -/** - * Base class for ExtendedEditBar extension - * @package BlueSpice_Extensions - * @subpackage ExtendedEditBar - */ -class ExtendedEditBar extends BsExtensionMW { - /** -* Initialization of ExtendedEditBar extension -*/ - protected function initExt() { - wfProfileIn( 'BS::'.__METHOD__ ); - $this->setHook('EditPageBeforeEditToolbar'); - wfProfileOut( 'BS::'.__METHOD__ ); - } - - /** -* -* @global type $wgStylePath -* @global type $wgContLang -* @global type $wgLang -* @global OutputPage $wgOut -* @global type $wgUseTeX -* @global type $wgEnableUploads -* @global type $wgForeignFileRepos -* @param string $toolbar -* @return boolean -*/ - public function onEditPageBeforeEditToolbar( &$toolbar ) { - // Disable editbar when there is no toolbar and on certain actions. This - // is especially needed for compatibility with Extension:LiquidThreads.
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1060"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386778 ) Change subject: Revert "db-eqiad.php: Depool db1060" .. Revert "db-eqiad.php: Depool db1060" This reverts commit 84fe4b2bfc6cdb6b72ae3889654beebdaedab21f. Change-Id: Icb1abe780c6be3506892944c37967dd7130b02f0 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index ca28006..8651ae9 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -115,7 +115,7 @@ 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump - # 'db1060' => 1, # C2 2.8TB 96GB, api #master for sanitarium #T153743 #T174509 + 'db1060' => 1, # C2 2.8TB 96GB, api #master for sanitarium #T153743 'db1074' => 300, # A2 3.6TB 512GB, api 'db1076' => 500, # B1 3.6TB 512GB 'db1090' => 500, # C3 3.6TB 512GB @@ -285,7 +285,7 @@ 'db1021' => 1, ], 'api' => [ - # 'db1060' => 2, + 'db1060' => 2, 'db1074' => 1, ], 'watchlist' => [ -- To view, visit https://gerrit.wikimedia.org/r/386778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb1abe780c6be3506892944c37967dd7130b02f0 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarosteguiGerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1060"
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/386778 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1060" .. Revert "db-eqiad.php: Depool db1060" This reverts commit 84fe4b2bfc6cdb6b72ae3889654beebdaedab21f. Change-Id: Icb1abe780c6be3506892944c37967dd7130b02f0 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/78/386778/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a29d769..f58388f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -115,7 +115,7 @@ 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump - # 'db1060' => 1, # C2 2.8TB 96GB, api #master for sanitarium #T153743 #T174509 + 'db1060' => 1, # C2 2.8TB 96GB, api #master for sanitarium #T153743 'db1074' => 300, # A2 3.6TB 512GB, api 'db1076' => 500, # B1 3.6TB 512GB 'db1090' => 1, # C3 3.6TB 512GB # temporary watchlist and rc @@ -285,7 +285,7 @@ 'db1021' => 1, ], 'api' => [ - # 'db1060' => 2, + 'db1060' => 2, 'db1074' => 1, ], 'watchlist' => [ -- To view, visit https://gerrit.wikimedia.org/r/386778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb1abe780c6be3506892944c37967dd7130b02f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarosteguiGerrit-Reviewer: Jcrespo Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: releases/upload: set correct upload server as active_server
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386775 ) Change subject: releases/upload: set correct upload server as active_server .. releases/upload: set correct upload server as active_server The upload server used by debupload for uploading releases should not be hardcoded as "bromine.eqiad.wmnet". That server is not used anymore. It has been replaced by releases1001 and releases2001. Set the upload server to the actual "active_server" set in Hiera so that releases can failover from releases1001 to releases2001 when needed. Add class paramater needed for this, use same Hiera lookup as in releases::mediawiki profile. Bug: T179134 Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25 --- M modules/profile/manifests/releases/upload.pp M modules/releases/manifests/reprepro/upload.pp 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/profile/manifests/releases/upload.pp b/modules/profile/manifests/releases/upload.pp index 30df8e3..2fb07c0 100644 --- a/modules/profile/manifests/releases/upload.pp +++ b/modules/profile/manifests/releases/upload.pp @@ -1,3 +1,7 @@ -class profile::releases::upload { -class { '::releases::reprepro::upload': } +class profile::releases::upload( +$active_server = hiera('releases_server'), +){ +class { '::releases::reprepro::upload': +upload_host => $active_server, +} } diff --git a/modules/releases/manifests/reprepro/upload.pp b/modules/releases/manifests/reprepro/upload.pp index a72811b..cc67f30 100644 --- a/modules/releases/manifests/reprepro/upload.pp +++ b/modules/releases/manifests/reprepro/upload.pp @@ -6,7 +6,7 @@ $group= 'releases', $sudo_user= '%wikidev', $homedir = '/var/lib/releases', -$upload_host = 'bromine.eqiad.wmnet', +$upload_host = undef, ) { group { 'releases': ensure => present, -- To view, visit https://gerrit.wikimedia.org/r/386775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change the af.wiktionary logo
Jayprakash12345 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386777 ) Change subject: Change the af.wiktionary logo .. Change the af.wiktionary logo Bug: T178824 Change-Id: I242ef15a85ab4685ba02bf5fe5560af387246de2 --- A static/images/project-logos/afwiktionary-1.5x.png A static/images/project-logos/afwiktionary-2x.png M static/images/project-logos/afwiktionary.png M wmf-config/InitialiseSettings.php 4 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/77/386777/1 diff --git a/static/images/project-logos/afwiktionary-1.5x.png b/static/images/project-logos/afwiktionary-1.5x.png new file mode 100644 index 000..1ceca49 --- /dev/null +++ b/static/images/project-logos/afwiktionary-1.5x.png Binary files differ diff --git a/static/images/project-logos/afwiktionary-2x.png b/static/images/project-logos/afwiktionary-2x.png new file mode 100644 index 000..8307e8d --- /dev/null +++ b/static/images/project-logos/afwiktionary-2x.png Binary files differ diff --git a/static/images/project-logos/afwiktionary.png b/static/images/project-logos/afwiktionary.png index 6e99bbd..f3d1e94 100644 --- a/static/images/project-logos/afwiktionary.png +++ b/static/images/project-logos/afwiktionary.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a263862..578ff64 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -777,7 +777,7 @@ 'zh_yuewiki' => '/static/images/project-logos/zh_yuewiki.png', // Wiktionary - 'afwiktionary' => '/static/images/project-logos/afwiktionary.png', + 'afwiktionary' => '/static/images/project-logos/afwiktionary.png', // T178824 'amwiktionary' => '/static/images/project-logos/amwiktionary.png', // T45240 'anwiktionary' => '/static/images/project-logos/anwiktionary.png', 'angwiktionary' => '/static/images/project-logos/angwiktionary.png', @@ -1216,6 +1216,7 @@ 'acewiki' => [ '1.5x' => '/static/images/project-logos/acewiki-1.5x.png', '2x' => '/static/images/project-logos/acewiki-2x.png' ], // T150618 'adywiki' => [ '1.5x' => '/static/images/project-logos/adywiki-1.5x.png', '2x' => '/static/images/project-logos/adywiki-2x.png' ], // T150618 'afwiki' => [ '1.5x' => '/static/images/project-logos/afwiki-1.5x.png', '2x' => '/static/images/project-logos/afwiki-2x.png' ], // T150618 + 'afwiktionary' => [ '1.5x' => '/static/images/project-logos/afwiktionary-1.5x.png', '2x' => '/static/images/project-logos/afwiktionary-2x.png' ], // T178824 'akwiki' => [ '1.5x' => '/static/images/project-logos/akwiki-1.5x.png', '2x' => '/static/images/project-logos/akwiki-2x.png' ], // T150618 'alswiki' => [ '1.5x' => '/static/images/project-logos/alswiki-1.5x.png', '2x' => '/static/images/project-logos/alswiki-2x.png' ], // T150618 'amwiki' => [ '1.5x' => '/static/images/project-logos/amwiki-1.5x.png', '2x' => '/static/images/project-logos/amwiki-2x.png' ], // T150618 -- To view, visit https://gerrit.wikimedia.org/r/386777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I242ef15a85ab4685ba02bf5fe5560af387246de2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Move label prefixes from dm.ItemModel to ui.TagIt...
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386776 ) Change subject: RCFilters: Move label prefixes from dm.ItemModel to ui.TagItemWidget .. RCFilters: Move label prefixes from dm.ItemModel to ui.TagItemWidget Change-Id: I0d463b60ffaa7ab099cb46eeac94b709af325933 --- M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js 2 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/386776/1 diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js index cf26ab6..2ba8d54 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js @@ -80,30 +80,24 @@ }; /** -* Get a prefixed label +* Get the message key to use to wrap the label. This message takes the label as a parameter. * -* @param {boolean} inverted This item should be considered inverted -* @return {string} Prefixed label (HTML) +* @param {boolean} inverted Whether this item should be considered inverted +* @return {string|null} Message key, or null if no message */ - mw.rcfilters.dm.ItemModel.prototype.getPrefixedLabel = function ( inverted ) { - var escapedLabel = mw.html.escape( this.getLabel() ); + mw.rcfilters.dm.ItemModel.prototype.getLabelMessageKey = function ( inverted ) { if ( this.labelPrefixKey ) { if ( typeof this.labelPrefixKey === 'string' ) { - return mw.message( this.labelPrefixKey, escapedLabel ).parse(); - } else { - return mw.message( - this.labelPrefixKey[ - // Only use inverted-prefix if the item is selected - // Highlight-only an inverted item makes no sense - inverted && this.isSelected() ? - 'inverted' : 'default' - ], - escapedLabel - ).parse(); + return this.labelPrefixKey; } - } else { - return escapedLabel; + return this.labelPrefixKey[ + // Only use inverted-prefix if the item is selected + // Highlight-only an inverted item makes no sense + inverted && this.isSelected() ? + 'inverted' : 'default' + ]; } + return null; }; /** diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js index cc314ac..049364a 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js @@ -79,11 +79,17 @@ * Respond to model update event */ mw.rcfilters.ui.TagItemWidget.prototype.updateUiBasedOnState = function () { - this.setCurrentMuteState(); - // Update label if needed - this.setLabel( $( '' ).html( this.model.getPrefixedLabel( this.invertModel.isSelected() ) ).contents() ); + var labelMsg = this.model.getLabelMessageKey( this.invertModel.isSelected() ); + if ( labelMsg ) { + this.setLabel( $( '' ).html( + mw.message( labelMsg, mw.html.escape( this.model.getLabel() ) ).parse() + ).contents() ); + } else { + this.setLabel( this.model.getLabel() ); + } + this.setCurrentMuteState(); this.setHighlightColor(); }; -- To view, visit https://gerrit.wikimedia.org/r/386776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d463b60ffaa7ab099cb46eeac94b709af325933 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Catrope___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: releases/upload: set correct upload server as active_server
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386775 ) Change subject: releases/upload: set correct upload server as active_server .. releases/upload: set correct upload server as active_server The upload server used by debupload for uploading releases should not be hardcoded as "bromine.eqiad.wmnet". That server is not used anymore. It has been replaced by releases1001 and releases2001. Set the upload server to the actual "active_server" set in Hiera so that releases can failover from releases1001 to releases2001 when needed. Add class paramater needed for this, use same Hiera lookup as in releases::mediawiki profile. Bug: T179134 Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25 --- M modules/profile/manifests/releases/upload.pp M modules/releases/manifests/reprepro/upload.pp 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/386775/1 diff --git a/modules/profile/manifests/releases/upload.pp b/modules/profile/manifests/releases/upload.pp index 30df8e3..679c489 100644 --- a/modules/profile/manifests/releases/upload.pp +++ b/modules/profile/manifests/releases/upload.pp @@ -1,3 +1,7 @@ class profile::releases::upload { -class { '::releases::reprepro::upload': } +$active_server = hiera('releases_server'), +){ +class { '::releases::reprepro::upload': +upload_host => $active_server, +} } diff --git a/modules/releases/manifests/reprepro/upload.pp b/modules/releases/manifests/reprepro/upload.pp index a72811b..cc67f30 100644 --- a/modules/releases/manifests/reprepro/upload.pp +++ b/modules/releases/manifests/reprepro/upload.pp @@ -6,7 +6,7 @@ $group= 'releases', $sudo_user= '%wikidev', $homedir = '/var/lib/releases', -$upload_host = 'bromine.eqiad.wmnet', +$upload_host = undef, ) { group { 'releases': ensure => present, -- To view, visit https://gerrit.wikimedia.org/r/386775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: [WIP] Clean up UI and aggregations
Milimetric has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386774 ) Change subject: [WIP] Clean up UI and aggregations .. [WIP] Clean up UI and aggregations This cleans up a few things noticed by Erik in the linked task It also refactors the aggregation a bit and corrects some calculation mistakes. The main thing remaining is to decide what to show on the Dashboard because YoY numbers are not always going to match the widget graph visually. Bug: T178084 Change-Id: Id2bd700f9f72aea6ee56d68234426979d355e04d --- M src/components/BottomFooter.vue M src/components/dashboard/MetricWidget.vue M src/components/detail/GraphPanel.vue M src/lodash-custom-bundle.js M src/models/GraphModel.js A test/GraphModel.spec.js 6 files changed, 135 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 refs/changes/74/386774/1 diff --git a/src/components/BottomFooter.vue b/src/components/BottomFooter.vue index bb1c2d0..7cacd8f 100644 --- a/src/components/BottomFooter.vue +++ b/src/components/BottomFooter.vue @@ -1,17 +1,20 @@ - - -Find out more https://wikitech.wikimedia.org/wiki/Analytics/Wikistats2.0;>about Wikistats and the https://wikitech.wikimedia.org/wiki/Analytics#Datasets;>data that it uses + + +Find out more https://wikitech.wikimedia.org/wiki/Analytics/Wikistats2.0;>about Wikistats +and the https://wikitech.wikimedia.org/wiki/Analytics#Datasets;>data it uses - -Wikistats is written with Vue.js and Semantic UI. If you'd like to contribute, see our contributing guide or follow this link to report a bug + +Wikistats is written with Vue.js and Semantic UI. +See our contributing guide to help us build Wikistats. +Follow this link to report a bug - -Wikistats is designed by Aislinn Grigas. + +Designed by Aislinn Grigas. - -All data, charts, and other content is available under the https://creativecommons.org/publicdomain/zero/1.0/; target="_new">Creative Commons CC0 dedication. + +All data, charts, and other content is available under the https://creativecommons.org/publicdomain/zero/1.0/;>Creative Commons CC0 dedication. @@ -29,5 +32,6 @@ -a, a:visited { color: #777; } +a, a:visited { color: #888; } +.ui.centered { font-size: 1.1em; } diff --git a/src/components/dashboard/MetricWidget.vue b/src/components/dashboard/MetricWidget.vue index 2856ebc..4f025d2 100644 --- a/src/components/dashboard/MetricWidget.vue +++ b/src/components/dashboard/MetricWidget.vue @@ -34,7 +34,7 @@ -{{lastYearAggregation.total | kmb}} +{{lastYearAggregation | kmb}} @@ -131,15 +131,7 @@ return this.graphData[_.indexOf(this.graphData, this.lastMonth) - 12]; }, lastYearAggregation: function () { -if (this.metricData.additive) { -return { -total: _.sumBy(this.graphData.slice(_.indexOf(this.graphData, this.lastMonth) - 12), month => month.total) -}; -} else { -return { -total: _.sumBy(this.graphData.slice(_.indexOf(this.graphData, this.lastMonth) - 12), month => month.total) / 12 -}; -} +return this.graphModel.getAggregate(12); }, lastMonth: function () { return _.last(this.graphData); @@ -154,6 +146,8 @@ return ((diff / prev.total) * 100).toFixed(2); }, changeYoY: function () { +// TODO: We're showing more than the last year, but reporting YoY. This can be confusing because the YoY might not match up visually with the graph (like for Unique Devices in Achinese). + const diff = this.lastMonth.total - this.monthOneYearAgo.total; return ((diff / this.monthOneYearAgo.total) * 100).toFixed(2); }, @@ -161,7 +155,7 @@ return !this.metricData.global && this.$store.state.project === 'all-projects'; }, aggregationType: function () { -return !this.metricData.additive? 'Average': 'Total'; +return this.graphModel.getAggregateLabel(); } } ), diff --git a/src/components/detail/GraphPanel.vue b/src/components/detail/GraphPanel.vue index e84feec..38c22cb 100644 --- a/src/components/detail/GraphPanel.vue +++ b/src/components/detail/GraphPanel.vue @@ -43,14 +43,17 @@ -Total: {{total | kmb}}
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Add a test for ref in ref
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386767 ) Change subject: Add a test for ref in ref .. Add a test for ref in ref * Follow up to d05ddd3 * This would increases coverage and would have caught that regression. Change-Id: I16a2ea9cf914dd40cbc2fccf3cd1c14673b64080 --- M tests/citeParserTests.txt 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/67/386767/1 diff --git a/tests/citeParserTests.txt b/tests/citeParserTests.txt index a5ad0ee..ce0539b 100644 --- a/tests/citeParserTests.txt +++ b/tests/citeParserTests.txt @@ -10,6 +10,12 @@ {{{1}}} !! endarticle +!! article +Template:refinref +!! text +ho +!! endarticle + !! test Simple , no !! wikitext @@ -1185,6 +1191,16 @@ foo !! end +!! test +Ref in ref +!! wikitext +test hi {{refinref}} + +!! html/parsoid +test [1] +↑ hi [2]↑ ho +!! end + ## Parsoid responsive references tests !! test -- To view, visit https://gerrit.wikimedia.org/r/386767 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16a2ea9cf914dd40cbc2fccf3cd1c14673b64080 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix processing ref in ref
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386764 ) Change subject: Fix processing ref in ref .. Fix processing ref in ref * Follow up to d47d5abb * Fixes the regression found in rt: node bin/roundtrip-test.js --domain ru.wikipedia.org "Феодосия" * Simple test case (do we really not have one!?): test haha{{#tag:ref|ok}} Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842 --- M lib/ext/Cite/index.js 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js index 0192263..21a31a4 100644 --- a/lib/ext/Cite/index.js +++ b/lib/ext/Cite/index.js @@ -427,7 +427,10 @@ var body; if (dp.hasRefInRef) { - _processRefs(cite, refsData, env.fragmentMap.get(content)); + var c = env.fragmentMap.get(content); + DU.visitDOM(c, DU.loadDataAttribs); + _processRefs(cite, refsData, c); + DU.visitDOM(c, DU.storeDataAttribs); } if (content) { -- To view, visit https://gerrit.wikimedia.org/r/386764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: ArlolraGerrit-Reviewer: Arlolra Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/uprightdiff[master]: Add support for OpenCV 3.0+ with autotools
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386766 ) Change subject: Add support for OpenCV 3.0+ with autotools .. Add support for OpenCV 3.0+ with autotools OpenCV 3.0 split parts of the highgui module into imgcodecs, requiring an extra module to be linked. Use autoconf and automake to see if the new module exists, and link to it if so. The new build instructions are similar, just require running ./configure before make. Change-Id: Iad0c2e869f06e3a880a994f863f46359a877c240 --- M .gitignore D Makefile A Makefile.am A Makefile.in M README.md A aclocal.m4 A compile A config.status A configure A configure.ac A depcomp A install-sh A missing A stamp-h1 14 files changed, 9,214 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/uprightdiff refs/changes/66/386766/1 -- To view, visit https://gerrit.wikimedia.org/r/386766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad0c2e869f06e3a880a994f863f46359a877c240 Gerrit-PatchSet: 1 Gerrit-Project: integration/uprightdiff Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/jenkins[master]: Add script to manipulate clover.xml files
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386765 ) Change subject: Add script to manipulate clover.xml files .. Add script to manipulate clover.xml files Can be used to shrink the size of extremely large clover.xml files if we only want the cumulative information, and set a name on the main tag. Change-Id: I1275e1a50c5992581b914a058159a5c84386d893 --- A bin/clover-edit.py 1 file changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/65/386765/1 diff --git a/bin/clover-edit.py b/bin/clover-edit.py new file mode 100755 index 000..c4f1c3e --- /dev/null +++ b/bin/clover-edit.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python3 +""" +Edit clover.xml files +Copyright (C) 2017 Kunal Mehta+ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +""" + +import argparse +import xml.etree.cElementTree as etree + + +def main(): +parser = argparse.ArgumentParser() +parser.add_argument('clover', help='Path to clover.xml') +parser.add_argument('--name', help='Set name in element') +parser.add_argument('--remove-full-info', +help='Remove full coverage information, ' + 'leaving cumulative metrics', +action='store_true') +parser.add_argument('--save', help='Location to save to, ' + 'otherwise will overrite clover.xml') +args = parser.parse_args() +tree = etree.parse(args.clover) +root = tree.getroot() +project = root.getchildren()[0] +assert project.tag == 'project' +if args.remove_full_info: +for child in project.getchildren(): +# All we want to keep is the final tag +if child.tag != 'metrics': +project.remove(child) +if args.name: +project.set('name', args.name) +save = args.save or args.clover +tree.write(save) + + +if __name__ == '__main__': +main() -- To view, visit https://gerrit.wikimedia.org/r/386765 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1275e1a50c5992581b914a058159a5c84386d893 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix processing ref in ref
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386764 ) Change subject: Fix processing ref in ref .. Fix processing ref in ref * Follow up to d47d5abb * Fixes the regression found in rt: node bin/roundtrip-test.js --domain ru.wikipedia.org "Феодосия" * Simple test case (do we really not have one!?): test haha{{#tag:ref|ok}} Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842 --- M lib/ext/Cite/index.js 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/64/386764/1 diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js index 0192263..5ae6236 100644 --- a/lib/ext/Cite/index.js +++ b/lib/ext/Cite/index.js @@ -417,7 +417,7 @@ var refName = dp.name; var about = node.getAttribute("about"); var ref = refsData.add(env, group, refName, about, nestedInReferences); - var nodeType = (node.getAttribute("typeof") || '').replace(/mw:Extension\/ref\/Marker/, ''); + var nodeType = (node.getAttribute("typeof") || '').replace(/ mw:Extension\/ref\/Marker/, ''); // Add ref-index linkback var doc = node.ownerDocument; @@ -427,7 +427,10 @@ var body; if (dp.hasRefInRef) { - _processRefs(cite, refsData, env.fragmentMap.get(content)); + var c = env.fragmentMap.get(content); + DU.visitDOM(c, DU.loadDataAttribs); + _processRefs(cite, refsData, c); + DU.visitDOM(c, DU.storeDataAttribs); } if (content) { -- To view, visit https://gerrit.wikimedia.org/r/386764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: git-sync-upstream: formatting and comment tweaks
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386763 ) Change subject: git-sync-upstream: formatting and comment tweaks .. git-sync-upstream: formatting and comment tweaks * Use logging for all output * Add timestamp to log messages * Add a few comments * Pedantic bd808 code style changes Change-Id: I05beeb3bd323d00b57ebcba1afcc674470531487 --- M modules/puppetmaster/files/git-sync-upstream 1 file changed, 59 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/386763/1 diff --git a/modules/puppetmaster/files/git-sync-upstream b/modules/puppetmaster/files/git-sync-upstream index 16993fb..1b490dc 100755 --- a/modules/puppetmaster/files/git-sync-upstream +++ b/modules/puppetmaster/files/git-sync-upstream @@ -1,5 +1,8 @@ #!/usr/bin/python3 - +# Fetch new git changes from upstream repos and rebase local changes on top. +# Rebase step is done in a temporary git clone that shares objects with the +# repo being rebased. This helps avoid consumers of the clone seeing partial +# application of local changes do to non-atomic operations. import datetime import logging import os @@ -9,12 +12,24 @@ # Send all git output to stdout # This has to be set before git is imported. os.environ["GIT_PYTHON_TRACE"] = 'full' -logging.basicConfig(level=logging.INFO) +logging.basicConfig( +level=logging.INFO, +format='%(asctime)s %(levelname)-8s %(name)s: %(message)s', +datefmt='%Y-%m-%dT%H:%M:%SZ' +) +logging.captureWarnings(True) +logger = logging.getLogger('sync-upstream') import git def rebase_repo(repo_path, track_branch): +"""Rebase the current HEAD of the given clone on top of the given tracking +branch of it's origin repo. + +:param repo_path: git clone to rebase +:param track_branch: origin branch to track +""" datestring = datetime.datetime.now().strftime('%Y%m%d%H%M') branchname = "oot-branch-%s" % datestring tagname = "snapshot-%s" % datestring @@ -27,7 +42,7 @@ # diff index against working copy if repo.index.diff(None): -print("Local diffs detected. Commit your changes!") +logger.error("Local diffs detected. Commit your changes!") return False repo.remotes.origin.fetch() @@ -38,70 +53,78 @@ latest_merged_commit = repo.git.merge_base(upstream_branch, "HEAD") if latest_upstream_commit == latest_merged_commit: -print("Up-to-date: %s" % repo_path) +logger.info("Up-to-date: %s" % repo_path) return True try: -# Rebase in a tempdir to avoid changing the state of the current workdir. -# (Rebasing in place causes an occasional puppet race) +# Perform rebase in a temporary workdir to avoid altering the state of +# the current workdir. Rebasing in place can lead to Puppet using +# files after the update but before local patches are re-applied. # # This next bit is largely cribbed from -# https://github.com/encukou/bin/blob/master/oot-rebase -# +# https://github.com/encukou/bin/blob/master/oot-rebase os.makedirs(tempdir) tmprepo = git.Repo.init(tempdir) -# This bit of magic should prevent us from needing to create a full duplicate -# of all the objects in repo_path -with open(os.path.join(tempdir,".git/objects/info/alternates"), "w") as alternates: +# This bit of magic should prevent us from needing to create a full +# duplicate of all the objects in repo_path. +# See: https://git-scm.com/docs/gitrepository-layout +alt_file = os.path.join(tempdir,".git/objects/info/alternates") +with open(alt_file, "w") as alternates: alternates.write("%s/.git/objects" % repo_path) # Get ready to rebase in tmprepo: fetch from upstream, and create and -# check out a branch 'oot-rebase' that matches the state of the -# main repo in repo_path: -tmprepo.git.fetch("-n", repo_path, - "%s:oot-rebase/%s" % (current_branch, current_branch), - "%s:oot-rebase/%s" % (upstream_branch, upstream_branch)) +# check out a branch 'oot-rebase' that matches the state of the main +# repo in repo_path: +tmprepo.git.fetch( +"-n", repo_path, +"%s:oot-rebase/%s" % (current_branch, current_branch), +"%s:oot-rebase/%s" % (upstream_branch, upstream_branch)) tmprepo.git.checkout("oot-rebase/%s" % current_branch) # And... rebase. -tmprepo.git.rebase("--preserve-merges", - "--stat", - "--strategy=recursive", - "--strategy-option=patience", - "oot-rebase/%s" % upstream_branch) +tmprepo.git.rebase(
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.widgets.DateInputWidget: Fix unexpected MMMMM or ddddd da...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386305 ) Change subject: mw.widgets.DateInputWidget: Fix unexpected M or d date format .. mw.widgets.DateInputWidget: Fix unexpected M or d date format In some locale data in moment.js such as zh, date format already uses and . The original attempt to expand MMM to and ddd to inadvertently expands to M and to d, which is then interpreted as or followed by an unexpected single M or d. Change-Id: I2634dfbaaf9615a13dce7b8f4ba3c3bea6863a91 --- M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js index f10c93d..9d2e93b 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js @@ -465,7 +465,8 @@ format = .replace( lll.replace( ll, '' ), '' ); if ( this.longDisplayFormat ) { - format = format.replace( 'MMM', '' ).replace( 'ddd', '' ); + // Replace MMM to and ddd to but don't change and + format = format.replace( /?/, '' ).replace( /?/, '' ); } return format; -- To view, visit https://gerrit.wikimedia.org/r/386305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2634dfbaaf9615a13dce7b8f4ba3c3bea6863a91 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: LiangentGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Catrope Gerrit-Reviewer: Esanders Gerrit-Reviewer: Liangent Gerrit-Reviewer: Sn1per Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Improve properness of launching SavedPageSyncService on API 26.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386665 ) Change subject: Improve properness of launching SavedPageSyncService on API 26. .. Improve properness of launching SavedPageSyncService on API 26. Android Oreo (API 26) is much more harsh on apps that run in the background, and requires us to enqueue background services in a more delicate way. For example, if an app is in the background, and it tries to start a Service, it will actually crash. This patch incorporates the new JobIntentService introduced in the Support library v26.0, which correctly launches the service for API 26 and lower APIs. One of the side-effects of this patch is that we'll need to include the WAKE_LOCK permission in the app from now on. Change-Id: I216b1243cd6c74c64788cb5e8d45aa43e081b0b2 --- M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java 3 files changed, 19 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Cooltey: Looks good to me, approved diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14b56aa..694c38b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,6 +39,9 @@ + + +
[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: Added MediaWiki flavour
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386551 ) Change subject: Added MediaWiki flavour .. Added MediaWiki flavour Since, we are not using any suffix here, we had to modify the appId function in build.gradle in order to avoid a conflict with the provider authority. Modified some drawables and strings to use the MediaWiki ones. This is still work in progress for other subtask. Refactored the activity_about layout in order to avoid code duplication. Corrected strings for the MediaWiki specific flavour. Replaced Wikipedia in strings. Bug: T165783 Change-Id: Ie1df1f17668a40ad1c1101fce9f21beae213575c --- M app/build.gradle A app/src/main/res/layout/about_logo_image.xml M app/src/main/res/layout/activity_about.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values/strings.xml A app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png A app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png A app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png A app/src/mediawiki/res/drawable-xxxhdpi/w_nav_mark.png A app/src/mediawiki/res/drawable/wp_wordmark.png A app/src/mediawiki/res/layout/about_logo_image.xml A app/src/mediawiki/res/mipmap-hdpi/launcher.png A app/src/mediawiki/res/mipmap-mdpi/launcher.png A app/src/mediawiki/res/mipmap-xhdpi/launcher.png A app/src/mediawiki/res/mipmap-xxhdpi/launcher.png A app/src/mediawiki/res/mipmap-xxxhdpi/launcher.png A app/src/mediawiki/res/values/strings.xml A app/src/mediawiki/res/values/strings_no_translate.xml 18 files changed, 61 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Cooltey: Looks good to me, approved diff --git a/app/build.gradle b/app/build.gradle index c797876..a2f3913 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -134,6 +134,12 @@ manifestPlaceholders = [customChannel:getProperty('customChannel').toString()] signingConfig signingConfigs.prod } +mediawiki { +applicationId 'org.mediawiki' +versionName computeVersionName('mediawiki') +signingConfig signingConfigs.prod +testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner' +} } packagingOptions { @@ -261,6 +267,6 @@ private String appId(ProductFlavor flavor) { String suffix = flavor.applicationIdSuffix -String id = android.defaultConfig.applicationId + (suffix ? ".$suffix" : '') +String id = flavor.applicationId + (suffix ? ".$suffix" : '') return id } diff --git a/app/src/main/res/layout/about_logo_image.xml b/app/src/main/res/layout/about_logo_image.xml new file mode 100644 index 000..fa61352 --- /dev/null +++ b/app/src/main/res/layout/about_logo_image.xml @@ -0,0 +1,10 @@ + +http://schemas.android.com/apk/res/android; +xmlns:tools="http://schemas.android.com/tools; +android:id="@+id/about_logo_image" +android:layout_width="48dp" +android:layout_height="48dp" +android:src="@drawable/w_nav_mark" +android:tint="?attr/secondary_text_color" +android:contentDescription="@null" +tools:showIn="@layout/activity_about" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 0b1532e..36b2f8f 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -15,15 +15,9 @@ android:padding="24dp" android:gravity="center" > - + + Name of the application.\n{{Identical|Wikipedia}} Name of the beta version of the application.\n{{Identical|Wikipedia Beta}} Name of the alpha version of the application. + Name of the generic MediaWiki version of the application. Wikimedia\'s name.\n{{Identical|Wikimedia}} Hint text for the search box Hint text for the search box when searching browsing history diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index abfe5e2..d85eb42 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ Wikipedia Wikipedia Beta Wikipedia Alpha +MediaWiki Wikimedia diff --git a/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png b/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png new file mode 100644 index 000..283a8f8 --- /dev/null +++ b/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png Binary files differ diff --git a/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png b/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png new file mode 100644 index 000..af89eb0 --- /dev/null +++ b/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png Binary files differ diff --git a/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png b/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png new file mode 100644 index 000..2119207 --- /dev/null +++
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (8d1c0d026)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386762 ) Change subject: Update VE core submodule to master (8d1c0d026) .. Update VE core submodule to master (8d1c0d026) New changes: 8581e9d86 LinearEnterKeyDownHandler: Enter behavior in nested lists a91e77764 build: Put karma coverage reports in the top-level directory 81a88b4f1 build: Replace JSON code coverage report with clover.xml one Bug: T108595 Change-Id: Ic5d83417d64126d9a27d46504fc8fcd338cd7f21 --- M Gruntfile.js M lib/ve 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/62/386762/1 diff --git a/Gruntfile.js b/Gruntfile.js index 24774b2..3c66db3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -116,6 +116,7 @@ }, src: [ '**/*.{js,json,less,css,txt}', + '!package-lock.json', '!build/typos.json', '!lib/**', '!{docs,node_modules,vendor}/**', diff --git a/lib/ve b/lib/ve index 9b32da8..8d1c0d0 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 9b32da86d99a3e4e7a56640aa8669d2c47072d50 +Subproject commit 8d1c0d0260a313292016665b947b9bc5f365fb6d -- To view, visit https://gerrit.wikimedia.org/r/386762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5d83417d64126d9a27d46504fc8fcd338cd7f21 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: build: Bump stylelint devDependencies to latest
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386760 ) Change subject: build: Bump stylelint devDependencies to latest .. build: Bump stylelint devDependencies to latest grunt-stylelint 0.8.0 → 0.9.0 stylelint 7.8.0 → 8.2.0 stylelint-config-wikimedia 0.4.1 → 0.4.2 Change-Id: I2884c8daed3fe0e0d05c746ec6319956b742695b --- M .stylelintrc.json M package.json 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/60/386760/1 diff --git a/.stylelintrc.json b/.stylelintrc.json index 501742f..cdb8adf 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -6,7 +6,7 @@ "background-size" ], "selector-list-comma-newline-after": null, - "selector-no-id": null, + "selector-max-id": null, "value-keyword-case": null } } diff --git a/package.json b/package.json index 9e6b276..66f3eb2 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "grunt-eslint": "20.1.0", "grunt-jsonlint": "1.1.0", "grunt-notify": "0.4.5", - "grunt-stylelint": "0.8.0", - "stylelint": "7.8.0", - "stylelint-config-wikimedia": "0.4.1" + "grunt-stylelint": "0.9.0", + "stylelint": "8.2.0", + "stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/386760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2884c8daed3fe0e0d05c746ec6319956b742695b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...netbox[master]: Add django ldap support wheels
Ayounsi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386757 ) Change subject: Add django ldap support wheels .. Add django ldap support wheels Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668 --- A django_auth_ldap-1.2.16-py3-none-any.whl A pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ayounsi: Verified; Looks good to me, approved diff --git a/django_auth_ldap-1.2.16-py3-none-any.whl b/django_auth_ldap-1.2.16-py3-none-any.whl new file mode 100644 index 000..a54b3c9 --- /dev/null +++ b/django_auth_ldap-1.2.16-py3-none-any.whl Binary files differ diff --git a/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl new file mode 100644 index 000..6c23971 --- /dev/null +++ b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/386757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668 Gerrit-PatchSet: 1 Gerrit-Project: operations/wheels/netbox Gerrit-Branch: master Gerrit-Owner: AyounsiGerrit-Reviewer: Ayounsi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: build: Bump run-time dependencies to latest, pin
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386761 ) Change subject: build: Bump run-time dependencies to latest, pin .. build: Bump run-time dependencies to latest, pin jsdoc3.4.2 → 3.5.5 svgo >=0.4.4 → 0.7.2 Change-Id: I2884c8daed3fe0e0d05c746ec6319956b742695c --- M package.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/61/386761/1 diff --git a/package.json b/package.json index 66f3eb2..2f1b8af 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "doc": "jsduck" }, "dependencies": { - "jsdoc": "3.4.2", - "svgo": ">=0.4.4" + "jsdoc": "3.5.5", + "svgo": "0.7.2" }, "devDependencies": { "eslint-config-wikimedia": "0.5.0", -- To view, visit https://gerrit.wikimedia.org/r/386761 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2884c8daed3fe0e0d05c746ec6319956b742695c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: build: Bump various devDependencies to latest, pin consistently
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386759 ) Change subject: build: Bump various devDependencies to latest, pin consistently .. build: Bump various devDependencies to latest, pin consistently grunt ^1.0.1 → 1.0.1 grunt-banana-checker ^0.5.0 → 0.6.0 grunt-contrib-watch^1.0.0 → 1.0.0 grunt-eslint 20.0.0 → 20.1.0 grunt-jsonlint ^1.1.0 → 1.1.0 grunt-notify ^0.4.5 → 0.4.5 Change-Id: I2884c8daed3fe0e0d05c746ec6319956b742695a --- M package.json 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/59/386759/1 diff --git a/package.json b/package.json index 0ebdab7..9e6b276 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,12 @@ }, "devDependencies": { "eslint-config-wikimedia": "0.5.0", - "grunt": "^1.0.1", - "grunt-banana-checker": "^0.5.0", - "grunt-contrib-watch": "^1.0.0", - "grunt-eslint": "20.0.0", - "grunt-jsonlint": "^1.1.0", - "grunt-notify": "^0.4.5", + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-contrib-watch": "1.0.0", + "grunt-eslint": "20.1.0", + "grunt-jsonlint": "1.1.0", + "grunt-notify": "0.4.5", "grunt-stylelint": "0.8.0", "stylelint": "7.8.0", "stylelint-config-wikimedia": "0.4.1" -- To view, visit https://gerrit.wikimedia.org/r/386759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2884c8daed3fe0e0d05c746ec6319956b742695a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Wikidatawiki to wmf.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386758 ) Change subject: Wikidatawiki to wmf.4 .. Wikidatawiki to wmf.4 Change-Id: I16b9818f4b58f6970788c4115a4148c4eff002c7 --- M wikiversions.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/wikiversions.json b/wikiversions.json index b5fc288..6f3aa47 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -859,7 +859,7 @@ "wawiktionary": "php-1.31.0-wmf.5", "wbwikimedia": "php-1.31.0-wmf.5", "wg_enwiki": "php-1.31.0-wmf.4", -"wikidatawiki": "php-1.31.0-wmf.5", +"wikidatawiki": "php-1.31.0-wmf.4", "wikimania2005wiki": "php-1.31.0-wmf.5", "wikimania2006wiki": "php-1.31.0-wmf.5", "wikimania2007wiki": "php-1.31.0-wmf.5", -- To view, visit https://gerrit.wikimedia.org/r/386758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16b9818f4b58f6970788c4115a4148c4eff002c7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Wikidatawiki to wmf.4
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386758 ) Change subject: Wikidatawiki to wmf.4 .. Wikidatawiki to wmf.4 Change-Id: I16b9818f4b58f6970788c4115a4148c4eff002c7 --- M wikiversions.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/58/386758/1 diff --git a/wikiversions.json b/wikiversions.json index b5fc288..6f3aa47 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -859,7 +859,7 @@ "wawiktionary": "php-1.31.0-wmf.5", "wbwikimedia": "php-1.31.0-wmf.5", "wg_enwiki": "php-1.31.0-wmf.4", -"wikidatawiki": "php-1.31.0-wmf.5", +"wikidatawiki": "php-1.31.0-wmf.4", "wikimania2005wiki": "php-1.31.0-wmf.5", "wikimania2006wiki": "php-1.31.0-wmf.5", "wikimania2007wiki": "php-1.31.0-wmf.5", -- To view, visit https://gerrit.wikimedia.org/r/386758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16b9818f4b58f6970788c4115a4148c4eff002c7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: ChadGerrit-Reviewer: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: CheckBlocksSecondaryAuthenticationProvider: Avoid user langu...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/382517 ) Change subject: CheckBlocksSecondaryAuthenticationProvider: Avoid user language during auto-creation .. CheckBlocksSecondaryAuthenticationProvider: Avoid user language during auto-creation If a user being auto-created is blocked from account creation without a reason given, CheckBlocksPrimaryAuthProvider is triggering a "User::loadFromSession called before the end of Setup.php" log message when trying to fill in a reason using 'blockednoreason'. In this situation, use the content language instead. Bug: T124367 Change-Id: Id94c919cdba5e4218b709ba8ac9d0fa17f0c3f8e --- M includes/auth/CheckBlocksSecondaryAuthenticationProvider.php 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/auth/CheckBlocksSecondaryAuthenticationProvider.php b/includes/auth/CheckBlocksSecondaryAuthenticationProvider.php index f7a7ec1..7488fba 100644 --- a/includes/auth/CheckBlocksSecondaryAuthenticationProvider.php +++ b/includes/auth/CheckBlocksSecondaryAuthenticationProvider.php @@ -77,9 +77,19 @@ public function testUserForCreation( $user, $autocreate, array $options = [] ) { $block = $user->isBlockedFromCreateAccount(); if ( $block ) { + if ( $block->mReason ) { + $reason = $block->mReason; + } else { + $msg = \Message::newFromKey( 'blockednoreason' ); + if ( !\RequestContext::getMain()->getUser()->isSafeToLoad() ) { + $msg->inContentLanguage(); + } + $reason = $msg->text(); + } + $errorParams = [ $block->getTarget(), - $block->mReason ?: \Message::newFromKey( 'blockednoreason' )->text(), + $reason, $block->getByName() ]; -- To view, visit https://gerrit.wikimedia.org/r/382517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id94c919cdba5e4218b709ba8ac9d0fa17f0c3f8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: AnomieGerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move Beta Features screenshots into modules
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386739 ) Change subject: Move Beta Features screenshots into modules .. Move Beta Features screenshots into modules Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f --- M VisualEditor.hooks.php R modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg R modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg R modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg R modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg 5 files changed, 1 insertion(+), 1 deletion(-) Approvals: DLynch: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 3fcc30f..9a86a01 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -686,7 +686,7 @@ public static function onGetBetaPreferences( User $user, array &$preferences ) { $coreConfig = RequestContext::getMain()->getConfig(); - $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . "/VisualEditor"; + $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . "/VisualEditor/modules/ve-wmf"; $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' ); $preferences['visualeditor-enable'] = [ diff --git a/betafeatures-icon-VisualEditor-ltr.svg b/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg similarity index 100% rename from betafeatures-icon-VisualEditor-ltr.svg rename to modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg diff --git a/betafeatures-icon-VisualEditor-rtl.svg b/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg similarity index 100% rename from betafeatures-icon-VisualEditor-rtl.svg rename to modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg diff --git a/betafeatures-icon-WikitextEditor-ltr.svg b/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg similarity index 100% rename from betafeatures-icon-WikitextEditor-ltr.svg rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg diff --git a/betafeatures-icon-WikitextEditor-rtl.svg b/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg similarity index 100% rename from betafeatures-icon-WikitextEditor-rtl.svg rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg -- To view, visit https://gerrit.wikimedia.org/r/386739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: DLynch Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Removed Toki Pona localization files
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386311 ) Change subject: Removed Toki Pona localization files .. Removed Toki Pona localization files Bug: T132899 Bug: T178730 Change-Id: I4c61b3ef42cdc24fee74587965240ca08242867e (cherry picked from commit f0828ff4757c4c05790e0c274418cbd2a45b508b) --- M RELEASE-NOTES-1.30 D includes/installer/i18n/tokipona.json M languages/data/Names.php D languages/i18n/tokipona.json M tests/phpunit/languages/LanguageTest.php 5 files changed, 1 insertion(+), 123 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved Zoranzoki21: Looks good to me, but someone else must approve diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30 index bcdd436..f79ae83 100644 --- a/RELEASE-NOTES-1.30 +++ b/RELEASE-NOTES-1.30 @@ -124,6 +124,7 @@ * Added: kbp (Kabɩyɛ / Kabiyè) * Added: skr (Saraiki, سرائیکی) * Added: tay (Tayal / Atayal) +* Removed: tokipona (Toki Pona) Pig Latin added * (T45547) Added Pig Latin, a made-up English variant (en-x-piglatin), diff --git a/includes/installer/i18n/tokipona.json b/includes/installer/i18n/tokipona.json deleted file mode 100644 index 348380f..000 --- a/includes/installer/i18n/tokipona.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Robin0van0der0vliet" - ] - }, - "config-page-language": "toki" -} diff --git a/languages/data/Names.php b/languages/data/Names.php index e2ed910..2026799 100644 --- a/languages/data/Names.php +++ b/languages/data/Names.php @@ -418,7 +418,6 @@ 'tly' => 'толышә зывон', # Talysh 'tn' => 'Setswana', # Setswana 'to' => 'lea faka-Tonga', # Tonga (Tonga Islands) - 'tokipona' => 'Toki Pona', # Toki Pona 'tpi' => 'Tok Pisin', # Tok Pisin 'tr' => 'Türkçe', # Turkish 'tru' => 'Ṫuroyo', # Turoyo diff --git a/languages/i18n/tokipona.json b/languages/i18n/tokipona.json deleted file mode 100644 index 67f4b5f..000 --- a/languages/i18n/tokipona.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "@metadata": { - "authors": [ - "http://tokipona.wikia.com sysops" - ] - }, - "january": "tenpo mun pi nanpa wan", - "february": "tenpo mun pi nanpa tu", - "march": "tenpo mun pi nanpa tu wan", - "april": "tenpo mun pi nanpa tu tu", - "may_long": "tenpo mun pi nanpa luka", - "june": "tenpo mun pi nanpa luka wan", - "july": "tenpo mun pi nanpa luka tu", - "august": "tenpo mun pi nanpa luka tu wan", - "september": "tenpo mun pi nanpa luka tu tu", - "october": "tenpo mun pi nanpa luka luka", - "november": "tenpo mun pi nanpa luka luka wan", - "december": "tenpo mun pi nanpa luka luka tu", - "category_header": "lipu lon kulupu lipu \"$1\"", - "subcategories": "kulupu lipu lili", - "listingcontinuesabbrev": " li awen", - "article": "lipu sona", - "newwindow": "(ona li open e lupa sin)", - "cancel": "ike", - "mytalk": "toki mi", - "navigation": "lipu suli", - "help": "mi sona ala", - "search": "o lukin jo", - "go": "o tawa", - "history": "o lukin e lipu ni pi tenpo pini", - "history_short": "lipu ni pi tenpo pini", - "printableversion": "lipu ni o kama lipu len", - "permalink": "nimi open kiwen", - "edit": "o ante", - "editthispage": "o ante e lipu ni", - "delete": "o weka", - "deletethispage": "o weka e lipu ni", - "protect": "mi taso o ken ante", - "protectthispage": "mi taso o ken ante e lipu ni", - "unprotect": "jan ali o ken ante", - "unprotectthispage": "jan ale o ken ante e lipu ni", - "talkpage": "Talk page", - "specialpage": "lipu suli", - "talk": "o toki", - "toolbox": "ilo", - "otherlanguages": "toki ante", - "redirectedfrom": "(tan $1)", - "aboutsite": "lipu sona pi toki pona li seme?", - "aboutpage": "Project:lipu sona pi toki pona li seme?", - "copyright": "lipu ken $1 li lawa e lipu ni.", - "currentevents": "seme li sin lon ma?", - "disclaimers": "wile ala", - "edithelp": "mi sona ala e ante", - "mainpage": "lipu lawa", - "mainpage-description": "lipu lawa", - "portal": "lipu pi kulupu ni", - "privacy": "ken pi awen weka", - "ok": "pona", - "retrievedfrom": "tan $1", - "editsection": "o ante", - "toc": "poki lawa", - "showtoc": "o suli e poki ni.", - "hidetoc": "o lili e poki ni", - "nstab-main": "lipu sona", - "nstab-user": "lipu jan", - "nstab-special": "suli", - "nstab-image": "lipu nanpa", - "nstab-mediawiki": "nimi", - "nstab-template":
[MediaWiki-commits] [Gerrit] operations...netbox[master]: Add django ldap support wheels
Ayounsi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386757 ) Change subject: Add django ldap support wheels .. Add django ldap support wheels Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668 --- A django_auth_ldap-1.2.16-py3-none-any.whl A pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/wheels/netbox refs/changes/57/386757/1 diff --git a/django_auth_ldap-1.2.16-py3-none-any.whl b/django_auth_ldap-1.2.16-py3-none-any.whl new file mode 100644 index 000..a54b3c9 --- /dev/null +++ b/django_auth_ldap-1.2.16-py3-none-any.whl Binary files differ diff --git a/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl new file mode 100644 index 000..6c23971 --- /dev/null +++ b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/386757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668 Gerrit-PatchSet: 1 Gerrit-Project: operations/wheels/netbox Gerrit-Branch: master Gerrit-Owner: Ayounsi___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_text: raise MW connection limits to 10K
BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386756 ) Change subject: cache_text: raise MW connection limits to 10K .. cache_text: raise MW connection limits to 10K Emergency change to cope with an issue we don't yet fully comprehend. Should not become the new normal. Change-Id: I33755fe01d08c14e56baeff91306ca72969a9a31 --- M hieradata/role/common/cache/text.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/cache/text.yaml b/hieradata/role/common/cache/text.yaml index 602a755..abf40fc 100644 --- a/hieradata/role/common/cache/text.yaml +++ b/hieradata/role/common/cache/text.yaml @@ -26,10 +26,18 @@ max_connections: 1000 cache::app_directors: appservers: +be_opts: + max_connections: 1 + # ^ Emergency change to cope with an issue we don't yet fully + # comprehend. Should not become the new normal. backends: eqiad: 'appservers.svc.eqiad.wmnet' # codfw: 'appservers.svc.codfw.wmnet' api: +be_opts: + max_connections: 1 + # ^ Emergency change to cope with an issue we don't yet fully + # comprehend. Should not become the new normal. backends: eqiad: 'api.svc.eqiad.wmnet' # codfw: 'api.svc.codfw.wmnet' -- To view, visit https://gerrit.wikimedia.org/r/386756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33755fe01d08c14e56baeff91306ca72969a9a31 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlackGerrit-Reviewer: BBlack Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_text: raise MW connection limits to 10K
BBlack has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386756 ) Change subject: cache_text: raise MW connection limits to 10K .. cache_text: raise MW connection limits to 10K Emergency change to cope with an issue we don't yet fully comprehend. Should not become the new normal. Change-Id: I33755fe01d08c14e56baeff91306ca72969a9a31 --- M hieradata/role/common/cache/text.yaml 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/386756/1 diff --git a/hieradata/role/common/cache/text.yaml b/hieradata/role/common/cache/text.yaml index 602a755..abf40fc 100644 --- a/hieradata/role/common/cache/text.yaml +++ b/hieradata/role/common/cache/text.yaml @@ -26,10 +26,18 @@ max_connections: 1000 cache::app_directors: appservers: +be_opts: + max_connections: 1 + # ^ Emergency change to cope with an issue we don't yet fully + # comprehend. Should not become the new normal. backends: eqiad: 'appservers.svc.eqiad.wmnet' # codfw: 'appservers.svc.codfw.wmnet' api: +be_opts: + max_connections: 1 + # ^ Emergency change to cope with an issue we don't yet fully + # comprehend. Should not become the new normal. backends: eqiad: 'api.svc.eqiad.wmnet' # codfw: 'api.svc.codfw.wmnet' -- To view, visit https://gerrit.wikimedia.org/r/386756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33755fe01d08c14e56baeff91306ca72969a9a31 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix handling of deleted lists
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380695 ) Change subject: Fix handling of deleted lists .. Fix handling of deleted lists The call to getListEntryOrder aborted since it refuses to work with deleted lists. There is not much point in showing order information for them anyway. Change-Id: I987d0c0154ec9790da7593522ed68781bfea6ff6 --- M src/Api/ApiQueryReadingLists.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/src/Api/ApiQueryReadingLists.php b/src/Api/ApiQueryReadingLists.php index 68c9d89..0e4961a 100644 --- a/src/Api/ApiQueryReadingLists.php +++ b/src/Api/ApiQueryReadingLists.php @@ -180,7 +180,7 @@ * @fixme If apps really need this, find a more performant way to get the data */ private function addExtraData( &$row, $repository, $mode ) { - if ( $mode !== self::MODE_PAGE ) { + if ( $mode !== self::MODE_PAGE && empty( $row->rl_deleted ) ) { $row->order = $repository->getListEntryOrder( $row->rl_id ); if ( $row->rl_is_default ) { $row->list_order = $repository->getListOrder(); -- To view, visit https://gerrit.wikimedia.org/r/380695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I987d0c0154ec9790da7593522ed68781bfea6ff6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ReadingLists Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: BearND Gerrit-Reviewer: Mholloway Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/core[master]: Generate clover.xml with code coverage results
Krinkle has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386570 ) Change subject: Generate clover.xml with code coverage results .. Generate clover.xml with code coverage results Bug: T179051 Change-Id: I56ab586b258fc1cbf11521fdde2ad275da2ca62e --- M Gruntfile.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index 33d10b7..f68b626 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -155,7 +155,8 @@ reports: { 'text-summary': null, html: 'coverage/', - lcovonly: 'coverage/lcov.info' + lcovonly: 'coverage/lcov.info', + clover: 'coverage/clover.xml' } } }, -- To view, visit https://gerrit.wikimedia.org/r/386570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56ab586b258fc1cbf11521fdde2ad275da2ca62e Gerrit-PatchSet: 3 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: LegoktmGerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Test against Safari 7, Safari 6 is no longer around
Krinkle has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386664 ) Change subject: build: Test against Safari 7, Safari 6 is no longer around .. build: Test against Safari 7, Safari 6 is no longer around Change-Id: I11e97c8bf8ee544ccc279aee9c235c79391540d1 --- M Gruntfile.js M tests/saucelabs.browsers.js 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index ae64640..33d10b7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -131,7 +131,7 @@ // Latest versions of complicated browsers 'slSafari', 'slIE', // Earliest-supported versions of complicated browsers - 'slSafari6', 'slIE10' + 'slSafari7', 'slIE10' ] }, // Primary unit test run (includes code coverage) diff --git a/tests/saucelabs.browsers.js b/tests/saucelabs.browsers.js index 273c89a..e5c5c3f 100644 --- a/tests/saucelabs.browsers.js +++ b/tests/saucelabs.browsers.js @@ -36,10 +36,10 @@ }, // Oldest Safari that Sauce Labs provides - slSafari6: { + slSafari7: { base: 'SauceLabs', browserName: 'safari', - version: '6' + version: '7' }, // Oldest IE we support slIE10: { -- To view, visit https://gerrit.wikimedia.org/r/386664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11e97c8bf8ee544ccc279aee9c235c79391540d1 Gerrit-PatchSet: 2 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix type conversion bug
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379702 ) Change subject: Fix type conversion bug .. Fix type conversion bug And also some small type / code style issues while we are at it. Change-Id: Ic5a62b2665b2b25fc270770c3d9db088bcc9fd00 --- M src/Api/ApiQueryReadingLists.php M src/Api/ApiTrait.php M src/ReadingListRepository.php 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/src/Api/ApiQueryReadingLists.php b/src/Api/ApiQueryReadingLists.php index 2a0ff1b..68c9d89 100644 --- a/src/Api/ApiQueryReadingLists.php +++ b/src/Api/ApiQueryReadingLists.php @@ -190,14 +190,14 @@ /** * Transform a row into an API result item -* @param ReadingListRow $row +* @param ReadingListRow $row List row, with additions from addExtraData(). * @param string $mode One of the MODE_* constants. * @return array */ private function getResultItem( $row, $mode ) { $item = [ 'id' => (int)$row->rl_id, - 'name' => (int)$row->rl_name, + 'name' => $row->rl_name, 'default' => (bool)$row->rl_is_default, 'description' => $row->rl_description, 'color' => $row->rl_color, diff --git a/src/Api/ApiTrait.php b/src/Api/ApiTrait.php index 4af09f5..df2e7c9 100644 --- a/src/Api/ApiTrait.php +++ b/src/Api/ApiTrait.php @@ -40,7 +40,7 @@ */ public static function factory( ApiBase $parent, $name ) { $services = MediaWikiServices::getInstance(); - $loadBalancerFactory = $services ->getDBLoadBalancerFactory(); + $loadBalancerFactory = $services->getDBLoadBalancerFactory(); $dbw = Utils::getDB( DB_MASTER, $services ); $dbr = Utils::getDB( DB_REPLICA, $services ); if ( static::$prefix ) { diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php index c657907..4bd7e89 100644 --- a/src/ReadingListRepository.php +++ b/src/ReadingListRepository.php @@ -531,7 +531,7 @@ if ( !$ids ) { throw new ReadingListRepositoryException( 'readinglists-db-error-not-set-up' ); } - return $ids; + return array_map( 'intval', $ids ); } /** @@ -645,7 +645,7 @@ } } - return $ids; + return array_map( 'intval', $ids ); } /** -- To view, visit https://gerrit.wikimedia.org/r/379702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5a62b2665b2b25fc270770c3d9db088bcc9fd00 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ReadingLists Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: BearND Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Update extension for AuthManager
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386711 ) Change subject: Update extension for AuthManager .. Update extension for AuthManager In addition to AuthManager compatibility, this brings it up to modern coding standards regarding array syntax and the like, and converts the extension to use extension registration. Compatibility shims have been removed. Bug: T110293 Change-Id: Ia0caae13109affe6a441f087e31dc83e9856f309 Co-Authored-By: Isarra--- A ExternalWikiPrimaryAuthenticationProvider.php D MediaWikiAuth.i18n.php D MediaWikiAuth.php D MediaWikiAuthPlugin.class.php A PopulateImportedWatchlistJob.php D README D Snoopy.class.php A extension.json M i18n/en.json M i18n/qqq.json D patches/SpecialUserlogin.php-1.17alpha.r67921.patch D patches/SpecialUserlogin.php-1.20.0.patch D patches/SpecialUserlogin.php-1.21.2.patch D patches/SpecialUserlogin.php-1.23.3.patch 14 files changed, 456 insertions(+), 2,120 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/ExternalWikiPrimaryAuthenticationProvider.php b/ExternalWikiPrimaryAuthenticationProvider.php new file mode 100644 index 000..c8fd679 --- /dev/null +++ b/ExternalWikiPrimaryAuthenticationProvider.php @@ -0,0 +1,363 @@ +cookieJar = new \CookieJar(); + } + + /** +* Attempt to authenticate against a remote wiki's API +* +* We first check to see if the given user exists in the remote wiki; if they do not +* then we abstain from this auth provider (as the username may be handled by a different +* provider). If they exist, we attempt to auth against that username with our provided +* password, and return the result (PASS/FAIL). +* +* Once the user successfully authenticates, we import their Preferences and Watchlist from +* the remote wiki and prompt them to change their password. +*/ + public function beginPrimaryAuthentication( array $reqs ) { + $req = AuthenticationRequest::getRequestByClass( $reqs, PasswordAuthenticationRequest::class ); + if ( !$req ) { + return AuthenticationResponse::newAbstain(); + } + + if ( $req->username === null || $req->password === null ) { + return AuthenticationResponse::newAbstain(); + } + + // Check if the user exists on the local wiki. If so, do not attempt to auth against the remote one. + // if $existingUser is false, that means username validation failed so we won't be able to auth with + // this name anyway once the account does exist. + $existingUser = User::newFromName( $req->username, 'usable' ); + if ( $existingUser === false || $existingUser->getId() !== 0 ) { + return AuthenticationResponse::newAbstain(); + } + + $username = $existingUser->getName(); + + // Check for username existence on other wiki + if ( !$this->testUserExists( $username ) ) { + return AuthenticationResponse::newAbstain(); + } + + // Grab remote MediaWiki version; our auth flow depends on what we get back + $resp = $this->apiRequest( 'GET', [ + 'action' => 'query', + 'meta' => 'siteinfo', + 'siprop' => 'general' + ], [], __METHOD__ ); + // generator is of the form 'MediaWiki X.X.X'; strip MediaWiki from out front + $remoteVersion = substr( $resp->query->general->generator, 10 ); + + if ( version_compare( $remoteVersion, '1.27', '<' ) ) { + // use old login API + $resp = $this->apiRequest( 'POST', [ + 'action' => 'login' + ], [ + 'lgname' => $username, + 'lgpassword' => $req->password + ], __METHOD__ ); + + if ( $resp->login->result === 'NeedToken' ) { + $loginToken = $resp->login->token; + + $resp = $this->apiRequest( 'POST', [ + 'action' => 'login' + ], [ + 'lgname' => $username, + 'lgpassword' => $req->password, + 'lgtoken' => $loginToken + ], __METHOD__ ); + } + + if ( $resp->login->result !== 'Success' ) { + $this->logger->info( 'Authentication against legacy
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove $cluster_cidr from k8s::controller
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386753 ) Change subject: Remove $cluster_cidr from k8s::controller .. Remove $cluster_cidr from k8s::controller The --cluster-cidr parameter only makes sense if --allocate-node-cidrs=true is also specified and a proper cloud-provider is specified. We probably won't ever have a proper cloud-provider in production and in labs, where the openstack cloud provider could be used, we don't use it yet. When and if we decide to use the openstack cloud provider in tool labs we can revisit this Change-Id: I45c840c6bc4b96a51c6a361c1806ac70dfae75af --- M modules/k8s/manifests/controller.pp M modules/k8s/templates/kube-controller-manager.default.erb 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/386753/1 diff --git a/modules/k8s/manifests/controller.pp b/modules/k8s/manifests/controller.pp index 889f1fb..8078d8d 100644 --- a/modules/k8s/manifests/controller.pp +++ b/modules/k8s/manifests/controller.pp @@ -1,6 +1,4 @@ -class k8s::controller( -$cluster_cidr = '192.168.0.0/24', -){ +class k8s::controller { require_package('kubernetes-master') file { '/etc/default/kube-controller-manager': diff --git a/modules/k8s/templates/kube-controller-manager.default.erb b/modules/k8s/templates/kube-controller-manager.default.erb index 43acfc7..2bf7270 100644 --- a/modules/k8s/templates/kube-controller-manager.default.erb +++ b/modules/k8s/templates/kube-controller-manager.default.erb @@ -3,5 +3,5 @@ # ## defaults from config and apiserver should be adequate # This is the default anyway in 1.4 at least, but specify to ensure backwards compatibility -DAEMON_ARGS="--cluster-cidr=<%= @cluster_cidr %> --leader-elect=true" +DAEMON_ARGS="--leader-elect=true" # -- To view, visit https://gerrit.wikimedia.org/r/386753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45c840c6bc4b96a51c6a361c1806ac70dfae75af Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Enable k8s::controller manager ServiceAccount signing
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386755 ) Change subject: Enable k8s::controller manager ServiceAccount signing .. Enable k8s::controller manager ServiceAccount signing Specify the required hiera parameter to provide the controller manager to create the tokens and secrets for ServiceAccounts Bug: T177393 Change-Id: I202e547079f6ecf26d65d0ed87031a45019166a8 --- M hieradata/role/common/kubernetes/master.yaml M hieradata/role/common/kubernetes/staging/master.yaml 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/386755/1 diff --git a/hieradata/role/common/kubernetes/master.yaml b/hieradata/role/common/kubernetes/master.yaml index aa84106..676e426 100644 --- a/hieradata/role/common/kubernetes/master.yaml +++ b/hieradata/role/common/kubernetes/master.yaml @@ -13,6 +13,7 @@ profile::kubernetes::master::ssl_cert_path: "/etc/ssl/localcerts/kubemaster.svc.%{::site}.wmnet.crt" profile::kubernetes::master::ssl_key_path: "/etc/ssl/private/kubemaster.svc.%{::site}.wmnet.key" profile::kubernetes::master::authz_mode: '' +profile::kubernetes::master::service_account_private_key_file: "/etc/ssl/private/kubemaster.svc.%{::site}.wmnet.key" # TODO: This needs to become a profile role::lvs::realserver::pools: kubemaster: {} diff --git a/hieradata/role/common/kubernetes/staging/master.yaml b/hieradata/role/common/kubernetes/staging/master.yaml index 00e562d..f4bc25c 100644 --- a/hieradata/role/common/kubernetes/staging/master.yaml +++ b/hieradata/role/common/kubernetes/staging/master.yaml @@ -14,6 +14,7 @@ profile::kubernetes::master::ssl_cert_path: "/etc/kubernetes/ssl/cert.pem" profile::kubernetes::master::ssl_key_path: "/etc/kubernetes/ssl/server.key" profile::kubernetes::master::authz_mode: '' +profile::kubernetes::master::service_account_private_key_file: "/etc/kubernetes/ssl/server.key" profile::kubernetes::master::service_cluster_ip_range: 10.64.76.0/24 profile::kubernetes::master::etcd_urls: - https://kubestagetcd1001.eqiad.wmnet:2379 -- To view, visit https://gerrit.wikimedia.org/r/386755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I202e547079f6ecf26d65d0ed87031a45019166a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: k8s::controller: support service account token signing
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386754 ) Change subject: k8s::controller: support service account token signing .. k8s::controller: support service account token signing Allow passing the --service-account-private-key-file parameter to controller manager, which will make the controller manager create secrets and tokens for serviceaccounts. Default it to undef so that we maintain backwards compatibility. The feature is enabled via a hiera flag Bug: T177393 Change-Id: Iac29e0b7cabe1f39ee5e49cbc901ce0a2d9c9567 --- M modules/k8s/manifests/controller.pp M modules/k8s/templates/kube-controller-manager.default.erb M modules/profile/manifests/kubernetes/master.pp 3 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/386754/1 diff --git a/modules/k8s/manifests/controller.pp b/modules/k8s/manifests/controller.pp index 8078d8d..af1d03d 100644 --- a/modules/k8s/manifests/controller.pp +++ b/modules/k8s/manifests/controller.pp @@ -1,4 +1,7 @@ -class k8s::controller { +class k8s::controller( +$service_account_private_key_file=undef, +){ + require_package('kubernetes-master') file { '/etc/default/kube-controller-manager': diff --git a/modules/k8s/templates/kube-controller-manager.default.erb b/modules/k8s/templates/kube-controller-manager.default.erb index 2bf7270..52a975a 100644 --- a/modules/k8s/templates/kube-controller-manager.default.erb +++ b/modules/k8s/templates/kube-controller-manager.default.erb @@ -3,5 +3,9 @@ # ## defaults from config and apiserver should be adequate # This is the default anyway in 1.4 at least, but specify to ensure backwards compatibility -DAEMON_ARGS="--leader-elect=true" -# +DAEMON_ARGS=" \ +--leader-elect=true \ +<%- if @service_account_private_key_file -%> +--service_account_private_key_file=<%= @service_account_private_key_file -%> \ +<%- end -%> +" diff --git a/modules/profile/manifests/kubernetes/master.pp b/modules/profile/manifests/kubernetes/master.pp index ec99a56..f3a14be 100644 --- a/modules/profile/manifests/kubernetes/master.pp +++ b/modules/profile/manifests/kubernetes/master.pp @@ -12,6 +12,7 @@ $ssl_cert_path=hiera('profile::kubernetes::master::ssl_cert_path'), $ssl_key_path=hiera('profile::kubernetes::master::ssl_cert_path'), $authz_mode=hiera('profile::kubernetes::master::authz_mode'), + $service_account_private_key_file=hiera('profile::kubernetes::master::service_account_private_key_file', undef), ){ if $expose_puppet_certs { base::expose_puppet_certs { '/etc/kubernetes': @@ -43,7 +44,9 @@ } class { '::k8s::scheduler': } -class { '::k8s::controller': } +class { '::k8s::controller': +service_account_private_key_file => $service_account_private_key_file, +} if $accessible_to == 'all' { -- To view, visit https://gerrit.wikimedia.org/r/386754 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac29e0b7cabe1f39ee5e49cbc901ce0a2d9c9567 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: refactoring bastion into profiles
RobH has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386752 ) Change subject: refactoring bastion into profiles .. refactoring bastion into profiles this is going to be full of errors and mistakes since i haven't refactored into profiles before. this will eventually be tested on bast4002. Change-Id: I5139a2b129eabd8b0067d794490a3d3855867161 --- A modules/profile/manifests/bastionhost/base.pp A modules/profile/manifests/bastionhost/caching.pp A modules/profile/manifests/bastionhost/general.pp A modules/profile/manifests/bastionhost/primary.pp A modules/profile/manifests/bastionhost/twofa.pp 5 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/52/386752/1 diff --git a/modules/profile/manifests/bastionhost/base.pp b/modules/profile/manifests/bastionhost/base.pp new file mode 100644 index 000..afdfe86 --- /dev/null +++ b/modules/profile/manifests/bastionhost/base.pp @@ -0,0 +1,21 @@ +# common settings for all bastion hosts +class profile::bastionhost::base { + +class{'::bastionhost'} +include ::standard +class{'::profile::backup::host'} + +backup::set {'home': } + +class{'::base::firewall'} + + +ferm::service { 'ssh': +desc => 'SSH open from everywhere, this is a bastion host', +prio => '01', +proto => 'tcp', +port => 'ssh', +} + + +} \ No newline at end of file diff --git a/modules/profile/manifests/bastionhost/caching.pp b/modules/profile/manifests/bastionhost/caching.pp new file mode 100644 index 000..05b778a --- /dev/null +++ b/modules/profile/manifests/bastionhost/caching.pp @@ -0,0 +1,6 @@ +class role::bastion::caching { +system::role { $name: } +class{'::profile::bastion::general'} +class{'::ipmi::mgmt'} +class{'::installserver::tftp'} +class{'::prometheus::ops'} diff --git a/modules/profile/manifests/bastionhost/general.pp b/modules/profile/manifests/bastionhost/general.pp new file mode 100644 index 000..7b7ee77 --- /dev/null +++ b/modules/profile/manifests/bastionhost/general.pp @@ -0,0 +1,11 @@ +# General use bastion host (All Users) +class profile::bastionhost::general { +system::role { 'bastionhost::general': +description => 'Bastion host for all shell users', +} + +class{'::profile::bastionhost::base'} +# Used by parsoid deployers +class{'::profile::scap::dsh'} + +} \ No newline at end of file diff --git a/modules/profile/manifests/bastionhost/primary.pp b/modules/profile/manifests/bastionhost/primary.pp new file mode 100644 index 000..f030619 --- /dev/null +++ b/modules/profile/manifests/bastionhost/primary.pp @@ -0,0 +1,4 @@ +class role::bastion::primary { +system::role { $name: } +class{'::profile::bastionhost::general'} +} \ No newline at end of file diff --git a/modules/profile/manifests/bastionhost/twofa.pp b/modules/profile/manifests/bastionhost/twofa.pp new file mode 100644 index 000..1102f22 --- /dev/null +++ b/modules/profile/manifests/bastionhost/twofa.pp @@ -0,0 +1,22 @@ +class profile::bastionhost::twofa { +system::role { 'bastionhost::twofa': +description => 'Bastion host using two factor authentication', +} + +class{'::profile::bastionhost::base'} + +include ::passwords::yubiauth + +require_package('libpam-yubico') + +$api_key = $passwords::yubiauth::api_key + +file { '/etc/pam.d/sshd': +ensure => present, +owner => 'root', +group => 'root', +mode=> '0440', +content => template('profile/bastionhost/pam-sshd.erb'), +require => Package['openssh-server'], +} +} -- To view, visit https://gerrit.wikimedia.org/r/386752 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5139a2b129eabd8b0067d794490a3d3855867161 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Improve handling of 5xx responses to elasticsearch requests
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386741 ) Change subject: Improve handling of 5xx responses to elasticsearch requests .. Improve handling of 5xx responses to elasticsearch requests The Elastica\Response::hasError() method is almost never the one you want to check, on its own at least, to see if a request failed. This only takes into account if the returned json document contains an 'error' key. Other errors, such as a timeout from a proxy in front of elasticsearch which does not return a json document will not trigger hasError. Reviewed current uses of hasError and added checks to Response::isOk() in appropriate places. Also filed upstream bug at https://github.com/ruflin/Elastica/issues/1396 to discuss if this is desired behaviour. Change-Id: I8677ceb9dcbc7dde455894b60b5e5851f309a74b --- M includes/DataSender.php M includes/Elastica/ReindexRequest.php M includes/Maintenance/ConfigUtils.php M includes/Maintenance/IndexCreator.php M includes/Maintenance/Reindexer.php 5 files changed, 17 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/41/386741/1 diff --git a/includes/DataSender.php b/includes/DataSender.php index a539d5f..1989dc3 100644 --- a/includes/DataSender.php +++ b/includes/DataSender.php @@ -416,24 +416,14 @@ ) { $justDocumentMissing = true; foreach ( $exception->getResponseSet()->getBulkResponses() as $bulkResponse ) { - if ( !$bulkResponse->hasError() ) { + if ( $bulkResponse->isOK() && !$bulkResponse->hasError() ) { continue; } $error = $bulkResponse->getFullError(); - if ( is_string( $error ) ) { - // es 1.7 cluster - $message = $bulkResponse->getError(); - if ( false === strpos( $message, 'DocumentMissingException' ) ) { - $justDocumentMissing = false; - continue; - } - } else { - // es 2.x cluster - if ( $error['type'] !== 'document_missing_exception' ) { - $justDocumentMissing = false; - continue; - } + if ( isset( $error['type'] ) && $error['type'] !== 'document_missing_exception' ) { + $justDocumentMissing = false; + continue; } if ( $logCallback ) { diff --git a/includes/Elastica/ReindexRequest.php b/includes/Elastica/ReindexRequest.php index 9fc3610..826c8f4 100644 --- a/includes/Elastica/ReindexRequest.php +++ b/includes/Elastica/ReindexRequest.php @@ -112,7 +112,7 @@ $query['slices'] = $this->slices; $response = $this->client->request( '_reindex', Request::POST, $this->toArray(), $query ); - if ( !$response->isOK() ) { + if ( !$response->isOk() ) { throw new \Exception( $response->hasError() ? 'Failed reindex request: ' . $response->getErrorMessage() : 'Unknown reindex failure: ' . $response->getStatus() diff --git a/includes/Maintenance/ConfigUtils.php b/includes/Maintenance/ConfigUtils.php index 4faf484..d2e10e2 100644 --- a/includes/Maintenance/ConfigUtils.php +++ b/includes/Maintenance/ConfigUtils.php @@ -107,7 +107,7 @@ public function getAllIndicesByType( $typeName ) { $found = null; $response = $this->client->request( $typeName . '*' ); - if ( $response->isOK() ) { + if ( $response->isOK() && !$response->hasError() ) { $found = array_keys( $response->getData() ); } else { $this->error( "Cannot fetch index names for $typeName: " @@ -228,7 +228,7 @@ public function getIndexHealth( $indexName ) { $path = "_cluster/health/$indexName"; $response = $this->client->request( $path ); - if ( $response->hasError() ) { + if ( !$response->isOk() || $response->hasError() ) { throw new \Exception( "Error while fetching index health status: ". $response->getError() ); } return $response->getData(); @@ -273,7 +273,7 @@ } $response = $this->client->request( $indexName . '/_aliases' ); - if ( $response->isOK() ) { + if ( $response->isOK()
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Avoid serialize/parse of mw:dom-fragment-token content
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/385312 ) Change subject: Avoid serialize/parse of mw:dom-fragment-token content .. Avoid serialize/parse of mw:dom-fragment-token content * The contents of "mw:dom-fragment-token"s was being serialized after processing to the DOM and stored on the token to be shuttled through tree building. Only to be reparsed in the unpacking phase. * Here we store a pointer to the contents in a fragment map. * Doing less work results in a performance improvement, though only slightly because the content still needs to be adopted by the main document. Change-Id: Ia0aec7de469101a2a93342ea89daac0f0e73cf1a --- M lib/api/apiUtils.js M lib/config/MWParserEnvironment.js M lib/ext/Cite/index.js M lib/utils/DOMUtils.js M lib/wt2html/pp/handlers/unpackDOMFragments.js M tests/citeParserTests-blacklist.js 6 files changed, 75 insertions(+), 51 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js index 68b3337..b1129fa 100644 --- a/lib/api/apiUtils.js +++ b/lib/api/apiUtils.js @@ -502,7 +502,7 @@ apiUtils.validatePageBundle(pb, env.originalVersion); DU.applyPageBundle(doc, pb); DU.visitDOM(doc.body, DU.loadDataAttribs); - var expansions = DU.extractExpansions(doc.body); + var expansions = DU.extractExpansions(env, doc.body); Object.keys(updates).forEach(function(mode) { switch (mode) { case 'transclusions': diff --git a/lib/config/MWParserEnvironment.js b/lib/config/MWParserEnvironment.js index 3b72173..7673582 100644 --- a/lib/config/MWParserEnvironment.js +++ b/lib/config/MWParserEnvironment.js @@ -168,6 +168,16 @@ this.batcher = new Batcher(this); this.setResourceLimits(); + + // Fragments have had `storeDataAttribs` called on them + this.fragmentMap = new Map(); + this.fid = 1; +}; + +MWParserEnvironment.prototype.setFragment = function(nodes) { + var oid = 'mwf' + this.fid++; + this.fragmentMap.set(oid, nodes); + return oid; }; MWParserEnvironment.prototype.setResourceLimits = function() { diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js index e6c7cf3..0192263 100644 --- a/lib/ext/Cite/index.js +++ b/lib/ext/Cite/index.js @@ -55,7 +55,6 @@ group: null, }, Util.kvToHash(refTok.getAttribute("options"), true)); - var about = manager.env.newAboutId(); var finalCB = function(toks, contentBody) { // Marker meta with ref content var da = Util.clone(refTok.dataAttribs); @@ -63,12 +62,21 @@ da.stx = undefined; da.group = refOpts.group || ''; da.name = refOpts.name || ''; - da.content = contentBody ? DU.ppToXML(contentBody, { innerXML: true }) : ''; - da.hasRefInRef = contentBody ? hasRef(contentBody) : false; + + if (contentBody) { + da.hasRefInRef = hasRef(contentBody); + DU.visitDOM(contentBody, DU.storeDataAttribs); + da.content = manager.env.setFragment(contentBody); + } else { + da.hasRefInRef = false; + da.content = ''; + } + toks.push(new SelfclosingTagTk('meta', [ new KV('typeof', 'mw:Extension/ref/Marker'), - new KV('about', about), + new KV('about', manager.env.newAboutId()), ], da)); + // All done! cb({ tokens: toks, async: false }); }; @@ -192,7 +200,11 @@ 'id': "mw-reference-text-" + ref.target, 'class': "mw-reference-text", }); - DU.ppToDOM(ref.content, { node: reftextSpan }); + if (ref.content) { + var content = env.fragmentMap.get(ref.content); + DU.migrateChildrenBetweenDocs(content, reftextSpan); + DU.visitDOM(reftextSpan, DU.loadDataAttribs); + } li.appendChild(reftextSpan); // Generate leading linkbacks @@ -252,14 +264,18 @@ } }; -ReferencesData.prototype.add = function(groupName, refName, about, skipLinkback) { +ReferencesData.prototype.add = function(env, groupName, refName, about, skipLinkback) { var group = this.getRefGroup(groupName, true); - var ref; refName = makeValidIdAttr(refName); + + var ref; if (refName && group.indexByName.has(refName)) { ref = group.indexByName.get(refName); if (ref.content) { ref.hasMultiples = true; + // Use the non-pp version here since we've already stored attribs +
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temporary disable remex html
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386730 ) Change subject: Temporary disable remex html .. Temporary disable remex html Might be causing major disruption… Bug: T178632 Change-Id: I9a1f54ae451560aa144cdd7c61705541133a0d00 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1d476fb..a263862 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19116,15 +19116,16 @@ 'wgTidyConfig' => [ 'default' => null, - 'mediawikiwiki' => [ 'driver' => 'RemexHtml' ], - 'testwiki' => [ 'driver' => 'RemexHtml' ], + // TEMP disable: T178632 + // 'mediawikiwiki' => [ 'driver' => 'RemexHtml' ], + // 'testwiki' => [ 'driver' => 'RemexHtml' ], - 'fawiki' => [ 'driver' => 'RemexHtml' ], // T176150 - 'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989 + // 'fawiki' => [ 'driver' => 'RemexHtml' ], // T176150 + // 'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989 - 'eswikiversity' => [ 'driver' => 'RemexHtml' ], + // 'eswikiversity' => [ 'driver' => 'RemexHtml' ], - 'wikitech' => [ 'driver' => 'RemexHtml' ], + // 'wikitech' => [ 'driver' => 'RemexHtml' ], ], // Cache ResourceLoader modules in localStorage -- To view, visit https://gerrit.wikimedia.org/r/386730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a1f54ae451560aa144cdd7c61705541133a0d00 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo manGerrit-Reviewer: Hoo man Gerrit-Reviewer: Paladox Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move Beta Features screenshots into modules
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386739 ) Change subject: Move Beta Features screenshots into modules .. Move Beta Features screenshots into modules Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f --- M VisualEditor.hooks.php R modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg R modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg R modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg R modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg 5 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/39/386739/1 diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 3fcc30f..9a86a01 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -686,7 +686,7 @@ public static function onGetBetaPreferences( User $user, array &$preferences ) { $coreConfig = RequestContext::getMain()->getConfig(); - $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . "/VisualEditor"; + $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . "/VisualEditor/modules/ve-wmf"; $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' ); $preferences['visualeditor-enable'] = [ diff --git a/betafeatures-icon-VisualEditor-ltr.svg b/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg similarity index 100% rename from betafeatures-icon-VisualEditor-ltr.svg rename to modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg diff --git a/betafeatures-icon-VisualEditor-rtl.svg b/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg similarity index 100% rename from betafeatures-icon-VisualEditor-rtl.svg rename to modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg diff --git a/betafeatures-icon-WikitextEditor-ltr.svg b/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg similarity index 100% rename from betafeatures-icon-WikitextEditor-ltr.svg rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg diff --git a/betafeatures-icon-WikitextEditor-rtl.svg b/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg similarity index 100% rename from betafeatures-icon-WikitextEditor-rtl.svg rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg -- To view, visit https://gerrit.wikimedia.org/r/386739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add link directly to contribution
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386638 ) Change subject: Add link directly to contribution .. Add link directly to contribution Bug: T178000Z Change-Id: I90cc19697df31e647fc9750fb96e8573d3107ab5 --- M sites/all/modules/large_donation/large_donation.module M sites/all/modules/large_donation/templates/html/notification.en.html 2 files changed, 14 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/sites/all/modules/large_donation/large_donation.module b/sites/all/modules/large_donation/large_donation.module index eeaa051..ca966f8 100644 --- a/sites/all/modules/large_donation/large_donation.module +++ b/sites/all/modules/large_donation/large_donation.module @@ -200,7 +200,7 @@ * @param stdClass $notification */ function large_donation_notification_send( $contribution, $notification ) { -$contribution_link = CRM_Utils_System::url( +$contact_link = CRM_Utils_System::url( 'civicrm/contact/view', array( 'selectedChild' => 'contribute', @@ -211,11 +211,22 @@ 'Contributions' ); +$contribution_link = CRM_Utils_System::url( +'civicrm/contact/view/contribution', +array( +'action' => 'view', +'id' => $contribution->id, +'reset' => 1, +), +true +); + $to = $notification->addressee; $params = array( 'threshold' => floatval( $notification->threshold ), 'contribution' => $contribution, +'contact_link' => $contact_link, 'contribution_link' => $contribution_link, ); diff --git a/sites/all/modules/large_donation/templates/html/notification.en.html b/sites/all/modules/large_donation/templates/html/notification.en.html index 3edc28b..62012c2 100644 --- a/sites/all/modules/large_donation/templates/html/notification.en.html +++ b/sites/all/modules/large_donation/templates/html/notification.en.html @@ -2,16 +2,12 @@ A large donation was made (over {{ threshold }} USD): -contact_id: {{ contribution.contact_id }} - -contribution_id: {{ contribution.id }} - converted amount: {{ contribution.total_amount }} USD original amount: {{ contribution.source }} -Contact contribution in CiviCRM: +View Contributions from Contact in CiviCRM -{{ contribution_link|raw }} +View Contribution in CiviCRM You may need to examine this donation. -- To view, visit https://gerrit.wikimedia.org/r/386638 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90cc19697df31e647fc9750fb96e8573d3107ab5 Gerrit-PatchSet: 7 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: MeppsGerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix recreation of deleted list entries
Gergő Tisza has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386731 ) Change subject: Fix recreation of deleted list entries .. Fix recreation of deleted list entries We have a unique index on list + project + title, so a (soft)deleted entry blocks the creation of another entry with the same project and title in the same list. Instead, let's just repurpose the deleted row. Bug: T179120 Change-Id: Iddbc8af582c93aea182eb356745e34025b67ccae --- M src/ReadingListRepository.php M tests/src/ReadingListRepositoryTest.php 2 files changed, 49 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists refs/changes/31/386731/1 diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php index 4bd7e89..c23eb9c 100644 --- a/src/ReadingListRepository.php +++ b/src/ReadingListRepository.php @@ -371,29 +371,56 @@ throw new ReadingListRepositoryException( 'readinglists-db-error-not-own-list', [ $id ] ); } - $this->dbw->insert( + // due to the combination of soft deletion + unique constraint on + // rle_rl_id + rle_project + rle_title, recreation needs special handling + /** @var ReadingListEntryRow $row */ + $row = $this->dbw->selectRow( 'reading_list_entry', + [ 'rle_id', 'rle_deleted' ], [ 'rle_rl_id' => $id, - 'rle_user_id' => $this->userId, 'rle_project' => $project, 'rle_title' => $title, - 'rle_date_created' => $this->dbw->timestamp(), - 'rle_date_updated' => $this->dbw->timestamp(), - 'rle_deleted' => 0, ], __METHOD__, - // throw custom exception for unique constraint on rle_rl_id + rle_project + rle_title - [ 'IGNORE' ] + // lock the row to avoid race conditions with purgeOldDeleted() in the update case + [ 'FOR UPDATE' ] ); - if ( !$this->dbw->affectedRows() ) { + if ( $row === false ) { + $this->dbw->insert( + 'reading_list_entry', + [ + 'rle_rl_id' => $id, + 'rle_user_id' => $this->userId, + 'rle_project' => $project, + 'rle_title' => $title, + 'rle_date_created' => $this->dbw->timestamp(), + 'rle_date_updated' => $this->dbw->timestamp(), + 'rle_deleted' => 0, + ] + ); + } elseif ( $row->rle_deleted ) { + $this->dbw->update( + 'reading_list_entry', + [ + 'rle_date_created' => $this->dbw->timestamp(), + 'rle_date_updated' => $this->dbw->timestamp(), + 'rle_deleted' => 0, + ], + [ + 'rle_id' => $row->rle_id, + ] + ); + } else { throw new ReadingListRepositoryException( 'readinglists-db-error-duplicate-page' ); } + $insertId = $row ? (int)$row->rle_id : $this->dbw->insertId(); $this->logger->info( 'Added entry {entry} for user {user}', [ - 'entry' => $this->dbw->insertId(), + 'entry' => $insertId, 'user' => $this->userId, + 'recreated' => (bool)$row, ] ); - return $this->dbw->insertId(); + return $insertId; } /** diff --git a/tests/src/ReadingListRepositoryTest.php b/tests/src/ReadingListRepositoryTest.php index 4c21b4f..dfb3071 100644 --- a/tests/src/ReadingListRepositoryTest.php +++ b/tests/src/ReadingListRepositoryTest.php @@ -390,6 +390,18 @@ $this->assertTimestampEquals( wfTimestampNow(), $row->rle_date_updated ); $this->assertEquals( 0, $row->rle_deleted ); + // test that deletion + recreation does not trip the unique contstraint + $repository->deleteListEntry( $entryId ); + $entryId2 = $repository->addListEntry(
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temp. disable remex html
Hoo man has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386730 ) Change subject: Temp. disable remex html .. Temp. disable remex html Due to T178632 Change-Id: I9a1f54ae451560aa144cdd7c61705541133a0d00 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/30/386730/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1d476fb..48b5422 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19116,15 +19116,16 @@ 'wgTidyConfig' => [ 'default' => null, - 'mediawikiwiki' => [ 'driver' => 'RemexHtml' ], - 'testwiki' => [ 'driver' => 'RemexHtml' ], + // TEMP disable: T178632 + //'mediawikiwiki' => [ 'driver' => 'RemexHtml' ], + //'testwiki' => [ 'driver' => 'RemexHtml' ], - 'fawiki' => [ 'driver' => 'RemexHtml' ], // T176150 - 'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989 + //'fawiki' => [ 'driver' => 'RemexHtml' ], // T176150 + //'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989 - 'eswikiversity' => [ 'driver' => 'RemexHtml' ], + //'eswikiversity' => [ 'driver' => 'RemexHtml' ], - 'wikitech' => [ 'driver' => 'RemexHtml' ], + //'wikitech' => [ 'driver' => 'RemexHtml' ], ], // Cache ResourceLoader modules in localStorage -- To view, visit https://gerrit.wikimedia.org/r/386730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a1f54ae451560aa144cdd7c61705541133a0d00 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: build: Upgrade stylelint and related devDependencies to latest
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386726 ) Change subject: build: Upgrade stylelint and related devDependencies to latest .. build: Upgrade stylelint and related devDependencies to latest Change-Id: I4c47f1d290802705d061167fe369c130405512e0 --- M .stylelintrc.json M package.json M resources/src/mediawiki.action/mediawiki.action.history.css M resources/src/mediawiki.legacy/commonPrint.css M resources/src/mediawiki.legacy/shared.css M resources/src/mediawiki.less/mediawiki.ui/mixins.less M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.highlightCircles.seenunseen.less M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less M resources/src/mediawiki.skinning/content.externallinks.css M resources/src/mediawiki.skinning/content.parsoid.less M resources/src/mediawiki.skinning/elements.css M resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less M resources/src/mediawiki.ui/components/checkbox.less M resources/src/mediawiki.ui/components/forms.less M resources/src/mediawiki.ui/components/inputs.less M resources/src/mediawiki.ui/components/radio.less 17 files changed, 79 insertions(+), 80 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/386726/1 diff --git a/.stylelintrc.json b/.stylelintrc.json index 27e289d..a6b858c 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -2,7 +2,6 @@ "extends": "stylelint-config-wikimedia", "rules": { "no-descending-specificity": null, - - "selector-no-id": null + "selector-max-id": null } } diff --git a/package.json b/package.json index 58f48e4..faca87d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "grunt-eslint": "20.1.0", "grunt-jsonlint": "1.1.0", "grunt-karma": "2.0.0", -"grunt-stylelint": "0.8.0", +"grunt-stylelint": "0.9.0", "grunt-webdriver": "2.0.3", "karma": "1.7.1", "karma-chrome-launcher": "2.2.0", @@ -26,8 +26,8 @@ "karma-qunit": "1.2.1", "nodemw": "0.11.0", "qunitjs": "2.4.1", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1", +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2", "wdio-junit-reporter": "0.2.0", "wdio-mocha-framework": "0.5.8", "wdio-sauce-service": "^0.3.1", diff --git a/resources/src/mediawiki.action/mediawiki.action.history.css b/resources/src/mediawiki.action/mediawiki.action.history.css index f3ea163..3c95be9 100644 --- a/resources/src/mediawiki.action/mediawiki.action.history.css +++ b/resources/src/mediawiki.action/mediawiki.action.history.css @@ -1,6 +1,6 @@ /* Styles for the JavaScript enhancements of the history page */ #pagehistory li.before input[name='oldid'], -#pagehistory li.after input[name='diff'] { + #pagehistory li.after input[name='diff'] { visibility: hidden; } diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css index 8ff0634..4dd794b 100644 --- a/resources/src/mediawiki.legacy/commonPrint.css +++ b/resources/src/mediawiki.legacy/commonPrint.css @@ -78,7 +78,7 @@ /* Expand protocol-relative URLs for printing */ .mw-body-content a.external.text[href^='//']:after, -.mw-body-content a.external.autonumber[href^='//']:after { + .mw-body-content a.external.autonumber[href^='//']:after { content: ' (https:' attr( href ) ')'; } diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index 74233d6..ecdfb61 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -56,36 +56,36 @@ /* Input types that should follow user direction, like buttons */ /* TODO: What about buttons in wikipage content ? */ -input[type='submit'], -input[type='button'], -input[type='reset'], -input[type='file'] { +input[ type='submit' ], +input[ type='button' ], +input[ type='reset' ], +input[ type='file' ] { direction: ltr; } /* Override default values */ -textarea[dir='ltr'], -input[dir='ltr'] { +textarea[ dir='ltr' ], +input[ dir='ltr' ] { /* @noflip */ direction: ltr; } -textarea[dir='rtl'], -input[dir='rtl'] { +textarea[ dir='rtl' ], +input[ dir='rtl' ] { /* @noflip */ direction: rtl; } /* Default style for semantic tags */ -abbr[title], -.explain[title] { +abbr[ title ], +.explain[ title ] { border-bottom: 1px dotted; cursor: help; } @supports ( text-decoration: underline dotted ) { - abbr[title], - .explain[title] { + abbr[ title ], + .explain[ title ] { border-bottom: 0; text-decoration: underline dotted; } diff --git
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Mark MediaWiki.UI as deprecated.
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386727 ) Change subject: resources: Mark MediaWiki.UI as deprecated. .. resources: Mark MediaWiki.UI as deprecated. Change-Id: Idd5f898c1b596040be8d14dee0a9893b59d6a532 --- M resources/Resources.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/27/386727/1 diff --git a/resources/Resources.php b/resources/Resources.php index b9986fe..1a2d707 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -360,7 +360,7 @@ /* jQuery UI */ 'jquery.ui.core' => [ - 'deprecated' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.', + 'deprecated' => 'Please use OOUI instead.', 'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js', 'dependencies' => [ 'jquery.ui.core.styles', @@ -2311,6 +2311,7 @@ /* MediaWiki UI */ 'mediawiki.ui' => [ + 'deprecated' => 'Please use OOUI instead.', 'skinStyles' => [ 'default' => [ 'resources/src/mediawiki.ui/default.less', -- To view, visit https://gerrit.wikimedia.org/r/386727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd5f898c1b596040be8d14dee0a9893b59d6a532 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Don't require API read rights to report client-side errors
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386239 ) Change subject: Don't require API read rights to report client-side errors .. Don't require API read rights to report client-side errors Bug: T121800 Change-Id: I41070966033ed51b84d1f42383b4fee1a2bad47d --- M gateway_common/clientError.api.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/gateway_common/clientError.api.php b/gateway_common/clientError.api.php index ec4ef4e..6cb07da 100644 --- a/gateway_common/clientError.api.php +++ b/gateway_common/clientError.api.php @@ -30,4 +30,11 @@ 'stack' => array( ApiBase::PARAM_TYPE => 'string', ApiBase::PARAM_REQUIRED => false ), ); } + + /** +* Don't require API read rights +*/ + public function isReadMode() { + return false; + } } -- To view, visit https://gerrit.wikimedia.org/r/386239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41070966033ed51b84d1f42383b4fee1a2bad47d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: EjeggGerrit-Reviewer: AndyRussG Gerrit-Reviewer: Ejegg Gerrit-Reviewer: Mepps Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Cosmetic fixes for PF_jsGrid.js
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386713 ) Change subject: Cosmetic fixes for PF_jsGrid.js .. Cosmetic fixes for PF_jsGrid.js Change-Id: I06a2fe96f9d1153dd7f468d777e51f72a1e2be6c --- M libs/PF_jsGrid.js 1 file changed, 116 insertions(+), 116 deletions(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/libs/PF_jsGrid.js b/libs/PF_jsGrid.js index 0d4b43c..8a8d8c9 100644 --- a/libs/PF_jsGrid.js +++ b/libs/PF_jsGrid.js @@ -6,132 +6,132 @@ */ /* global jsGrid, mw */ (function(jsGrid, $, undefined) { - /** -* The following code handles the 'date' input type within the grid. -* insertTemplate preprocesses the value and returns it to the grid cell to display; -* editTemplate/insertTemplate generate the edition/insertion forms; -* editValue/insertValue is in charge of putting the final values into the grid. -*/ + /** +* The following code handles the 'date' input type within the grid. +* insertTemplate preprocesses the value and returns it to the grid cell to display; +* editTemplate/insertTemplate generate the edition/insertion forms; +* editValue/insertValue is in charge of putting the final values into the grid. +*/ - // Global variables to store edit and insert values to be used - // by the editValue and insertValue functions to put them into - // the date field. - var Global_Edit_day_of_month; - var Global_Edit_month; - var Global_Edit_year; - var Global_Insert_day_of_month; - var Global_Insert_month; - var Global_Insert_year; + // Global variables to store edit and insert values to be used + // by the editValue and insertValue functions to put them into + // the date field. + var Global_Edit_day_of_month; + var Global_Edit_month; + var Global_Edit_year; + var Global_Insert_day_of_month; + var Global_Insert_month; + var Global_Insert_year; - // Create month selector dropdown. - function buildSelect( currentMonth ) { - var monthNames = mw.config.get('wgMonthNamesShort'); - var str = ''; - for (var val=1; val<=12; val++) { - var val2; - if (val < 10) { //Adds a leading 0 to single digit months, ex 01 instead of 1. - val2 = "0" + val; - } else { - val2 = val; - } - var option = '' + monthNames[val] + ''; - str += option; + // Create month selector dropdown. + function buildSelect( currentMonth ) { + var monthNames = mw.config.get('wgMonthNamesShort'); + var str = ''; + for (var val=1; val<=12; val++) { + var val2; + if (val < 10) { //Adds a leading 0 to single digit months, ex 01 instead of 1. + val2 = "0" + val; + } else { + val2 = val; } - str += ''; - return str; + var option = '' + monthNames[val] + ''; + str += option; } + str += ''; + return str; + } - var PFDateField = function(config) { - jsGrid.Field.call(this, config); - }; + var PFDateField = function(config) { + jsGrid.Field.call(this, config); + }; - PFDateField.prototype = new jsGrid.Field({ - sorter: function(date1, date2) { - return new Date(date1) - new Date(date2); - }, + PFDateField.prototype = new jsGrid.Field({ + sorter: function(date1, date2) { + return new Date(date1) - new Date(date2); + }, - itemTemplate: function(value) { - return value; - }, + itemTemplate: function(value) { + return value; + }, - insertTemplate: function(value) { - var html_date = 'DD:'; - var html_year = ':'; - var html_month = 'MM:' + buildSelect(1) + ''; - var fullDateInputHTML = ''; -
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Cosmetic fixes for PF_jsGrid.js
Yaron Koren has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386713 ) Change subject: Cosmetic fixes for PF_jsGrid.js .. Cosmetic fixes for PF_jsGrid.js Change-Id: I06a2fe96f9d1153dd7f468d777e51f72a1e2be6c --- M libs/PF_jsGrid.js 1 file changed, 116 insertions(+), 116 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/13/386713/2 diff --git a/libs/PF_jsGrid.js b/libs/PF_jsGrid.js index 0d4b43c..8a8d8c9 100644 --- a/libs/PF_jsGrid.js +++ b/libs/PF_jsGrid.js @@ -6,132 +6,132 @@ */ /* global jsGrid, mw */ (function(jsGrid, $, undefined) { - /** -* The following code handles the 'date' input type within the grid. -* insertTemplate preprocesses the value and returns it to the grid cell to display; -* editTemplate/insertTemplate generate the edition/insertion forms; -* editValue/insertValue is in charge of putting the final values into the grid. -*/ + /** +* The following code handles the 'date' input type within the grid. +* insertTemplate preprocesses the value and returns it to the grid cell to display; +* editTemplate/insertTemplate generate the edition/insertion forms; +* editValue/insertValue is in charge of putting the final values into the grid. +*/ - // Global variables to store edit and insert values to be used - // by the editValue and insertValue functions to put them into - // the date field. - var Global_Edit_day_of_month; - var Global_Edit_month; - var Global_Edit_year; - var Global_Insert_day_of_month; - var Global_Insert_month; - var Global_Insert_year; + // Global variables to store edit and insert values to be used + // by the editValue and insertValue functions to put them into + // the date field. + var Global_Edit_day_of_month; + var Global_Edit_month; + var Global_Edit_year; + var Global_Insert_day_of_month; + var Global_Insert_month; + var Global_Insert_year; - // Create month selector dropdown. - function buildSelect( currentMonth ) { - var monthNames = mw.config.get('wgMonthNamesShort'); - var str = ''; - for (var val=1; val<=12; val++) { - var val2; - if (val < 10) { //Adds a leading 0 to single digit months, ex 01 instead of 1. - val2 = "0" + val; - } else { - val2 = val; - } - var option = '' + monthNames[val] + ''; - str += option; + // Create month selector dropdown. + function buildSelect( currentMonth ) { + var monthNames = mw.config.get('wgMonthNamesShort'); + var str = ''; + for (var val=1; val<=12; val++) { + var val2; + if (val < 10) { //Adds a leading 0 to single digit months, ex 01 instead of 1. + val2 = "0" + val; + } else { + val2 = val; } - str += ''; - return str; + var option = '' + monthNames[val] + ''; + str += option; } + str += ''; + return str; + } - var PFDateField = function(config) { - jsGrid.Field.call(this, config); - }; + var PFDateField = function(config) { + jsGrid.Field.call(this, config); + }; - PFDateField.prototype = new jsGrid.Field({ - sorter: function(date1, date2) { - return new Date(date1) - new Date(date2); - }, + PFDateField.prototype = new jsGrid.Field({ + sorter: function(date1, date2) { + return new Date(date1) - new Date(date2); + }, - itemTemplate: function(value) { - return value; - }, + itemTemplate: function(value) { + return value; + }, - insertTemplate: function(value) { - var html_date = 'DD:'; - var html_year = ':'; - var html_month = 'MM:' + buildSelect(1) + ''; - var fullDateInputHTML =
[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Simplify “Contributing” section slightly and add LES...
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386714 ) Change subject: README: Simplify “Contributing” section slightly and add LESS lint hint .. README: Simplify “Contributing” section slightly and add LESS lint hint Bug: T179111 Change-Id: Ic96c09c0f96e1cb697a323d7814de2f8312556bc --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/14/386714/1 diff --git a/README.md b/README.md index 1651ed9..2f7711b 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ * You will need a [Wikitech account](https://wikitech.wikimedia.org/w/index.php?title=Special:UserLogin=Help%3AGetting+Started=signup) which you can use to login to [Gerrit](https://gerrit.wikimedia.org/), our code review system. * You will need a [Wikimedia account](https://www.mediawiki.org/w/index.php?title=Special:UserLogin=signup), which you can [use to login to Phabricator](https://www.mediawiki.org/w/index.php?title=Special:UserLogin=Special%3AOAuth%2Fauthorize=oauth_token%3D2fa60627878b83173e0196040b983326%26oauth_consumer_key%3D038ec949b263dc807b0079fd88538f37). * You should [create a Phabricator ticket](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=PHID-PROJ-dgmoevjqeqlerleqzzx5) describing the issue you wish to change. -* We automatically lint and style-check changes to JavaScript, PHP, CSS, Ruby and JSON files. You can test these yourself with `npm test` and `composer test` locally before pushing changes. SVG files should be squashed in advance of committing with [SVGO](https://github.com/svg/svgo) using `svgo --pretty --disable=removeXMLProcInst --disable=cleanupIDs `. +* We automatically lint and style-check changes to JavaScript, PHP, LESS/CSS, Ruby and JSON files. You can test these yourself with `npm test` and `composer test` locally before pushing changes. SVG files should be squashed in advance of committing with [SVGO](https://github.com/svg/svgo) using `svgo --pretty --disable=removeXMLProcInst --disable=cleanupIDs `. * To submit your patch, follow [the "getting started" quick-guide](https://www.mediawiki.org/wiki/Gerrit/Getting_started). You should expect to get code review within a day or two. -* A new version of the library is cut and released most weeks on Tuesdays. +* A new version of the library is released most weeks on Tuesdays. Versioning -- To view, visit https://gerrit.wikimedia.org/r/386714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic96c09c0f96e1cb697a323d7814de2f8312556bc Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ForcePreview[master]: Convert to extension registration and OOjs-ify
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378996 ) Change subject: Convert to extension registration and OOjs-ify .. Convert to extension registration and OOjs-ify This brings compatibility with modern mediawiki and fixes questionable code choices in previous iterations of the extension. The live preview js is now a proper resourceloader module, and we now use native OOjs UI methods rather than string replacements and hacking around it. Change-Id: If553b4c6248d0d8800afd678ab2c600a9dab7820 --- D ForcePreview.i18n.php M ForcePreview.php A extension.json M i18n/en.json M i18n/qqq.json A modules/ext.ForcePreview.livePreview.js 6 files changed, 113 insertions(+), 144 deletions(-) Approvals: Skizzerz: Looks good to me, approved jenkins-bot: Verified diff --git a/ForcePreview.i18n.php b/ForcePreview.i18n.php deleted file mode 100644 index 7874d20..000 --- a/ForcePreview.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim7df31cd24afdd76f' ) ) { - function wfJsonI18nShim7df31cd24afdd76f( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim7df31cd24afdd76f'; -} diff --git a/ForcePreview.php b/ForcePreview.php index 3cc8c46..f66b72e 100644 --- a/ForcePreview.php +++ b/ForcePreview.php @@ -5,122 +5,46 @@ * @file * @ingroup Extensions * @author Ryan Schmidt - * @license http://en.wikipedia.org/wiki/Public_domain Public domain + * @license MIT * @link http://www.mediawiki.org/wiki/Extension:ForcePreview Documentation */ -if( !defined( 'MEDIAWIKI' ) ) { - echo( "This file is an extension to the MediaWiki software and is not a valid access point" ); - die( 1 ); -} +class ForcePreview { + public static function onEditPageBeforeEditButtons( &$editpage, &$buttons, &$tabindex ) { + $user = $editpage->getContext()->getUser(); + $isInitialLoad = !$editpage->preview && empty( $editpage->save ); -// Extension credits that will show up on Special:Version -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'Force Preview', - 'version' => '1.3.0', - 'author' => 'Ryan Schmidt', - 'descriptionmsg' => 'forcepreview-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:ForcePreview', -); - -// i18n file -$dir = dirname( __FILE__ ) . '/'; -$wgMessagesDirs['ForcePreview'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['ForcePreview'] = $dir . 'ForcePreview.i18n.php'; - -// New user right, allows users to bypass the requirement of previewing before -// saving the page -$wgAvailableRights[] = 'forcepreviewexempt'; - -$wgHooks['EditPageBeforeEditButtons'][] = 'efForcePreview'; -$wgHooks['BeforePageDisplay'][] = 'efForcePreviewLivePreview'; - -//for GroupPermissions manager extension sorting -$wgGPManagerSort['edit'][] = 'forcepreviewexempt'; - -function efForcePreview( &$editpage, &$buttons ) { - global $wgUser; - if( - !$wgUser->isAllowed( 'forcepreviewexempt' ) && - !$editpage->preview && empty( $editpage->save ) - ) - { - $buttons['save'] = str_replace( - '/>', 'disabled="disabled" />', $buttons['save'] - ); - $buttons['save'] = preg_replace( - '/value="' . wfMessage( 'savearticle' )->text() . '"/i', -
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Revert "Log a stack trace for all dedupe queries"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386706 ) Change subject: Revert "Log a stack trace for all dedupe queries" .. Revert "Log a stack trace for all dedupe queries" We don't need it any more, and it's making it impossible to read test failures, plus cluttering up the production logs. This reverts commit 1e33d780795a76dc8ce0c2749086cc0586f7b438. Change-Id: I2b49c7845664ad662506d4448319dfb6878313bb --- M sites/all/modules/wmf_civicrm/wmf_civicrm.module 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module b/sites/all/modules/wmf_civicrm/wmf_civicrm.module index 90ca939..caebbc6 100644 --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module @@ -3994,18 +3994,6 @@ } } -function wmf_civicrm_civicrm_dupeQuery($ruleGroup, $queryType, &$queries) { - $message = "Dedupe queries generated. Query type $queryType. "; - if ( $ruleGroup instanceof CRM_Dedupe_DAO_RuleGroup ) { -$message .= "Rule group: {$ruleGroup->name}. "; - } - $message .= 'Queries : ' . print_r( $queries, true ) . '. '; - $message .= 'Stack trace: ' . CRM_Core_Error::formatBacktrace( debug_backtrace() ); - - watchdog( 'wmf_civicrm', $message, array(), WATCHDOG_INFO ); - return TRUE; -} - /** * Abuse the permissions hook to prevent de-duping without a limit * -- To view, visit https://gerrit.wikimedia.org/r/386706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b49c7845664ad662506d4448319dfb6878313bb Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add property for RDF mapping of external identifiers...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386712 ) Change subject: Revert "Add property for RDF mapping of external identifiers for Wikidata" .. Revert "Add property for RDF mapping of external identifiers for Wikidata" This reverts commit 9e174816cb63fa7186953ae0794159c0795df6a1. Change-Id: I409349801e76ca1ce09739faf80aec7b491b5285 --- M wmf-config/Wikibase.php 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index a32de27..1478ee7 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -143,9 +143,6 @@ $wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager'; // Cirrus usage for wbsearchentities is on $wgWBRepoSettings['entitySearch']['useCirrus'] = true; - - // T178180 - $wgWBRepoSettings['canonicalUriProperty'] = 'P1921'; } if ( $wmgUseWikibaseClient ) { -- To view, visit https://gerrit.wikimedia.org/r/386712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I409349801e76ca1ce09739faf80aec7b491b5285 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo manGerrit-Reviewer: Aude Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add property for RDF mapping of external identifiers...
Hoo man has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386712 ) Change subject: Revert "Add property for RDF mapping of external identifiers for Wikidata" .. Revert "Add property for RDF mapping of external identifiers for Wikidata" This reverts commit 9e174816cb63fa7186953ae0794159c0795df6a1. Change-Id: I409349801e76ca1ce09739faf80aec7b491b5285 --- M wmf-config/Wikibase.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/12/386712/1 diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index a32de27..1478ee7 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -143,9 +143,6 @@ $wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager'; // Cirrus usage for wbsearchentities is on $wgWBRepoSettings['entitySearch']['useCirrus'] = true; - - // T178180 - $wgWBRepoSettings['canonicalUriProperty'] = 'P1921'; } if ( $wmgUseWikibaseClient ) { -- To view, visit https://gerrit.wikimedia.org/r/386712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I409349801e76ca1ce09739faf80aec7b491b5285 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added drop of cargo_tables_template_id DB index
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386705 ) Change subject: Added drop of cargo_tables_template_id DB index .. Added drop of cargo_tables_template_id DB index Unnecessary, and now causes problems with replacement tables. Change-Id: Iec10518689fc30aee19087beac32c231cafe1e3d --- M Cargo.hooks.php M sql/Cargo.mssql.sql M sql/Cargo.pg.sql M sql/Cargo.sql A sql/cargo_tables.patch.index_template_id.mssql.sql A sql/cargo_tables.patch.index_template_id.pg.sql A sql/cargo_tables.patch.index_template_id.sql 7 files changed, 7 insertions(+), 3 deletions(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/Cargo.hooks.php b/Cargo.hooks.php index 1f0adc8..54cb1d3 100755 --- a/Cargo.hooks.php +++ b/Cargo.hooks.php @@ -375,10 +375,13 @@ public static function cargoSchemaUpdates( DatabaseUpdater $updater ) { if ( $updater->getDB()->getType() == 'mysql' || $updater->getDB()->getType() == 'sqlite' ) { $updater->addExtensionField( 'cargo_tables', 'field_helper_tables', __DIR__ . '/sql/cargo_tables.patch.field_helper_tables.sql', true ); + $updater->dropExtensionIndex( 'cargo_tables', 'cargo_tables_template_id', __DIR__ . '/sql/cargo_tables.patch.index_template_id.sql', true ); } elseif ( $updater->getDB()->getType() == 'postgres' ) { $updater->addExtensionField( 'cargo_tables', 'field_helper_tables', __DIR__ . '/sql/cargo_tables.patch.field_helper_tables.pg.sql', true ); + $updater->dropExtensionIndex( 'cargo_tables', 'cargo_tables_template_id', __DIR__ . '/sql/cargo_tables.patch.index_template_id.pg.sql', true ); } elseif ( $updater->getDB()->getType() == 'mssql' ) { $updater->addExtensionField( 'cargo_tables', 'field_helper_tables', __DIR__ . '/sql/cargo_tables.patch.field_helper_tables.mssql.sql', true ); + $updater->dropExtensionIndex( 'cargo_tables', 'cargo_tables_template_id', __DIR__ . '/sql/cargo_tables.patch.index_template_id.mssql.sql', true ); } return true; } diff --git a/sql/Cargo.mssql.sql b/sql/Cargo.mssql.sql index 6d820d9..3b12f48 100644 --- a/sql/Cargo.mssql.sql +++ b/sql/Cargo.mssql.sql @@ -8,7 +8,6 @@ table_schema varchar(max) NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX cargo_tables_template_id ON /*_*/cargo_tables (template_id); CREATE UNIQUE INDEX cargo_tables_main_table ON /*_*/cargo_tables (main_table); CREATE TABLE /*_*/cargo_pages ( diff --git a/sql/Cargo.pg.sql b/sql/Cargo.pg.sql index 81ecc39..f6bfab1 100644 --- a/sql/Cargo.pg.sql +++ b/sql/Cargo.pg.sql @@ -11,7 +11,6 @@ table_schema TEXT NOT NULL ); -CREATE UNIQUE INDEX cargo_tables_template_id ON cargo_tables (template_id); CREATE UNIQUE INDEX cargo_tables_main_table ON cargo_tables (main_table); CREATE SEQUENCE cargo_pages_page_id_seq; diff --git a/sql/Cargo.sql b/sql/Cargo.sql index 34720b5..b0c7e41 100644 --- a/sql/Cargo.sql +++ b/sql/Cargo.sql @@ -6,7 +6,6 @@ table_schema text NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX cargo_tables_template_id ON /*_*/cargo_tables (template_id); CREATE UNIQUE INDEX cargo_tables_main_table ON /*_*/cargo_tables (main_table); CREATE TABLE /*_*/cargo_pages ( diff --git a/sql/cargo_tables.patch.index_template_id.mssql.sql b/sql/cargo_tables.patch.index_template_id.mssql.sql new file mode 100644 index 000..4dbf345 --- /dev/null +++ b/sql/cargo_tables.patch.index_template_id.mssql.sql @@ -0,0 +1 @@ +DROP INDEX cargo_tables.cargo_tables_template_id; \ No newline at end of file diff --git a/sql/cargo_tables.patch.index_template_id.pg.sql b/sql/cargo_tables.patch.index_template_id.pg.sql new file mode 100644 index 000..5d4118d --- /dev/null +++ b/sql/cargo_tables.patch.index_template_id.pg.sql @@ -0,0 +1 @@ +DROP INDEX cargo_tables_template_id; \ No newline at end of file diff --git a/sql/cargo_tables.patch.index_template_id.sql b/sql/cargo_tables.patch.index_template_id.sql new file mode 100644 index 000..8f4ac8f --- /dev/null +++ b/sql/cargo_tables.patch.index_template_id.sql @@ -0,0 +1,2 @@ +ALTER TABLE /*_*/cargo_tables +DROP INDEX cargo_tables_template_id; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/386705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec10518689fc30aee19087beac32c231cafe1e3d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron KorenGerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Update extension for AuthManager
Skizzerz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386711 ) Change subject: Update extension for AuthManager .. Update extension for AuthManager In addition to AuthManager compatibility, this brings it up to modern coding standards regarding array syntax and the like, and converts the extension to use extension registration. Compatibility shims have been removed. Bug: T110293 Change-Id: Ia0caae13109affe6a441f087e31dc83e9856f309 Co-Authored-By: Isarra--- A ExternalWikiPrimaryAuthenticationProvider.php D MediaWikiAuth.i18n.php D MediaWikiAuth.php D MediaWikiAuthPlugin.class.php A PopulateImportedWatchlistJob.php D README D Snoopy.class.php A extension.json M i18n/en.json M i18n/qqq.json D patches/SpecialUserlogin.php-1.17alpha.r67921.patch D patches/SpecialUserlogin.php-1.20.0.patch D patches/SpecialUserlogin.php-1.21.2.patch D patches/SpecialUserlogin.php-1.23.3.patch 14 files changed, 456 insertions(+), 2,116 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth refs/changes/11/386711/1 diff --git a/ExternalWikiPrimaryAuthenticationProvider.php b/ExternalWikiPrimaryAuthenticationProvider.php new file mode 100644 index 000..3d24e68 --- /dev/null +++ b/ExternalWikiPrimaryAuthenticationProvider.php @@ -0,0 +1,364 @@ +cookieJar = new \CookieJar(); + } + + /** +* Attempt to authenticate against a remote wiki's API +* +* We first check to see if the given user exists in the remote wiki; if they do not +* then we abstain from this auth provider (as the username may be handled by a different +* provider). If they exist, we attempt to auth against that username with our provided +* password, and return the result (PASS/FAIL). +* +* Once the user successfully authenticates, we import their Preferences and Watchlist from +* the remote wiki and prompt them to change their password. +*/ + public function beginPrimaryAuthentication( array $reqs ) { + $req = AuthenticationRequest::getRequestByClass( $reqs, PasswordAuthenticationRequest::class ); + if ( !$req ) { + return AuthenticationResponse::newAbstain(); + } + + if ( $req->username === null || $req->password === null ) { + return AuthenticationResponse::newAbstain(); + } + + // Check if the user exists on the local wiki. If so, do not attempt to auth against the remote one. + // if $existingUser is false, that means username validation failed so we won't be able to auth with + // this name anyway once the account does exist. + $existingUser = User::newFromName( $req->username, 'usable' ); + if ( $existingUser === false || $existingUser->getId() !== 0 ) { + return AuthenticationResponse::newAbstain(); + } + + $username = $existingUser->getName(); + + // Check for username existence on other wiki + if ( !$this->testUserExists( $username ) ) { + return AuthenticationResponse::newAbstain(); + } + + // Grab remote MediaWiki version; our auth flow depends on what we get back + $resp = $this->apiRequest( 'GET', [ + 'action' => 'query', + 'meta' => 'siteinfo', + 'siprop' => 'general' + ], [], __METHOD__ ); + // generator is of the form 'MediaWiki X.X.X'; strip MediaWiki from out front + $remoteVersion = substr( $resp->query->general->generator, 10 ); + + if ( version_compare( $remoteVersion, '1.27', '<' ) ) { + // use old login API + $resp = $this->apiRequest( 'POST', [ + 'action' => 'login' + ], [ + 'lgname' => $username, + 'lgpassword' => $req->password + ], __METHOD__ ); + + if ( $resp->login->result === 'NeedToken' ) { + $loginToken = $resp->login->token; + + $resp = $this->apiRequest( 'POST', [ + 'action' => 'login' + ], [ + 'lgname' => $username, + 'lgpassword' => $req->password, + 'lgtoken' => $loginToken + ], __METHOD__ ); + } + + if ( $resp->login->result !== 'Success' ) { + $this->logger->info( 'Authentication
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added drop of cargo_tables_template_id DB index
Yaron Koren has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386705 ) Change subject: Added drop of cargo_tables_template_id DB index .. Added drop of cargo_tables_template_id DB index Unnecessary, and now causes problems with replacement tables. Change-Id: Iec10518689fc30aee19087beac32c231cafe1e3d --- M Cargo.hooks.php M sql/Cargo.mssql.sql M sql/Cargo.pg.sql M sql/Cargo.sql A sql/cargo_tables.patch.index_template_id.mssql.sql A sql/cargo_tables.patch.index_template_id.pg.sql A sql/cargo_tables.patch.index_template_id.sql 7 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/05/386705/2 diff --git a/Cargo.hooks.php b/Cargo.hooks.php index 1f0adc8..54cb1d3 100755 --- a/Cargo.hooks.php +++ b/Cargo.hooks.php @@ -375,10 +375,13 @@ public static function cargoSchemaUpdates( DatabaseUpdater $updater ) { if ( $updater->getDB()->getType() == 'mysql' || $updater->getDB()->getType() == 'sqlite' ) { $updater->addExtensionField( 'cargo_tables', 'field_helper_tables', __DIR__ . '/sql/cargo_tables.patch.field_helper_tables.sql', true ); + $updater->dropExtensionIndex( 'cargo_tables', 'cargo_tables_template_id', __DIR__ . '/sql/cargo_tables.patch.index_template_id.sql', true ); } elseif ( $updater->getDB()->getType() == 'postgres' ) { $updater->addExtensionField( 'cargo_tables', 'field_helper_tables', __DIR__ . '/sql/cargo_tables.patch.field_helper_tables.pg.sql', true ); + $updater->dropExtensionIndex( 'cargo_tables', 'cargo_tables_template_id', __DIR__ . '/sql/cargo_tables.patch.index_template_id.pg.sql', true ); } elseif ( $updater->getDB()->getType() == 'mssql' ) { $updater->addExtensionField( 'cargo_tables', 'field_helper_tables', __DIR__ . '/sql/cargo_tables.patch.field_helper_tables.mssql.sql', true ); + $updater->dropExtensionIndex( 'cargo_tables', 'cargo_tables_template_id', __DIR__ . '/sql/cargo_tables.patch.index_template_id.mssql.sql', true ); } return true; } diff --git a/sql/Cargo.mssql.sql b/sql/Cargo.mssql.sql index 6d820d9..3b12f48 100644 --- a/sql/Cargo.mssql.sql +++ b/sql/Cargo.mssql.sql @@ -8,7 +8,6 @@ table_schema varchar(max) NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX cargo_tables_template_id ON /*_*/cargo_tables (template_id); CREATE UNIQUE INDEX cargo_tables_main_table ON /*_*/cargo_tables (main_table); CREATE TABLE /*_*/cargo_pages ( diff --git a/sql/Cargo.pg.sql b/sql/Cargo.pg.sql index 81ecc39..f6bfab1 100644 --- a/sql/Cargo.pg.sql +++ b/sql/Cargo.pg.sql @@ -11,7 +11,6 @@ table_schema TEXT NOT NULL ); -CREATE UNIQUE INDEX cargo_tables_template_id ON cargo_tables (template_id); CREATE UNIQUE INDEX cargo_tables_main_table ON cargo_tables (main_table); CREATE SEQUENCE cargo_pages_page_id_seq; diff --git a/sql/Cargo.sql b/sql/Cargo.sql index 34720b5..b0c7e41 100644 --- a/sql/Cargo.sql +++ b/sql/Cargo.sql @@ -6,7 +6,6 @@ table_schema text NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX cargo_tables_template_id ON /*_*/cargo_tables (template_id); CREATE UNIQUE INDEX cargo_tables_main_table ON /*_*/cargo_tables (main_table); CREATE TABLE /*_*/cargo_pages ( diff --git a/sql/cargo_tables.patch.index_template_id.mssql.sql b/sql/cargo_tables.patch.index_template_id.mssql.sql new file mode 100644 index 000..4dbf345 --- /dev/null +++ b/sql/cargo_tables.patch.index_template_id.mssql.sql @@ -0,0 +1 @@ +DROP INDEX cargo_tables.cargo_tables_template_id; \ No newline at end of file diff --git a/sql/cargo_tables.patch.index_template_id.pg.sql b/sql/cargo_tables.patch.index_template_id.pg.sql new file mode 100644 index 000..5d4118d --- /dev/null +++ b/sql/cargo_tables.patch.index_template_id.pg.sql @@ -0,0 +1 @@ +DROP INDEX cargo_tables_template_id; \ No newline at end of file diff --git a/sql/cargo_tables.patch.index_template_id.sql b/sql/cargo_tables.patch.index_template_id.sql new file mode 100644 index 000..8f4ac8f --- /dev/null +++ b/sql/cargo_tables.patch.index_template_id.sql @@ -0,0 +1,2 @@ +ALTER TABLE /*_*/cargo_tables +DROP INDEX cargo_tables_template_id; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/386705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec10518689fc30aee19087beac32c231cafe1e3d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron KorenGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Unicode section links on mediawiki.org
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386710 ) Change subject: Enable Unicode section links on mediawiki.org .. Enable Unicode section links on mediawiki.org Bug: T175725 Change-Id: I5ddd24b90d62734f9b328e407699ce3ebeea1d99 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/10/386710/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8589c18..ecdba0d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19647,6 +19647,7 @@ 'default' => [ 'legacy', 'html5' ], 'testwiki' => [ 'html5', 'legacy' ], 'test2wiki' => [ 'html5', 'legacy' ], + 'mediawikiwiki' => [ 'html5', 'legacy' ], 'ruwiki' => [ 'html5', 'legacy' ], 'ruwikibooks' => [ 'html5', 'legacy' ], 'ruwikimedia' => [ 'html5', 'legacy' ], -- To view, visit https://gerrit.wikimedia.org/r/386710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ddd24b90d62734f9b328e407699ce3ebeea1d99 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Simplify and move “Versioning” section
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386709 ) Change subject: README: Simplify and move “Versioning” section .. README: Simplify and move “Versioning” section Change-Id: I4d9f741561f9dfa148c38473675e2ab4fc678497 --- M README.md 1 file changed, 10 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/386709/1 diff --git a/README.md b/README.md index b893890..1651ed9 100644 --- a/README.md +++ b/README.md @@ -46,18 +46,6 @@ Furthermore, every CSS file has a right-to-left (RTL) version available, to be used on pages using right-to-left languages if your environment doesn't automatically flip them as needed. -Versioning --- - -We use the Semantic Versioning guidelines as much as possible. - -Releases will be numbered in the following format: - -`..` - -For more information on SemVer, please visit http://semver.org/. - - Issue tracker - @@ -77,6 +65,16 @@ * A new version of the library is cut and released most weeks on Tuesdays. +Versioning +-- + +We use the [Semantic Versioning guidelines](http://semver.org/). + +Releases will be numbered in the following format: + +`..` + + Release -- -- To view, visit https://gerrit.wikimedia.org/r/386709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d9f741561f9dfa148c38473675e2ab4fc678497 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/dashiki[master]: Configure dygraphs so Y-axis starts at '0'
Milimetric has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386708 ) Change subject: Configure dygraphs so Y-axis starts at '0' .. Configure dygraphs so Y-axis starts at '0' Bug: T178602 Change-Id: I8a302226b812253a39667d49f4bb3e4553ed3c03 --- M src/components/visualizers/dygraphs-timeseries/bindings.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Milimetric: Verified; Looks good to me, approved diff --git a/src/components/visualizers/dygraphs-timeseries/bindings.js b/src/components/visualizers/dygraphs-timeseries/bindings.js index 38322a4..287b2df 100644 --- a/src/components/visualizers/dygraphs-timeseries/bindings.js +++ b/src/components/visualizers/dygraphs-timeseries/bindings.js @@ -43,6 +43,7 @@ y: { valueFormatter: val.format, axisLabelFormatter: val.format, +valueRange: [0] }, }, labels: ['Date'], -- To view, visit https://gerrit.wikimedia.org/r/386708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a302226b812253a39667d49f4bb3e4553ed3c03 Gerrit-PatchSet: 1 Gerrit-Project: analytics/dashiki Gerrit-Branch: master Gerrit-Owner: NuriaGerrit-Reviewer: Fdans Gerrit-Reviewer: Milimetric ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: build: Update stylelint 0.4.1->0.4.2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386701 ) Change subject: build: Update stylelint 0.4.1->0.4.2 .. build: Update stylelint 0.4.1->0.4.2 Change-Id: I9d67e4224eb6298e20574a201559ab3a7504 --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css M package.json 4 files changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css index 9c70a2f..873e200 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css @@ -45,7 +45,7 @@ /*! * Increase z-index of surface container so it appears above the debug bar */ -.ve-init-mw-desktopArticleTarget #bodyContent { /* stylelint-disable-line selector-no-id */ +.ve-init-mw-desktopArticleTarget #bodyContent { /* stylelint-disable-line selector-max-id */ z-index: 1; } diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css index 7ac789a..4c1612d 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css @@ -5,7 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ /*! * State| classes @@ -66,7 +66,7 @@ .ve-activated #content { position: relative; } -/* stylelint-enable selector-no-id */ +/* stylelint-enable selector-max-id */ .ve-init-mw-desktopArticleTarget-loading-overlay { position: absolute; diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css index 62cb087..4fe6293 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css @@ -5,7 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ /* Hide VE edit tab and section edit things for noscript users. * For script users they're always visible unless and until ve-not-available is added. @@ -19,7 +19,7 @@ display: none; } -/* stylelint-enable selector-no-id */ +/* stylelint-enable selector-max-id */ /* For script users, expand brackets by default, unless and until ve-not-available is added */ diff --git a/package.json b/package.json index fffb4a6..4c536b9 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "jimp": "0.2.24", "mocha": "2.5.3", "selenium-webdriver": "2.53.2", - "stylelint": "7.8.0", - "stylelint-config-wikimedia": "0.4.1" + "stylelint": "8.2.0", + "stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/386701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d67e4224eb6298e20574a201559ab3a7504 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Minerva owns BacktoTopOverlay
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386702 ) Change subject: Minerva owns BacktoTopOverlay .. Minerva owns BacktoTopOverlay Not used in MobileFrontend so it is moved here from that repo. t r Change-Id: I97e6010026daf4c6610bcfbedf140fb2a45b1130 --- M minerva.less/minerva.variables.less A resources/skins.minerva.backtotop/BackToTopOverlay.hogan A resources/skins.minerva.backtotop/BackToTopOverlay.js A resources/skins.minerva.backtotop/backtotop.less M resources/skins.minerva.backtotop/init.js M skin.json 6 files changed, 107 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/minerva.less/minerva.variables.less b/minerva.less/minerva.variables.less index f721b32..968e3eb 100644 --- a/minerva.less/minerva.variables.less +++ b/minerva.less/minerva.variables.less @@ -107,3 +107,6 @@ // Print specific @printBorderColor: #9aa0a7; @printBorderColorLight: @colorGray12; + +// z-index: +@z-indexOverlay: 1; diff --git a/resources/skins.minerva.backtotop/BackToTopOverlay.hogan b/resources/skins.minerva.backtotop/BackToTopOverlay.hogan new file mode 100644 index 000..1dd5be9 --- /dev/null +++ b/resources/skins.minerva.backtotop/BackToTopOverlay.hogan @@ -0,0 +1 @@ + diff --git a/resources/skins.minerva.backtotop/BackToTopOverlay.js b/resources/skins.minerva.backtotop/BackToTopOverlay.js new file mode 100644 index 000..eecf7c0 --- /dev/null +++ b/resources/skins.minerva.backtotop/BackToTopOverlay.js @@ -0,0 +1,46 @@ +( function ( M, $ ) { + + var View = M.require( 'mobile.startup/View' ); + + /** +* Displays a little arrow at the bottom right of the viewport. +* @class BackToTopOverlay +* @extends View +*/ + function BackToTopOverlay() { + View.apply( this, arguments ); + } + + OO.mfExtend( BackToTopOverlay, View, { + className: 'backtotop', + template: mw.template.get( 'skins.minerva.backtotop', 'BackToTopOverlay.hogan' ), + events: $.extend( {}, View.prototype.events, { + click: 'onBackToTopClick' + } ), + + /** +* Show the back to top element, if it's not visible already. +*/ + show: function () { + this.$el.css( 'visibility', 'visible' ).addClass( 'visible' ); + }, + + /** +* Hide the back to top element, if it's visible. +*/ + hide: function () { + this.$el.removeClass( 'visible' ); + }, + + /** +* Handles the click on the "Back to top" element and scrolls back +* to the top smoothly. +*/ + onBackToTopClick: function () { + $( 'html, body' ).animate( { scrollTop: 0 }, 400 ); + } + } ); + + M.define( 'skins.minerva.backtotop/BackToTopOverlay', BackToTopOverlay ); + +}( mw.mobileFrontend, jQuery ) ); diff --git a/resources/skins.minerva.backtotop/backtotop.less b/resources/skins.minerva.backtotop/backtotop.less new file mode 100644 index 000..c9f24d0 --- /dev/null +++ b/resources/skins.minerva.backtotop/backtotop.less @@ -0,0 +1,47 @@ +@import 'minerva.variables'; +@import 'mediawiki.mixins.less'; + +.backtotop { + /* initially hide the element */ + visibility: hidden; + opacity: 0; + + /* basic styling */ + position: fixed; + width: 2.5em; + height: 2.5em; + border-radius: 100%; + box-shadow: 0.1em 0.2em 0.3em @colorGray12; + bottom: 20px; + right: 0; + cursor: pointer; + z-index: @z-indexOverlay; + background-color: @colorProgressive; + + /* define what happens, if the visible class is added/removed, add a nice fade out/in */ + .transition( opacity 0.5s 0s ); + + &.visible { + &:hover { + opacity: 1; + } + opacity: 0.8; + } + + > .arrow-up { + width: 0; + height: 0; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #fff; + position: absolute; + top: 50%; + left: 50%; + transform: translate( -50%, -50% ); + } + + /* center arrow in RTL wikis */ + .rtl > & .arrow-up { + transform: translate( 50%, -50% ); + } +} diff --git a/resources/skins.minerva.backtotop/init.js b/resources/skins.minerva.backtotop/init.js index 39cc340..f6553a6 100644 --- a/resources/skins.minerva.backtotop/init.js +++ b/resources/skins.minerva.backtotop/init.js @@ -1,5 +1,5 @@ (
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Notification icon should not show NaN for persian Wikipedia
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/385016 ) Change subject: Notification icon should not show NaN for persian Wikipedia .. Notification icon should not show NaN for persian Wikipedia Bug: T172755 Change-Id: I2884c8daed3fe0e0d05c746ec6319956b7426957 --- M includes/skins/SkinMinerva.php M includes/skins/minerva.mustache M includes/skins/secondaryButton.mustache M resources/skins.minerva.notifications.badge/NotificationBadge.js M skin.json M tests/phpunit/skins/SkinMinervaTest.php M tests/qunit/skins.minerva.notifications.badge/test_NotificationBadge.js 7 files changed, 50 insertions(+), 13 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 584f6f1..52242d1 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -365,6 +365,7 @@ // Set user button to empty string by default $tpl->set( 'secondaryButtonData', '' ); $notificationsTitle = ''; + $count = 0; $countLabel = ''; $isZero = true; $hasUnseen = false; @@ -411,7 +412,8 @@ 'notificationIconClass' => MinervaUI::iconClass( 'notifications' ), 'title' => $notificationsMsg, 'url' => $url, - 'notificationCount' => $countLabel, + 'notificationCountRaw' => $count, + 'notificationCountString' => $countLabel, 'isNotificationCountZero' => $isZero, 'hasNotifications' => $hasUnseen, 'hasUnseenNotifications' => $hasUnseen diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache index e43504d..4d0b1c1 100644 --- a/includes/skins/minerva.mustache +++ b/includes/skins/minerva.mustache @@ -32,4 +32,4 @@ {{>footer}} - + diff --git a/includes/skins/secondaryButton.mustache b/includes/skins/secondaryButton.mustache index 59bd982..fda9035 100644 --- a/includes/skins/secondaryButton.mustache +++ b/includes/skins/secondaryButton.mustache @@ -10,8 +10,8 @@ class="notification-count user-button {{#hasUnseenNotifications}}notification-unseen{{/hasUnseenNotifications}} {{#isNotificationCountZero}}zero{{/isNotificationCountZero}}"> - - {{notificationCount}} + + {{notificationCountString}} diff --git a/resources/skins.minerva.notifications.badge/NotificationBadge.js b/resources/skins.minerva.notifications.badge/NotificationBadge.js index f6a9e84..87293c4 100644 --- a/resources/skins.minerva.notifications.badge/NotificationBadge.js +++ b/resources/skins.minerva.notifications.badge/NotificationBadge.js @@ -14,6 +14,7 @@ */ function NotificationBadge( options ) { var $el, + count = 0, el = options.el; if ( el ) { @@ -22,11 +23,12 @@ options.hasNotifications = options.hasUnseenNotifications; options.title = $el.find( 'a' ).attr( 'title' ); options.url = $el.find( 'a' ).attr( 'href' ); - options.notificationCount = parseInt( $el.find( 'span' ).text(), 10 ); + count = Number( $el.find( 'span' ).data( 'notification-count' ) ); } View.call( this, options ); this.url = this.$el.find( 'a' ).attr( 'href' ); this._bindOverlayManager(); + this.setCount( count ); } OO.mfExtend( NotificationBadge, View, { @@ -35,14 +37,14 @@ * @cfg {String} defaults.notificationIconClass e.g. mw-ui-icon for icon * @cfg {String} defaults.loadingIconHtml for spinner * @cfg {Boolean} defaults.hasUnseenNotifications whether the user has unseen notifications -* @cfg {Number} defaults.notificationCount number of unread notifications -*/ +* @cfg {Number} defaults.notificationCountRaw number of unread notifications +*/ defaults: { notificationIconClass: notificationIcon.getClassName(), loadingIconHtml: icons.spinner().toHtmlString(), hasNotifications: false, hasUnseenNotifications: false, - notificationCount: 0 + notificationCountRaw: 0 }, isBorderBox: false, /** @@ -126,7 +128,13
[MediaWiki-commits] [Gerrit] analytics/dashiki[master]: Configure dygraphs so Y-axis starts at '0'
Nuria has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386708 ) Change subject: Configure dygraphs so Y-axis starts at '0' .. Configure dygraphs so Y-axis starts at '0' Bug: T178602 Change-Id: I8a302226b812253a39667d49f4bb3e4553ed3c03 --- M src/components/visualizers/dygraphs-timeseries/bindings.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki refs/changes/08/386708/1 diff --git a/src/components/visualizers/dygraphs-timeseries/bindings.js b/src/components/visualizers/dygraphs-timeseries/bindings.js index 38322a4..287b2df 100644 --- a/src/components/visualizers/dygraphs-timeseries/bindings.js +++ b/src/components/visualizers/dygraphs-timeseries/bindings.js @@ -43,6 +43,7 @@ y: { valueFormatter: val.format, axisLabelFormatter: val.format, +valueRange: [0] }, }, labels: ['Date'], -- To view, visit https://gerrit.wikimedia.org/r/386708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a302226b812253a39667d49f4bb3e4553ed3c03 Gerrit-PatchSet: 1 Gerrit-Project: analytics/dashiki Gerrit-Branch: master Gerrit-Owner: Nuria___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Caches: Disable LRO
BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379801 ) Change subject: Caches: Disable LRO .. Caches: Disable LRO Change-Id: If88406ffc061eedab624533275493b181fff3fb2 --- M modules/cacheproxy/manifests/performance.pp 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/cacheproxy/manifests/performance.pp b/modules/cacheproxy/manifests/performance.pp index 699202a..92918da 100644 --- a/modules/cacheproxy/manifests/performance.pp +++ b/modules/cacheproxy/manifests/performance.pp @@ -5,6 +5,8 @@ # tweaks to support heavy load/traffic. class cacheproxy::performance { +$iface_primary = $facts['interface_primary'] + # Bump min_free_kbytes to ensure network buffers are available quickly # without having to evict cache on the spot vm::min_free_kbytes { 'cache': @@ -29,21 +31,28 @@ # Larger TX queue len for 10Gbps+ interface::txqueuelen { $name: -interface => $facts['interface_primary'], +interface => $iface_primary, len => 1, } # Max for bnx2x/BCM57800, seems to eliminate the spurious rx drops under heavy traffic interface::ring { "${name} rxring": -interface => $facts['interface_primary'], +interface => $iface_primary, setting => 'rx', value => 4078, +} + +# Disable LRO to avoid merging important headers for flow control and such +interface::offload { "${iface_primary}-lro": +interface => $iface_primary, +setting => 'lro', +value => 'off', } # RPS/RSS to spread network i/o evenly. Note this enables FQ as well, # which must be enabled before turning on BBR congestion control below interface::rps { 'primary': -interface => $facts['interface_primary'], +interface => $iface_primary, qdisc => 'fq flow_limit 300 buckets 8192 maxrate 1gbit', before=> Sysctl::Parameters['cache proxy network tuning'], } -- To view, visit https://gerrit.wikimedia.org/r/379801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If88406ffc061eedab624533275493b181fff3fb2 Gerrit-PatchSet: 11 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlackGerrit-Reviewer: BBlack Gerrit-Reviewer: Ema Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix overflowing mw-gallery images
Mholloway has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386707 ) Change subject: Fix overflowing mw-gallery images .. Fix overflowing mw-gallery images Updates pagelib to 4.7.1, which adds a fix for the "overflowing images" bug. Bug: T176753 Change-Id: Ic4d04159ce6457630e1510d4a2b19738bc85f81b --- M app/src/main/assets/bundle.js M app/src/main/assets/preview.js M www/package-lock.json M www/package.json 4 files changed, 38 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/07/386707/1 diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js index 5aeed8d..97d8f6d 100644 --- a/app/src/main/assets/bundle.js +++ b/app/src/main/assets/bundle.js @@ -3191,6 +3191,9 @@ if (parentElement.style.width) { parentElement.style.width = '100%'; } +if (parentElement.style.height) { + parentElement.style.height = 'auto'; +} if (parentElement.style.maxWidth) { parentElement.style.maxWidth = '100%'; } diff --git a/app/src/main/assets/preview.js b/app/src/main/assets/preview.js index d5764d7..c890a04 100644 --- a/app/src/main/assets/preview.js +++ b/app/src/main/assets/preview.js @@ -2379,6 +2379,9 @@ if (parentElement.style.width) { parentElement.style.width = '100%'; } +if (parentElement.style.height) { + parentElement.style.height = 'auto'; +} if (parentElement.style.maxWidth) { parentElement.style.maxWidth = '100%'; } diff --git a/www/package-lock.json b/www/package-lock.json index c16fe0f..93aea1b 100644 --- a/www/package-lock.json +++ b/www/package-lock.json @@ -2,6 +2,22 @@ "requires": true, "lockfileVersion": 1, "dependencies": { +"JSONStream": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz;, + "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "dev": true, + "requires": { +"jsonparse": "1.3.1", +"through": "2.3.8" + } +}, +"JSV": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz;, + "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=", + "dev": true +}, "abbrev": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz;, @@ -211,9 +227,9 @@ "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=", "dev": true, "requires": { +"JSONStream": "1.3.1", "combine-source-map": "0.7.2", "defined": "1.0.0", -"JSONStream": "1.3.1", "through2": "2.0.3", "umd": "3.0.1" } @@ -241,6 +257,7 @@ "integrity": "sha1-CJo0Y69Y0OSNjNQHCz90ZU1avKk=", "dev": true, "requires": { +"JSONStream": "1.3.1", "assert": "1.4.1", "browser-pack": "6.0.2", "browser-resolve": "1.11.2", @@ -262,7 +279,6 @@ "https-browserify": "1.0.0", "inherits": "2.0.3", "insert-module-globals": "7.0.1", -"JSONStream": "1.3.1", "labeled-stream-splicer": "2.0.0", "module-deps": "4.1.1", "os-browserify": "0.1.2", @@ -400,18 +416,12 @@ "integrity": "sha1-BxPLdYckemMqnwjPG9FpuHi2Koo=", "dev": true, "requires": { -"browserify-cache-api": "3.0.1", "JSONStream": "0.10.0", +"browserify-cache-api": "3.0.1", "through2": "2.0.3", "xtend": "4.0.1" }, "dependencies": { -"jsonparse": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz;, - "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=", - "dev": true -}, "JSONStream": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz;, @@ -421,6 +431,12 @@ "jsonparse": "0.0.5", "through": "2.3.8" } +}, +"jsonparse": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz;, + "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=", + "dev": true } } }, @@ -1614,10 +1630,10 @@ "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=", "dev": true, "requires": { +"JSONStream": "1.3.1", "combine-source-map": "0.7.2", "concat-stream": "1.5.2", "is-buffer": "1.1.5", -"JSONStream": "1.3.1", "lexical-scope": "1.2.0", "process": "0.11.10", "through2": "2.0.3", @@ -1810,22 +1826,6 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, -"JSONStream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz;, -
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Revert "Log a stack trace for all dedupe queries"
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386706 ) Change subject: Revert "Log a stack trace for all dedupe queries" .. Revert "Log a stack trace for all dedupe queries" We don't need it any more, and it's making it impossible to read test failures, plus cluttering up the production logs. This reverts commit 1e33d780795a76dc8ce0c2749086cc0586f7b438. Change-Id: I2b49c7845664ad662506d4448319dfb6878313bb --- M sites/all/modules/wmf_civicrm/wmf_civicrm.module 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/06/386706/1 diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module b/sites/all/modules/wmf_civicrm/wmf_civicrm.module index 90ca939..caebbc6 100644 --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module @@ -3994,18 +3994,6 @@ } } -function wmf_civicrm_civicrm_dupeQuery($ruleGroup, $queryType, &$queries) { - $message = "Dedupe queries generated. Query type $queryType. "; - if ( $ruleGroup instanceof CRM_Dedupe_DAO_RuleGroup ) { -$message .= "Rule group: {$ruleGroup->name}. "; - } - $message .= 'Queries : ' . print_r( $queries, true ) . '. '; - $message .= 'Stack trace: ' . CRM_Core_Error::formatBacktrace( debug_backtrace() ); - - watchdog( 'wmf_civicrm', $message, array(), WATCHDOG_INFO ); - return TRUE; -} - /** * Abuse the permissions hook to prevent de-duping without a limit * -- To view, visit https://gerrit.wikimedia.org/r/386706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b49c7845664ad662506d4448319dfb6878313bb Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Back to top is now owned by Minerva skin
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386704 ) Change subject: Back to top is now owned by Minerva skin .. Back to top is now owned by Minerva skin Depends-On: I97e6010026daf4c6610bcfbedf140fb2a45b1130 Change-Id: I45db9032a16f1a10e050936962c925e1eb866a47 --- M extension.json D resources/mobile.backtotop/BackToTopOverlay.hogan D resources/mobile.backtotop/BackToTopOverlay.js D resources/mobile.backtotop/backtotop.less 4 files changed, 0 insertions(+), 122 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/04/386704/1 diff --git a/extension.json b/extension.json index 660f250..60fb307 100644 --- a/extension.json +++ b/extension.json @@ -256,25 +256,6 @@ "resources/mobile.ajax.styles/spinner.less" ] }, - "mobile.backtotop": { - "targets": [ - "mobile", - "desktop" - ], - "dependencies": [ - "mobile.startup", - "mobile.toggle" - ], - "scripts": [ - "resources/mobile.backtotop/BackToTopOverlay.js" - ], - "styles": [ - "resources/mobile.backtotop/backtotop.less" - ], - "templates": { - "BackToTopOverlay.hogan": "resources/mobile.backtotop/BackToTopOverlay.hogan" - } - }, "mobile.startup.images": { "class": "ResourceLoaderImageModule", "selector": ".mw-ui-icon-{name}:before", diff --git a/resources/mobile.backtotop/BackToTopOverlay.hogan b/resources/mobile.backtotop/BackToTopOverlay.hogan deleted file mode 100644 index 1dd5be9..000 --- a/resources/mobile.backtotop/BackToTopOverlay.hogan +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/mobile.backtotop/BackToTopOverlay.js b/resources/mobile.backtotop/BackToTopOverlay.js deleted file mode 100644 index 452aed1..000 --- a/resources/mobile.backtotop/BackToTopOverlay.js +++ /dev/null @@ -1,55 +0,0 @@ -( function ( M, $ ) { - - var View = M.require( 'mobile.startup/View' ); - - /** -* Displays a little arrow at the bottom right of the viewport. -* @class BackToTopOverlay -* @extends View -*/ - function BackToTopOverlay() { - View.apply( this, arguments ); - } - - OO.mfExtend( BackToTopOverlay, View, { - /** -* @inheritdoc -*/ - className: 'backtotop', - /** -* @inheritdoc -*/ - template: mw.template.get( 'mobile.backtotop', 'BackToTopOverlay.hogan' ), - /** -* @inheritdoc -*/ - events: $.extend( {}, View.prototype.events, { - click: 'onBackToTopClick' - } ), - - /** -* Show the back to top element, if it's not visible already. -*/ - show: function () { - this.$el.css( 'visibility', 'visible' ).addClass( 'visible' ); - }, - - /** -* Hide the back to top element, if it's visible. -*/ - hide: function () { - this.$el.removeClass( 'visible' ); - }, - - /** -* Handles the click on the "Back to top" element and scrolls back -* to the top smoothly. -*/ - onBackToTopClick: function () { - $( 'html, body' ).animate( { scrollTop: 0 }, 400 ); - } - } ); - - M.define( 'mobile.backtotop/BackToTopOverlay', BackToTopOverlay ); // resource-modules-disable-line - -}( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.backtotop/backtotop.less b/resources/mobile.backtotop/backtotop.less deleted file mode 100644 index 29c7aa9..000 --- a/resources/mobile.backtotop/backtotop.less +++ /dev/null @@ -1,47 +0,0 @@ -@import 'mobile.variables'; -@import 'mediawiki.mixins.less'; - -.backtotop { - /* initially hide the element */ - visibility: hidden; - opacity: 0; - - /* basic styling */ - position: fixed; - width: 2.5em; - height: 2.5em; - border-radius: 100%; - box-shadow: 0.1em 0.2em 0.3em @colorGray12; - bottom: 20px; - right: 0; - cursor: pointer; - z-index: @z-indexOverlay; - background-color: @colorProgressive; - - /*
[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding wheels for Netbox v2.2.2 + napalm
Ayounsi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386703 ) Change subject: Adding wheels for Netbox v2.2.2 + napalm .. Adding wheels for Netbox v2.2.2 + napalm Change-Id: I3b925e7240390a2731ddbf37ea73d8326a2155c2 --- A Django-1.11.6-py2.py3-none-any.whl A Jinja2-2.9.6-py2.py3-none-any.whl A Markdown-2.6.9-py3-none-any.whl A MarkupSafe-1.0-py3-none-any.whl A Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl A PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl A PyYAML-3.12-cp35-cp35m-linux_x86_64.whl A VyattaConfParser-0.5.1-py3-none-any.whl A asn1crypto-0.23.0-py2.py3-none-any.whl A bcrypt-3.1.4-cp35-cp35m-manylinux1_x86_64.whl A certifi-2017.7.27.1-py2.py3-none-any.whl A cffi-1.11.2-cp35-cp35m-manylinux1_x86_64.whl A chainmap-1.0.2-py2.py3-none-any.whl A chardet-3.0.4-py2.py3-none-any.whl A coreapi-2.3.3-py2.py3-none-any.whl A coreschema-0.0.4-py3-none-any.whl A cryptography-2.1.2-cp35-cp35m-manylinux1_x86_64.whl A django_cors_headers-2.1.0-py2.py3-none-any.whl A django_debug_toolbar-1.8-py2.py3-none-any.whl A django_filter-1.1.0-py2.py3-none-any.whl A django_mptt-0.8.7-py2.py3-none-any.whl A django_rest_swagger-2.1.2-py2.py3-none-any.whl A django_tables2-1.13.0-py3-none-any.whl A djangorestframework-3.7.1-py2.py3-none-any.whl A future-0.16.0-py3-none-any.whl A graphviz-0.8.1-py2.py3-none-any.whl A idna-2.6-py2.py3-none-any.whl A itypes-1.1.0-py3-none-any.whl A jtextfsm-0.3.1-py3-none-any.whl A junos_eznc-2.1.7-py2.py3-none-any.whl A librouteros-1.0.4-py3-none-any.whl A lxml-4.1.0-cp35-cp35m-manylinux1_x86_64.whl A napalm-1.2.0-py3-none-any.whl A napalm_base-0.25.0-py3-none-any.whl A napalm_eos-0.6.1-py3-none-any.whl A napalm_fortios-0.4.0-py3-none-any.whl A napalm_ios-0.8.1-py3-none-any.whl A napalm_iosxr-0.5.6-py3-none-any.whl A napalm_junos-0.12.1-py3-none-any.whl A napalm_nxos-0.7.1-py3-none-any.whl A napalm_panos-0.4.0-py3-none-any.whl A napalm_pluribus-0.5.1-py3-none-any.whl A napalm_ros-0.2.2-py3-none-any.whl A napalm_vyos-0.1.3-py3-none-any.whl A natsort-5.1.0-py2.py3-none-any.whl A ncclient-0.5.3-py3-none-any.whl A netaddr-0.7.18-py2.py3-none-any.whl A netaddr-0.7.19-py2.py3-none-any.whl A netmiko-1.4.3-py3-none-any.whl A olefile-0.44-py3-none-any.whl A openapi_codec-1.3.2-py3-none-any.whl A pan_python-0.12.0-py3-none-any.whl A paramiko-2.3.1-py2.py3-none-any.whl A psycopg2-2.7.3.2-cp35-cp35m-manylinux1_x86_64.whl A pyIOSXR-0.52-py3-none-any.whl A pyPluribus-0.3.1-py3-none-any.whl A py_gfm-0.1.3-py2.py3-none-any.whl A pyasn1-0.3.7-py2.py3-none-any.whl A pycparser-2.18-py2.py3-none-any.whl A pycryptodome-3.4.7-cp35-cp35m-linux_x86_64.whl A pyeapi-0.8.1-py3-none-any.whl A pyfg-0.50-py3-none-any.whl A pynxos-0.0.3-py3-none-any.whl A pyserial-3.4-py2.py3-none-any.whl A pytz-2017.2-py2.py3-none-any.whl A requests-2.18.4-py2.py3-none-any.whl A requests_toolbelt-0.8.0-py2.py3-none-any.whl A scp-0.10.2-py2.py3-none-any.whl A setuptools-36.6.0-py2.py3-none-any.whl A simplejson-3.11.1-py3-none-any.whl A six-1.11.0-py2.py3-none-any.whl A sqlparse-0.2.4-py2.py3-none-any.whl A uritemplate-3.0.0-py2.py3-none-any.whl A urllib3-1.22-py2.py3-none-any.whl A xmltodict-0.11.0-py2.py3-none-any.whl 75 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ayounsi: Verified; Looks good to me, approved diff --git a/Django-1.11.6-py2.py3-none-any.whl b/Django-1.11.6-py2.py3-none-any.whl new file mode 100644 index 000..7200c88 --- /dev/null +++ b/Django-1.11.6-py2.py3-none-any.whl Binary files differ diff --git a/Jinja2-2.9.6-py2.py3-none-any.whl b/Jinja2-2.9.6-py2.py3-none-any.whl new file mode 100644 index 000..9fb201e --- /dev/null +++ b/Jinja2-2.9.6-py2.py3-none-any.whl Binary files differ diff --git a/Markdown-2.6.9-py3-none-any.whl b/Markdown-2.6.9-py3-none-any.whl new file mode 100644 index 000..e14321f --- /dev/null +++ b/Markdown-2.6.9-py3-none-any.whl Binary files differ diff --git a/MarkupSafe-1.0-py3-none-any.whl b/MarkupSafe-1.0-py3-none-any.whl new file mode 100644 index 000..ad75747 --- /dev/null +++ b/MarkupSafe-1.0-py3-none-any.whl Binary files differ diff --git a/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl new file mode 100644 index 000..08054b4 --- /dev/null +++ b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl Binary files differ diff --git a/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl new file mode 100644 index 000..7942b61 --- /dev/null +++ b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl Binary files differ diff --git a/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl new file mode 100644 index 000..ecfab9c --- /dev/null +++ b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl Binary files differ diff --git a/VyattaConfParser-0.5.1-py3-none-any.whl b/VyattaConfParser-0.5.1-py3-none-any.whl new file mode 100644 index 000..6561e35 ---
[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding wheels for Netbox v2.2.2 + napalm
Ayounsi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386703 ) Change subject: Adding wheels for Netbox v2.2.2 + napalm .. Adding wheels for Netbox v2.2.2 + napalm Change-Id: I3b925e7240390a2731ddbf37ea73d8326a2155c2 --- A Django-1.11.6-py2.py3-none-any.whl A Jinja2-2.9.6-py2.py3-none-any.whl A Markdown-2.6.9-py3-none-any.whl A MarkupSafe-1.0-py3-none-any.whl A Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl A PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl A PyYAML-3.12-cp35-cp35m-linux_x86_64.whl A VyattaConfParser-0.5.1-py3-none-any.whl A asn1crypto-0.23.0-py2.py3-none-any.whl A bcrypt-3.1.4-cp35-cp35m-manylinux1_x86_64.whl A certifi-2017.7.27.1-py2.py3-none-any.whl A cffi-1.11.2-cp35-cp35m-manylinux1_x86_64.whl A chainmap-1.0.2-py2.py3-none-any.whl A chardet-3.0.4-py2.py3-none-any.whl A coreapi-2.3.3-py2.py3-none-any.whl A coreschema-0.0.4-py3-none-any.whl A cryptography-2.1.2-cp35-cp35m-manylinux1_x86_64.whl A django_cors_headers-2.1.0-py2.py3-none-any.whl A django_debug_toolbar-1.8-py2.py3-none-any.whl A django_filter-1.1.0-py2.py3-none-any.whl A django_mptt-0.8.7-py2.py3-none-any.whl A django_rest_swagger-2.1.2-py2.py3-none-any.whl A django_tables2-1.13.0-py3-none-any.whl A djangorestframework-3.7.1-py2.py3-none-any.whl A future-0.16.0-py3-none-any.whl A graphviz-0.8.1-py2.py3-none-any.whl A idna-2.6-py2.py3-none-any.whl A itypes-1.1.0-py3-none-any.whl A jtextfsm-0.3.1-py3-none-any.whl A junos_eznc-2.1.7-py2.py3-none-any.whl A librouteros-1.0.4-py3-none-any.whl A lxml-4.1.0-cp35-cp35m-manylinux1_x86_64.whl A napalm-1.2.0-py3-none-any.whl A napalm_base-0.25.0-py3-none-any.whl A napalm_eos-0.6.1-py3-none-any.whl A napalm_fortios-0.4.0-py3-none-any.whl A napalm_ios-0.8.1-py3-none-any.whl A napalm_iosxr-0.5.6-py3-none-any.whl A napalm_junos-0.12.1-py3-none-any.whl A napalm_nxos-0.7.1-py3-none-any.whl A napalm_panos-0.4.0-py3-none-any.whl A napalm_pluribus-0.5.1-py3-none-any.whl A napalm_ros-0.2.2-py3-none-any.whl A napalm_vyos-0.1.3-py3-none-any.whl A natsort-5.1.0-py2.py3-none-any.whl A ncclient-0.5.3-py3-none-any.whl A netaddr-0.7.18-py2.py3-none-any.whl A netaddr-0.7.19-py2.py3-none-any.whl A netmiko-1.4.3-py3-none-any.whl A olefile-0.44-py3-none-any.whl A openapi_codec-1.3.2-py3-none-any.whl A pan_python-0.12.0-py3-none-any.whl A paramiko-2.3.1-py2.py3-none-any.whl A psycopg2-2.7.3.2-cp35-cp35m-manylinux1_x86_64.whl A pyIOSXR-0.52-py3-none-any.whl A pyPluribus-0.3.1-py3-none-any.whl A py_gfm-0.1.3-py2.py3-none-any.whl A pyasn1-0.3.7-py2.py3-none-any.whl A pycparser-2.18-py2.py3-none-any.whl A pycryptodome-3.4.7-cp35-cp35m-linux_x86_64.whl A pyeapi-0.8.1-py3-none-any.whl A pyfg-0.50-py3-none-any.whl A pynxos-0.0.3-py3-none-any.whl A pyserial-3.4-py2.py3-none-any.whl A pytz-2017.2-py2.py3-none-any.whl A requests-2.18.4-py2.py3-none-any.whl A requests_toolbelt-0.8.0-py2.py3-none-any.whl A scp-0.10.2-py2.py3-none-any.whl A setuptools-36.6.0-py2.py3-none-any.whl A simplejson-3.11.1-py3-none-any.whl A six-1.11.0-py2.py3-none-any.whl A sqlparse-0.2.4-py2.py3-none-any.whl A uritemplate-3.0.0-py2.py3-none-any.whl A urllib3-1.22-py2.py3-none-any.whl A xmltodict-0.11.0-py2.py3-none-any.whl 75 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/wheels/netbox refs/changes/03/386703/1 diff --git a/Django-1.11.6-py2.py3-none-any.whl b/Django-1.11.6-py2.py3-none-any.whl new file mode 100644 index 000..7200c88 --- /dev/null +++ b/Django-1.11.6-py2.py3-none-any.whl Binary files differ diff --git a/Jinja2-2.9.6-py2.py3-none-any.whl b/Jinja2-2.9.6-py2.py3-none-any.whl new file mode 100644 index 000..9fb201e --- /dev/null +++ b/Jinja2-2.9.6-py2.py3-none-any.whl Binary files differ diff --git a/Markdown-2.6.9-py3-none-any.whl b/Markdown-2.6.9-py3-none-any.whl new file mode 100644 index 000..e14321f --- /dev/null +++ b/Markdown-2.6.9-py3-none-any.whl Binary files differ diff --git a/MarkupSafe-1.0-py3-none-any.whl b/MarkupSafe-1.0-py3-none-any.whl new file mode 100644 index 000..ad75747 --- /dev/null +++ b/MarkupSafe-1.0-py3-none-any.whl Binary files differ diff --git a/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl new file mode 100644 index 000..08054b4 --- /dev/null +++ b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl Binary files differ diff --git a/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl new file mode 100644 index 000..7942b61 --- /dev/null +++ b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl Binary files differ diff --git a/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl new file mode 100644 index 000..ecfab9c --- /dev/null +++ b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl Binary files differ diff --git a/VyattaConfParser-0.5.1-py3-none-any.whl b/VyattaConfParser-0.5.1-py3-none-any.whl new file mode 100644
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Minerva owns BacktoTopOverlay
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386702 ) Change subject: Minerva owns BacktoTopOverlay .. Minerva owns BacktoTopOverlay Not used in MobileFrontend so it is moved here from that repo. Change-Id: I97e6010026daf4c6610bcfbedf140fb2a45b1130 --- A resources/skins.minerva.backtotop/BackToTopOverlay.hogan A resources/skins.minerva.backtotop/BackToTopOverlay.js A resources/skins.minerva.backtotop/backtotop.less M resources/skins.minerva.backtotop/init.js M skin.json 5 files changed, 113 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/02/386702/1 diff --git a/resources/skins.minerva.backtotop/BackToTopOverlay.hogan b/resources/skins.minerva.backtotop/BackToTopOverlay.hogan new file mode 100644 index 000..1dd5be9 --- /dev/null +++ b/resources/skins.minerva.backtotop/BackToTopOverlay.hogan @@ -0,0 +1 @@ + diff --git a/resources/skins.minerva.backtotop/BackToTopOverlay.js b/resources/skins.minerva.backtotop/BackToTopOverlay.js new file mode 100644 index 000..db6e0c9 --- /dev/null +++ b/resources/skins.minerva.backtotop/BackToTopOverlay.js @@ -0,0 +1,55 @@ +( function ( M, $ ) { + + var View = M.require( 'mobile.startup/View' ); + + /** +* Displays a little arrow at the bottom right of the viewport. +* @class BackToTopOverlay +* @extends View +*/ + function BackToTopOverlay() { + View.apply( this, arguments ); + } + + OO.mfExtend( BackToTopOverlay, View, { + /** +* @inheritdoc +*/ + className: 'backtotop', + /** +* @inheritdoc +*/ + template: mw.template.get( 'mobile.backtotop', 'BackToTopOverlay.hogan' ), + /** +* @inheritdoc +*/ + events: $.extend( {}, View.prototype.events, { + click: 'onBackToTopClick' + } ), + + /** +* Show the back to top element, if it's not visible already. +*/ + show: function () { + this.$el.css( 'visibility', 'visible' ).addClass( 'visible' ); + }, + + /** +* Hide the back to top element, if it's visible. +*/ + hide: function () { + this.$el.removeClass( 'visible' ); + }, + + /** +* Handles the click on the "Back to top" element and scrolls back +* to the top smoothly. +*/ + onBackToTopClick: function () { + $( 'html, body' ).animate( { scrollTop: 0 }, 400 ); + } + } ); + + M.define( 'skins.minerva.backtotop/BackToTopOverlay', BackToTopOverlay ); + +}( mw.mobileFrontend, jQuery ) ); diff --git a/resources/skins.minerva.backtotop/backtotop.less b/resources/skins.minerva.backtotop/backtotop.less new file mode 100644 index 000..29c7aa9 --- /dev/null +++ b/resources/skins.minerva.backtotop/backtotop.less @@ -0,0 +1,47 @@ +@import 'mobile.variables'; +@import 'mediawiki.mixins.less'; + +.backtotop { + /* initially hide the element */ + visibility: hidden; + opacity: 0; + + /* basic styling */ + position: fixed; + width: 2.5em; + height: 2.5em; + border-radius: 100%; + box-shadow: 0.1em 0.2em 0.3em @colorGray12; + bottom: 20px; + right: 0; + cursor: pointer; + z-index: @z-indexOverlay; + background-color: @colorProgressive; + + /* define what happens, if the visible class is added/removed, add a nice fade out/in */ + .transition( opacity 0.5s 0s ); + + &.visible { + &:hover { + opacity: 1; + } + opacity: 0.8; + } + + > .arrow-up { + width: 0; + height: 0; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #fff; + position: absolute; + top: 50%; + left: 50%; + transform: translate( -50%, -50% ); + } + + /* center arrow in RTL wikis */ + .rtl > & .arrow-up { + transform: translate( 50%, -50% ); + } +} diff --git a/resources/skins.minerva.backtotop/init.js b/resources/skins.minerva.backtotop/init.js index 39cc340..f6553a6 100644 --- a/resources/skins.minerva.backtotop/init.js +++ b/resources/skins.minerva.backtotop/init.js @@ -1,5 +1,5 @@ ( function ( M, $ ) { - var BackToTopOverlay = M.require( 'mobile.backtotop/BackToTopOverlay' ), + var BackToTopOverlay = M.require(
[MediaWiki-commits] [Gerrit] wikimedia...rainbow[develop]: Annotation of mw.track bug fix
Bearloga has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/385014 ) Change subject: Annotation of mw.track bug fix .. Annotation of mw.track bug fix Bug: T178097 Change-Id: I720a8ec47c0a2d86480f3b7c97880ee890a53c03 --- M modules/mobile_web/events.R M tab_documentation/mobile_events.md 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Bearloga: Verified; Looks good to me, approved diff --git a/modules/mobile_web/events.R b/modules/mobile_web/events.R index 3e0125a..8e044cc 100644 --- a/modules/mobile_web/events.R +++ b/modules/mobile_web/events.R @@ -40,12 +40,14 @@ polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Mobile search events, by day") %>% dyRangeSelector %>% dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") %>% -dyEvent(as.Date("2017-03-29"), "H (new header)", labelLoc = "bottom") +dyEvent(as.Date("2017-03-29"), "H (new header)", labelLoc = "bottom") %>% +dyEvent(as.Date("2017-09-28"), "B (mw.track bug)", labelLoc = "bottom") }) output$mobile_session_plot <- renderDygraph({ mobile_session %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_event)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Mobile user sessions, by volume") %>% -dyRangeSelector +dyRangeSelector %>% +dyEvent(as.Date("2017-09-28"), "B (mw.track bug)", labelLoc = "bottom") }) diff --git a/tab_documentation/mobile_events.md b/tab_documentation/mobile_events.md index c8a029a..e362462 100644 --- a/tab_documentation/mobile_events.md +++ b/tab_documentation/mobile_events.md @@ -26,6 +26,7 @@ * Between 5 May and 6 May 2015, approximately 40% of incoming EventLogging data was lost due to a wider EventLogging outage. You can read more about the outage [here](https://wikitech.wikimedia.org/wiki/Incident_documentation/20150506-EventLogging). * '__R__': on 2017-01-01 we started calculating all of Discovery's metrics using a new version of [our data retrieval and processing codebase](https://phabricator.wikimedia.org/diffusion/WDGO/) that we migrated to [Wikimedia Analytics](https://www.mediawiki.org/wiki/Analytics)' [Reportupdater infrastructure](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater). See [T150915](https://phabricator.wikimedia.org/T150915) for more details. * '__H__': on 2017-03-29 we deployed the new mobile header treatment (including the search box) which may result in the decrease of search. See [T176464](https://phabricator.wikimedia.org/T176464) for more information. +* '__B__': on 2017-09-28 a bug in [`mw.track`](https://www.mediawiki.org/wiki/ResourceLoader/Core_modules#mw.track) was fixed. Before 2017-09-28, if events are logged via [`mw.track`](https://www.mediawiki.org/wiki/ResourceLoader/Core_modules#mw.track), only events tracked during the first pageview of a user's session were logged. See [T175918](https://phabricator.wikimedia.org/T175918) for more details. Questions, bug reports, and feature suggestions -- -- To view, visit https://gerrit.wikimedia.org/r/385014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I720a8ec47c0a2d86480f3b7c97880ee890a53c03 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/discovery/rainbow Gerrit-Branch: develop Gerrit-Owner: ChelsyxGerrit-Reviewer: Bearloga Gerrit-Reviewer: Chelsyx ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding .gitreview
Ayounsi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386700 ) Change subject: Adding .gitreview .. Adding .gitreview Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Ayounsi: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..d3c3800 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=operations/wheels/netbox.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/386700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930 Gerrit-PatchSet: 3 Gerrit-Project: operations/wheels/netbox Gerrit-Branch: master Gerrit-Owner: AyounsiGerrit-Reviewer: Ayounsi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: build: Update stylelint 0.4.1->0.4.2
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386701 ) Change subject: build: Update stylelint 0.4.1->0.4.2 .. build: Update stylelint 0.4.1->0.4.2 Change-Id: I9d67e4224eb6298e20574a201559ab3a7504 --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css M package.json 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/01/386701/1 diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css index 9c70a2f..873e200 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css @@ -45,7 +45,7 @@ /*! * Increase z-index of surface container so it appears above the debug bar */ -.ve-init-mw-desktopArticleTarget #bodyContent { /* stylelint-disable-line selector-no-id */ +.ve-init-mw-desktopArticleTarget #bodyContent { /* stylelint-disable-line selector-max-id */ z-index: 1; } diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css index 7ac789a..4c1612d 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css @@ -5,7 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ /*! * State| classes @@ -66,7 +66,7 @@ .ve-activated #content { position: relative; } -/* stylelint-enable selector-no-id */ +/* stylelint-enable selector-max-id */ .ve-init-mw-desktopArticleTarget-loading-overlay { position: absolute; diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css index 62cb087..4fe6293 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css @@ -5,7 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ /* Hide VE edit tab and section edit things for noscript users. * For script users they're always visible unless and until ve-not-available is added. @@ -19,7 +19,7 @@ display: none; } -/* stylelint-enable selector-no-id */ +/* stylelint-enable selector-max-id */ /* For script users, expand brackets by default, unless and until ve-not-available is added */ diff --git a/package.json b/package.json index fffb4a6..4c536b9 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "jimp": "0.2.24", "mocha": "2.5.3", "selenium-webdriver": "2.53.2", - "stylelint": "7.8.0", - "stylelint-config-wikimedia": "0.4.1" + "stylelint": "8.2.0", + "stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/386701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d67e4224eb6298e20574a201559ab3a7504 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding .gitreview
Ayounsi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386700 ) Change subject: Adding .gitreview .. Adding .gitreview Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/wheels/netbox refs/changes/00/386700/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..d3c3800 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=operations/wheels/netbox.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/386700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930 Gerrit-PatchSet: 1 Gerrit-Project: operations/wheels/netbox Gerrit-Branch: master Gerrit-Owner: Ayounsi___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: UBN! disbale ores for wikidata
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386698 ) Change subject: UBN! disbale ores for wikidata .. UBN! disbale ores for wikidata Bug: T179107 Change-Id: I7dfbbf0266ab7af44174e7df481e181b6ad5cb74 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Awight: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 93cf6a7..1d476fb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18894,7 +18894,7 @@ 'sqwiki' => true, // T170723 'trwiki' => true, // T139992 - 'wikidatawiki' => true, // T130212 + 'wikidatawiki' => false, // T130212 ], 'wgOresModels' => [ 'default' => [ -- To view, visit https://gerrit.wikimedia.org/r/386698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dfbbf0266ab7af44174e7df481e181b6ad5cb74 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: LadsgroupGerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: UBN! disbale ores for wikidata
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386698 ) Change subject: UBN! disbale ores for wikidata .. UBN! disbale ores for wikidata Bug: T179107 Change-Id: I7dfbbf0266ab7af44174e7df481e181b6ad5cb74 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/386698/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 93cf6a7..1d476fb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18894,7 +18894,7 @@ 'sqwiki' => true, // T170723 'trwiki' => true, // T139992 - 'wikidatawiki' => true, // T130212 + 'wikidatawiki' => false, // T130212 ], 'wgOresModels' => [ 'default' => [ -- To view, visit https://gerrit.wikimedia.org/r/386698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7dfbbf0266ab7af44174e7df481e181b6ad5cb74 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ladsgroup___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: add puppet-master.conf to avoid conflict at pkg inst...
Herron has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386696 ) Change subject: puppet: add puppet-master.conf to avoid conflict at pkg install time .. puppet: add puppet-master.conf to avoid conflict at pkg install time Upon install/upgrade the puppet-master-passenger 4.8 package creates /etc/apache2/sites-enabled/puppet-master.conf which conflicts with our own 50- prefixed config file and breaks apache. This will create an empty file to prevent apache breakage at install/upgrade time. Bug: T179102 Change-Id: I8bf4c837cce74b482defd9faae9b0de2e6ec1acc --- M modules/puppetmaster/manifests/passenger.pp 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/386696/1 diff --git a/modules/puppetmaster/manifests/passenger.pp b/modules/puppetmaster/manifests/passenger.pp index 25726eb..d8732f3 100644 --- a/modules/puppetmaster/manifests/passenger.pp +++ b/modules/puppetmaster/manifests/passenger.pp @@ -58,6 +58,13 @@ require => Package['puppetmaster-passenger'], } +# Place an empty puppet-master.conf file to prevent creation of this file +# at package install time. Apache breaks if that happens. T179102 +file { '/etc/apache2/sites-enabled/puppet-master.conf': +ensure => present, +content => "# This file intentionally left blank by puppet - T179102" +} + # Since we are running puppet via passenger, we need to ensure # the puppetmaster service is stopped, since they use the same port # and will conflict when both started. -- To view, visit https://gerrit.wikimedia.org/r/386696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bf4c837cce74b482defd9faae9b0de2e6ec1acc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Herron___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Configure[master]: Remove i18n php shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386695 ) Change subject: Remove i18n php shim .. Remove i18n php shim The i18n php shim was added to support version 1.22 and older. Bug: T168353 Change-Id: I1c3f518bb2b2fb38771379c1e3710a256809bf0e --- D Configure.i18n.php M Configure.php D settings/Settings.i18n.php 3 files changed, 0 insertions(+), 72 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure refs/changes/95/386695/1 diff --git a/Configure.i18n.php b/Configure.i18n.php deleted file mode 100644 index 68a089d..000 --- a/Configure.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShime9860ca6a6108b7e' ) ) { - function wfJsonI18nShime9860ca6a6108b7e( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShime9860ca6a6108b7e'; -} diff --git a/Configure.php b/Configure.php index 9991c99..a765a13 100644 --- a/Configure.php +++ b/Configure.php @@ -208,9 +208,7 @@ # Adding internationalisation... $wgMessagesDirs['Configure'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['Configure'] = $dir . 'Configure.i18n.php'; $wgMessagesDirs['ConfigureSettings'] = $dir . 'settings/i18n'; -$wgExtensionMessagesFiles['ConfigureSettings'] = $dir . 'settings/Settings.i18n.php'; # And special pages aliases... $wgExtensionMessagesFiles['ConfigureAliases'] = $dir . 'Configure.alias.php'; diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php deleted file mode 100644 index 808401b..000 --- a/settings/Settings.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim3d3acdb4e585fb0f' ) ) { - function wfJsonI18nShim3d3acdb4e585fb0f( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim3d3acdb4e585fb0f'; -} -- To view, visit https://gerrit.wikimedia.org/r/386695 To unsubscribe, visit
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prevent possible crash when fetching remaining sections.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386668 ) Change subject: Prevent possible crash when fetching remaining sections. .. Prevent possible crash when fetching remaining sections. The retrofit Response class requires a nonnull "message", otherwise it crashes. Change-Id: I614a4a643f95fa5817cf58c439ba6b4faf6083b9 --- M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Cooltey: Looks good to me, approved diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java index f454905..bb05ef7 100644 --- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java +++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java @@ -288,7 +288,7 @@ int sequence = payload.getInt("sequence"); int status = payload.getInt("status"); commonSectionFetchOnCatch(new HttpStatusException(new okhttp3.Response.Builder() -.code(status).protocol(Protocol.HTTP_1_1) + .code(status).protocol(Protocol.HTTP_1_1).message("") .request(new okhttp3.Request.Builder() .url(model.getTitle().getMobileUri()).build()).build()), sequence); -- To view, visit https://gerrit.wikimedia.org/r/386668 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I614a4a643f95fa5817cf58c439ba6b4faf6083b9 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: DbrantGerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Cooltey Gerrit-Reviewer: Sharvaniharan Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prevent possible crash in tab view.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386667 ) Change subject: Prevent possible crash in tab view. .. Prevent possible crash in tab view. https://rink.hockeyapp.net/manage/apps/226650/app_versions/148/crash_reasons/192586334 Change-Id: I183bcfdef31105cf45df6a563c5e71f0625aa592 --- M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Cooltey: Looks good to me, approved diff --git a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java index 3e5f7a6..5ccbc05 100644 --- a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java +++ b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java @@ -194,6 +194,9 @@ @Override public void onDestroyActionMode(ActionMode mode) { +if (!fragment.isAdded() || fragment.getContext() == null) { +return; +} Animation anim = AnimationUtils.loadAnimation(fragment.getContext(), R.anim.tab_list_zoom_exit); fragment.getView().startAnimation(anim); hideTabList(); -- To view, visit https://gerrit.wikimedia.org/r/386667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I183bcfdef31105cf45df6a563c5e71f0625aa592 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: DbrantGerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Cooltey Gerrit-Reviewer: Sharvaniharan Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserGroups[master]: Remove i18n php shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386694 ) Change subject: Remove i18n php shim .. Remove i18n php shim The i18n php shim was added to support version 1.22 and older. Bug: T168353 Change-Id: I35b954c04e93aa90d826d238a7ec04d0fa904a18 --- D GlobalUserGroups.i18n.groups.php D GlobalUserGroups.i18n.php M GlobalUserGroups.php 3 files changed, 0 insertions(+), 73 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserGroups refs/changes/94/386694/1 diff --git a/GlobalUserGroups.i18n.groups.php b/GlobalUserGroups.i18n.groups.php deleted file mode 100644 index d968f8c..000 --- a/GlobalUserGroups.i18n.groups.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim11e072ee594c458a' ) ) { - function wfJsonI18nShim11e072ee594c458a( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/groups/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim11e072ee594c458a'; -} diff --git a/GlobalUserGroups.i18n.php b/GlobalUserGroups.i18n.php deleted file mode 100644 index eb14de9..000 --- a/GlobalUserGroups.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShima95e29dcdd536c36' ) ) { - function wfJsonI18nShima95e29dcdd536c36( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/core/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShima95e29dcdd536c36'; -} diff --git a/GlobalUserGroups.php b/GlobalUserGroups.php index 59b5c7a..e774fe1 100644 --- a/GlobalUserGroups.php +++ b/GlobalUserGroups.php @@ -33,8 +33,6 @@ // Translations $wgMessagesDirs['GlobalUserGroups'] = __DIR__ . '/i18n/core'; $wgMessagesDirs['GlobalUserGroups.groups'] = __DIR__ . '/i18n/groups'; -$wgExtensionMessagesFiles['GlobalUserGroups'] = __DIR__ . '/GlobalUserGroups.i18n.php'; -$wgExtensionMessagesFiles['GlobalUserGroups.groups'] = __DIR__ . '/GlobalUserGroups.i18n.groups.php'; // Hooks $wgHooks['UserRights'][] = 'efManageGlobalUserGroups';
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Add hook for more entity lookups based on title
MarkTraceur has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386693 ) Change subject: [WIP] Add hook for more entity lookups based on title .. [WIP] Add hook for more entity lookups based on title This may be a straw-man, but I didn't see any better place to do this lookup. See https://gerrit.wikimedia.org/r/386692 for implementation of new hook. Bug: T177022 Change-Id: I321eefc6cccaf6ff2dfcd853d296ddfc60ff0491 --- M lib/includes/Store/Sql/SiteLinkTable.php 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/93/386693/1 diff --git a/lib/includes/Store/Sql/SiteLinkTable.php b/lib/includes/Store/Sql/SiteLinkTable.php index 28f0830..53596f3 100644 --- a/lib/includes/Store/Sql/SiteLinkTable.php +++ b/lib/includes/Store/Sql/SiteLinkTable.php @@ -2,6 +2,7 @@ namespace Wikibase\Lib\Store\Sql; +use Hooks; use DBAccessBase; use MWException; use Wikibase\DataModel\Entity\EntityId; @@ -351,7 +352,23 @@ * @return EntityId|null */ public function getEntityIdForLink( $globalSiteId, $pageTitle ) { - return $this->getItemIdForLink( $globalSiteId, $pageTitle ); - } + $results = [ + 'alternative' => [], + ]; + $results['preferred'] = $this->getItemIdForLink( $globalSiteId, $pageTitle ); + + + Hooks::run( 'GetEntityIdForLink', [ $globalSiteId, $pageTitle, &$results ] ); + + if ( $results['preferred'] === null && count( $results['alternative'] ) > 0 ) { + foreach ( $results['alternative'] as $altResult ) { + if ( $altResult !== null ) { + return $altResult; + } + } + } + + return $results['preferred']; + } } -- To view, visit https://gerrit.wikimedia.org/r/386693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I321eefc6cccaf6ff2dfcd853d296ddfc60ff0491 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: MarkTraceur___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseMediaInfo[master]: [WIP] Look up entity IDs based on title
MarkTraceur has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386692 ) Change subject: [WIP] Look up entity IDs based on title .. [WIP] Look up entity IDs based on title WIP - not sure what the hook interface will look like in the end, but this works currently. Bug: T177022 Change-Id: Icd239d7321f678a714265ff2593b0b85a1f2 --- M extension.json M src/WikibaseMediaInfoHooks.php 2 files changed, 39 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseMediaInfo refs/changes/92/386692/1 diff --git a/extension.json b/extension.json index ccf7452..1d454dd 100644 --- a/extension.json +++ b/extension.json @@ -41,6 +41,9 @@ ], "ImagePageAfterImageLinks": [ "Wikibase\\MediaInfo\\WikibaseMediaInfoHooks::onImagePageAfterImageLinks" + ], + "GetEntityIdForLink": [ + "Wikibase\\MediaInfo\\WikibaseMediaInfoHooks::onGetEntityIdForLink" ] }, "MessagesDirs": { diff --git a/src/WikibaseMediaInfoHooks.php b/src/WikibaseMediaInfoHooks.php index 18100fc..890e160 100644 --- a/src/WikibaseMediaInfoHooks.php +++ b/src/WikibaseMediaInfoHooks.php @@ -2,6 +2,7 @@ namespace Wikibase\MediaInfo; +use Title; use ImagePage; use MediaWiki\MediaWikiServices; use Wikibase\MediaInfo\DataModel\MediaInfo; @@ -14,6 +15,34 @@ * @author Bene* < benestar.wikime...@gmail.com > */ class WikibaseMediaInfoHooks { + + /** +* Helper function to get MediaInfo entity ID based on title +* +* @param Title $pageTitle +* +* @return EntityId|null +*/ + private static function getEntityIdForTitle( Title $pageTitle ) { + if ( !$pageTitle->inNamespace( NS_FILE ) ) { + return null; + } + + $pageId = $pageTitle->getArticleID(); + + if ( !$pageId ) { + return; + } + + $wikibaseRepo = WikibaseRepo::getDefaultInstance(); + $entityId = $wikibaseRepo->getEntityIdComposer()->composeEntityId( + '', + MediaInfo::ENTITY_TYPE, + $pageId + ); + + return $entityId; + } /** * Hook to register the MediaInfo entity namespaces for EntityNamespaceLookup. @@ -47,22 +76,18 @@ public static function onImagePageAfterImageLinks( ImagePage $page, &$html ) { $imgTitle = $page->getTitle(); - $pageId = $imgTitle->getArticleID(); - - if ( !$pageId ) { - return; - } - + $entityId = self::getEntityIdForTitle( $imgTitle ); $wikibaseRepo = WikibaseRepo::getDefaultInstance(); - $entityId = $wikibaseRepo->getEntityIdComposer()->composeEntityId( - '', - MediaInfo::ENTITY_TYPE, - $pageId - ); $title = $wikibaseRepo->getEntityTitleLookup()->getTitleForId( $entityId ); $linkHtml = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink( $title ); $html .= '' . $linkHtml . ''; } + public static function onGetEntityIdForLink( $siteId, $pageTitle, array &$results ) { + $imgTitle = Title::newFromText( $pageTitle ); + $entityId = self::getEntityIdForTitle( $imgTitle ); + $results['alternative'][] = $entityId; + return true; + } } -- To view, visit https://gerrit.wikimedia.org/r/386692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd239d7321f678a714265ff2593b0b85a1f2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo Gerrit-Branch: master Gerrit-Owner: MarkTraceur___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[STABLE_REVSCORING_1]: Blindly choose a timeout of 15 seconds
Awight has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386691 ) Change subject: Blindly choose a timeout of 15 seconds .. Blindly choose a timeout of 15 seconds Hopefully the wikidata API will respond within this window. Bug: T179107 Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a (cherry picked from commit 98d02d9fc56b165ad92f4d1d43e18477de0694e9) --- M config/00-main.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/config/00-main.yaml b/config/00-main.yaml index 67ff44e..dbbd581 100644 --- a/config/00-main.yaml +++ b/config/00-main.yaml @@ -440,6 +440,7 @@ host: https://vi.wikipedia.org wikidata_api: host: https://wikidata.org +timeout: 15 # Scorer models scorer_models: -- To view, visit https://gerrit.wikimedia.org/r/386691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: STABLE_REVSCORING_1 Gerrit-Owner: AwightGerrit-Reviewer: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[STABLE_REVSCORING_1]: Blindly choose a timeout of 15 seconds
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386691 ) Change subject: Blindly choose a timeout of 15 seconds .. Blindly choose a timeout of 15 seconds Hopefully the wikidata API will respond within this window. Bug: T179107 Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a (cherry picked from commit 98d02d9fc56b165ad92f4d1d43e18477de0694e9) --- M config/00-main.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy refs/changes/91/386691/1 diff --git a/config/00-main.yaml b/config/00-main.yaml index 67ff44e..dbbd581 100644 --- a/config/00-main.yaml +++ b/config/00-main.yaml @@ -440,6 +440,7 @@ host: https://vi.wikipedia.org wikidata_api: host: https://wikidata.org +timeout: 15 # Scorer models scorer_models: -- To view, visit https://gerrit.wikimedia.org/r/386691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: STABLE_REVSCORING_1 Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Unwrap Parsoid sections
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386690 ) Change subject: Unwrap Parsoid sections .. Unwrap Parsoid sections Secion wrapping will be introduced in I0f4c19f7. Change-Id: I43ced131d07a20318af37e830318e30db2eb451f --- M modules/ve-mw/init/ve.init.mw.Target.js 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/90/386690/1 diff --git a/modules/ve-mw/init/ve.init.mw.Target.js b/modules/ve-mw/init/ve.init.mw.Target.js index 08d17f2..cb20b15 100644 --- a/modules/ve-mw/init/ve.init.mw.Target.js +++ b/modules/ve-mw/init/ve.init.mw.Target.js @@ -199,6 +199,14 @@ } else { // Parsoid documents are XHTML so we can use parseXhtml which fixed some IE issues. doc = ve.parseXhtml( documentString ); + // Strip Parsoid sections + Array.prototype.forEach.call( doc.querySelectorAll( 'section[data-section-number]' ), function ( element ) { + var parent = element.parentNode; + while ( element.firstChild ) { + parent.insertBefore( element.firstChild, element ); + } + parent.removeChild( element ); + } ); } // Fix relative or missing base URL if needed this.fixBase( doc ); -- To view, visit https://gerrit.wikimedia.org/r/386690 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43ced131d07a20318af37e830318e30db2eb451f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Group XMP parse failures by exception message
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386689 ) Change subject: Group XMP parse failures by exception message .. Group XMP parse failures by exception message I *think* this will work since we pass the full exception object to the log handler. It breaks exception.* into fields into the final logstash entries, so maybe we can do that here too and save a param? Change-Id: I2bba40ded5c90f2e19a32bb5540e3c441b605da6 --- M includes/libs/xmp/XMP.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/386689/1 diff --git a/includes/libs/xmp/XMP.php b/includes/libs/xmp/XMP.php index c46acc6..d8c98d3 100644 --- a/includes/libs/xmp/XMP.php +++ b/includes/libs/xmp/XMP.php @@ -388,7 +388,7 @@ } } catch ( Exception $e ) { $this->logger->warning( - '{method} Exception caught while parsing: ' . $e->getMessage(), + '{method} Exception caught while parsing: {exception.message}', [ 'method' => __METHOD__, 'exception' => $e, -- To view, visit https://gerrit.wikimedia.org/r/386689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bba40ded5c90f2e19a32bb5540e3c441b605da6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Chad___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update prod ssh key for user mholloway-shell
Ayounsi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386187 ) Change subject: Update prod ssh key for user mholloway-shell .. Update prod ssh key for user mholloway-shell Update with a new key using ed25519 per the requirements on Wikitech: https://wikitech.wikimedia.org/wiki/Production_shell_access#SSH_Key_Requirements Bug: T178897 Change-Id: I82f38fe8ea9c52320324c000363245185f5151e7 --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ayounsi: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 045739e..029e4c4 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -1786,7 +1786,8 @@ gid: 500 name: mholloway-shell realname: Michael Holloway -ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDASOBvfuYdsxYbKOH9NTGHkk6QiuGcQR2tMpGZ5kBcPK5mqb5zj0Qr9c/6o3EiTH+BYYnlvgp8zzAjzb2t1oCIn40kdvwp7Q3PIvuoaJj1rRFc0j2RMViUzxCOWeEf7v/28leQ3ZQKHB9p4l9wR3xcl5ZmGvD1JNFFL5hxBlScmMaOEadh5jSKMAJZQM2QjexoGkNp3M59G7CYryC8niQFhWwxGKaHy76ApSXadD6LrmwQmtA3zhRlnAdfBMh5heeutO7wRUE9xStAIMZpf2Pnq3L6ytRMvsr4kvknZ4QdHsNHVqjC/KoK73LIxDlu0HJYzlChaqQ1Xo+x68DU/Ct3 mhollo...@wikimedia.org 2015-11-11] +ssh_keys: + - ssh-ed25519 C3NzaC1lZDI1NTE5IIneKTP+6PaLMgGkOqtGe89r1i6e8lAPSZuBgGSbJaFS mholloway@wmf1256.local uid: 11963 email: mhollo...@wikimedia.org madhuvishy: -- To view, visit https://gerrit.wikimedia.org/r/386187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82f38fe8ea9c52320324c000363245185f5151e7 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MhollowayGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Ayounsi Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Blindly choose a timeout of 15 seconds
Ladsgroup has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386688 ) Change subject: Blindly choose a timeout of 15 seconds .. Blindly choose a timeout of 15 seconds Hopefully the wikidata API will respond within this window. Bug: T179107 Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a --- M config/00-main.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Ladsgroup: Verified; Looks good to me, approved diff --git a/config/00-main.yaml b/config/00-main.yaml index 67ff44e..dbbd581 100644 --- a/config/00-main.yaml +++ b/config/00-main.yaml @@ -440,6 +440,7 @@ host: https://vi.wikipedia.org wikidata_api: host: https://wikidata.org +timeout: 15 # Scorer models scorer_models: -- To view, visit https://gerrit.wikimedia.org/r/386688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: master Gerrit-Owner: AwightGerrit-Reviewer: Greg Grossmeier Gerrit-Reviewer: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.5]: Group Swift metadata errors by making $path a parameter
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386683 ) Change subject: Group Swift metadata errors by making $path a parameter .. Group Swift metadata errors by making $path a parameter Change-Id: I3beb3743e1d13b06a9110c44f84fdc8d1b193137 (cherry picked from commit 4f2d55babb8d011a25343f40c4f958eef9daf99d) --- M includes/libs/filebackend/SwiftFileBackend.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php index 4212ff5..e54e8da 100644 --- a/includes/libs/filebackend/SwiftFileBackend.php +++ b/includes/libs/filebackend/SwiftFileBackend.php @@ -714,7 +714,8 @@ /** @noinspection PhpUnusedLocalVariableInspection */ $ps = $this->scopedProfileSection( __METHOD__ . "-{$this->name}" ); - $this->logger->error( __METHOD__ . ": $path was not stored with SHA-1 metadata." ); + $this->logger->error( __METHOD__ . ": {path} was not stored with SHA-1 metadata.", + [ 'path' => $path ] ); $objHdrs['x-object-meta-sha1base36'] = false; -- To view, visit https://gerrit.wikimedia.org/r/386683 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3beb3743e1d13b06a9110c44f84fdc8d1b193137 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.31.0-wmf.5 Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Blindly choose a timeout of 15 seconds
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386688 ) Change subject: Blindly choose a timeout of 15 seconds .. Blindly choose a timeout of 15 seconds Hopefully the wikidata API will respond within this window. Bug: T179107 Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a --- M config/00-main.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy refs/changes/88/386688/1 diff --git a/config/00-main.yaml b/config/00-main.yaml index 67ff44e..dbbd581 100644 --- a/config/00-main.yaml +++ b/config/00-main.yaml @@ -440,6 +440,7 @@ host: https://vi.wikipedia.org wikidata_api: host: https://wikidata.org +timeout: 15 # Scorer models scorer_models: -- To view, visit https://gerrit.wikimedia.org/r/386688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3354fa96383fd2cc06add4dac0ed17e56dd4f54a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add statsd port to deployment-prep/common.yaml
Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386687 ) Change subject: Add statsd port to deployment-prep/common.yaml .. Add statsd port to deployment-prep/common.yaml Bug: T179019 Change-Id: I5eda07fb31d6f87e9f5edf59f191685aec20f6ac --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 529dff7..908e6d5 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -168,7 +168,7 @@ - deployment-redis01.deployment-prep.eqiad.wmflabs profile::mediawiki::jobrunner::aggr_servers: - deployment-redis01.deployment-prep.eqiad.wmflabs -statsd: labmon1001.eqiad.wmnet +statsd: labmon1001.eqiad.wmnet:8125 profile::mediawiki::jobrunner::runners: basic: 5 gwt: 1 -- To view, visit https://gerrit.wikimedia.org/r/386687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5eda07fb31d6f87e9f5edf59f191685aec20f6ac Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: OttomataGerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add statsd port to deployment-prep/common.yaml
Ottomata has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386687 ) Change subject: Add statsd port to deployment-prep/common.yaml .. Add statsd port to deployment-prep/common.yaml Bug: T179019 Change-Id: I5eda07fb31d6f87e9f5edf59f191685aec20f6ac --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/386687/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 529dff7..908e6d5 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -168,7 +168,7 @@ - deployment-redis01.deployment-prep.eqiad.wmflabs profile::mediawiki::jobrunner::aggr_servers: - deployment-redis01.deployment-prep.eqiad.wmflabs -statsd: labmon1001.eqiad.wmnet +statsd: labmon1001.eqiad.wmnet:8125 profile::mediawiki::jobrunner::runners: basic: 5 gwt: 1 -- To view, visit https://gerrit.wikimedia.org/r/386687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5eda07fb31d6f87e9f5edf59f191685aec20f6ac Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [BlueSpice] Remove Preferences
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386686 ) Change subject: [BlueSpice] Remove Preferences .. [BlueSpice] Remove Preferences https://gerrit.wikimedia.org/r/#/c/385333/ Change-Id: Idd798a8423ce30b563bec70fd6aae0812cfdeb35 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 1754b06..04c0951 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -322,13 +322,6 @@ descmsg = bs-pagesvisited-desc file = BlueSpiceExtensions/PagesVisited/i18n/%CODE%.json -Blue Spice - Preferences -id = ext-bs-preferences -descmsg = bs-preferences-desc -file = BlueSpiceExtensions/Preferences/i18n/%CODE%.json -aliasfile = BlueSpiceExtensions/Preferences/includes/specials/SpecialBlueSpicePreferences.alias.php -optional = prefs-bluespice - Blue Spice - RSS Feeder id = ext-bs-rssfeeder descmsg = bs-rssfeeder-desc -- To view, visit https://gerrit.wikimedia.org/r/386686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd798a8423ce30b563bec70fd6aae0812cfdeb35 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond SpekkingGerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits