[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Add comment about db1089
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357176 ) Change subject: db-eqiad.php: Add comment about db1089 .. db-eqiad.php: Add comment about db1089 db1089 had issues during the weekened, leave it depooled until we upgrade firmware Change-Id: I47b20cb51f407f10844817e5638fb58fd50a8e41 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) 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 43a38a7..493db88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB -# 'db1089' => 500, # C3 3.6TB 512GB #broken +# 'db1089' => 500, # C3 3.6TB 512GB #T166935 #T166933 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/357176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47b20cb51f407f10844817e5638fb58fd50a8e41 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarosteguiGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Marostegui 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]: db-eqiad.php: Add comment about db1089
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357176 ) Change subject: db-eqiad.php: Add comment about db1089 .. db-eqiad.php: Add comment about db1089 db1089 had issues during the weekened, leave it depooled until we upgrade firmware Change-Id: I47b20cb51f407f10844817e5638fb58fd50a8e41 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/76/357176/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 43a38a7..493db88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB -# 'db1089' => 500, # C3 3.6TB 512GB #broken +# 'db1089' => 500, # C3 3.6TB 512GB #T166935 #T166933 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/357176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47b20cb51f407f10844817e5638fb58fd50a8e41 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: TransactionProcessor: modify DM tree branches instead of reb...
Divec has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357171 ) Change subject: TransactionProcessor: modify DM tree branches instead of rebuilding them .. TransactionProcessor: modify DM tree branches instead of rebuilding them This re-applies reverted commit 6c915f3055433fb62e0d413c115ea6036523b530. Bug: T165965 Change-Id: I6e98c8f1197dadbb037eeb3f9176bc47703f62c5 --- M .jsduck/categories.json M build/modules.json M demos/ve/desktop.html M demos/ve/mobile.html M src/dm/ve.dm.TransactionProcessor.js A src/dm/ve.dm.TreeCursor.js A src/dm/ve.dm.TreeModifier.js M tests/dm/ve.dm.RebaseServer.test.js M tests/dm/ve.dm.TransactionProcessor.test.js A tests/dm/ve.dm.TreeModifier.test.js M tests/index.html 11 files changed, 884 insertions(+), 129 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/71/357171/1 diff --git a/.jsduck/categories.json b/.jsduck/categories.json index f5f5ade..9d8e149 100644 --- a/.jsduck/categories.json +++ b/.jsduck/categories.json @@ -63,6 +63,8 @@ "ve.dm.*Selection", "ve.dm.Transaction", "ve.dm.TransactionBuilder", + "ve.dm.TreeCursor", + "ve.dm.TreeModifier", "ve.dm.TransactionProcessor", "ve.dm.TransactionProcessor.*" ] diff --git a/build/modules.json b/build/modules.json index dd14f92..6bde720 100644 --- a/build/modules.json +++ b/build/modules.json @@ -287,6 +287,8 @@ "src/dm/ve.dm.TransactionProcessor.js", "src/dm/ve.dm.Transaction.js", "src/dm/ve.dm.TransactionBuilder.js", + "src/dm/ve.dm.TreeCursor.js", + "src/dm/ve.dm.TreeModifier.js", "src/dm/ve.dm.Selection.js", "src/dm/ve.dm.Surface.js", "src/dm/ve.dm.SurfaceFragment.js", @@ -692,6 +694,7 @@ "tests/dm/ve.dm.TestRebaseClient.js", "tests/dm/ve.dm.TestRebaseServer.js", "tests/dm/ve.dm.RebaseServer.test.js", + "tests/dm/ve.dm.TreeModifier.test.js", "tests/dm/ve.dm.TransactionProcessor.test.js", "tests/dm/ve.dm.APIResultsQueue.test.js", "tests/dm/ve.dm.Surface.test.js", diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 9da9ba0..5f95793 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -228,6 +228,8 @@ + + diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html index dc4291f..2e140d3 100644 --- a/demos/ve/mobile.html +++ b/demos/ve/mobile.html @@ -228,6 +228,8 @@ + + diff --git a/src/dm/ve.dm.TransactionProcessor.js b/src/dm/ve.dm.TransactionProcessor.js index 4cdfb0f..6e6209e 100644 --- a/src/dm/ve.dm.TransactionProcessor.js +++ b/src/dm/ve.dm.TransactionProcessor.js @@ -47,6 +47,7 @@ this.replaceMinInsertLevel = 0; this.retainDepth = 0; this.replaceSpliceQueue = []; + this.treeModifier = null; }; /* Static members */ @@ -84,6 +85,9 @@ ve.dm.TransactionProcessor.prototype.process = function () { var i, completed; + // Ensure the pre-modification document tree has been generated + this.document.getDocumentNode(); + // First process each operation to gather modifications in the modification queue. // If an exception occurs during this stage, we don't need to do anything to recover, // because no modifications were made yet. @@ -98,6 +102,8 @@ try { completed = false; this.applyModifications(); + this.treeModifier = new ve.dm.TreeModifier( this.document, this.transaction ); + this.treeModifier.process(); this.queueAnnotateEvents(); completed = true; } finally { @@ -345,19 +351,14 @@ * {number} splices[].offset Offset to remove/insert at (unadjusted) * {number} splices[].removeLength Number of elements to remove * {Array} splices[].insert Data to insert; for efficiency, objects are inserted without cloning - * @param {number} splitAncestorLevel How many levels of ancestors were split (closed by inserted data) - * For example, if inserting `` splitAncestorLevel=1, and if inserting `` - * splitAncestorLevel=3 */
[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Insert the description of the change.
Cicalese has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357170 ) Change subject: Insert the description of the change. .. Insert the description of the change. Change-Id: Ie8d061281a0f4f68160b30ba3b574172d46939ad --- M includes/Comment.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cicalese: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Comment.php b/includes/Comment.php index ca008bf..64048dc 100644 --- a/includes/Comment.php +++ b/includes/Comment.php @@ -397,7 +397,7 @@ 'avatar' => $this->getAvatar(), 'created' => $this->getCreationDate(), 'modified' => $this->getModificationDate(), - 'moderated' => $this->isLastEditModerated(), + 'moderated' => $this->isLastEditModerated() ? "moderated" : null, 'wikitext' => $this->getWikiText(), 'html' => $this->getHTML(), 'pageid' => $this->getId(), -- To view, visit https://gerrit.wikimedia.org/r/357170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8d061281a0f4f68160b30ba3b574172d46939ad Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CommentStreams Gerrit-Branch: master Gerrit-Owner: CicaleseGerrit-Reviewer: Cicalese 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...CommentStreams[master]: Insert the description of the change.
Cicalese has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357170 ) Change subject: Insert the description of the change. .. Insert the description of the change. Change-Id: Ie8d061281a0f4f68160b30ba3b574172d46939ad --- M includes/Comment.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommentStreams refs/changes/70/357170/2 diff --git a/includes/Comment.php b/includes/Comment.php index ca008bf..64048dc 100644 --- a/includes/Comment.php +++ b/includes/Comment.php @@ -397,7 +397,7 @@ 'avatar' => $this->getAvatar(), 'created' => $this->getCreationDate(), 'modified' => $this->getModificationDate(), - 'moderated' => $this->isLastEditModerated(), + 'moderated' => $this->isLastEditModerated() ? "moderated" : null, 'wikitext' => $this->getWikiText(), 'html' => $this->getHTML(), 'pageid' => $this->getId(), -- To view, visit https://gerrit.wikimedia.org/r/357170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8d061281a0f4f68160b30ba3b574172d46939ad Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CommentStreams Gerrit-Branch: master Gerrit-Owner: CicaleseGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Add appropriate OOjs UI icon pack dependencies
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357009 ) Change subject: Add appropriate OOjs UI icon pack dependencies .. Add appropriate OOjs UI icon pack dependencies resources/ui/steps/uw.ui.Details.js * Add 'alerts' as it uses 'alert' * Add 'content' as it uses 'info' resources/mw.UploadWizardDetails.js * Change 'remove' to 'trash' ('moderation' pack is already loaded) Bug: T166730 Change-Id: I6ca50341866a5cb2ee2321b8201bd0c013e23ecf --- M extension.json M resources/mw.UploadWizardDetails.js 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/extension.json b/extension.json index 31efd50..e515738 100644 --- a/extension.json +++ b/extension.json @@ -208,6 +208,8 @@ "uw.units", "oojs", "oojs-ui", + "oojs-ui.styles.icons-alerts", + "oojs-ui.styles.icons-content", "oojs-ui.styles.icons-editing-core", "oojs-ui.styles.icons-editing-advanced", "oojs-ui.styles.icons-location", diff --git a/resources/mw.UploadWizardDetails.js b/resources/mw.UploadWizardDetails.js index 34d7a0a..7889913 100644 --- a/resources/mw.UploadWizardDetails.js +++ b/resources/mw.UploadWizardDetails.js @@ -183,7 +183,7 @@ title: mw.message( 'mwe-upwiz-remove-upload' ).text(), classes: [ 'mwe-upwiz-remove-upload' ], flags: 'destructive', - icon: 'remove', + icon: 'trash', framed: false } ).on( 'click', function () { OO.ui.confirm( mw.message( 'mwe-upwiz-license-confirm-remove' ).text(), { -- To view, visit https://gerrit.wikimedia.org/r/357009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ca50341866a5cb2ee2321b8201bd0c013e23ecf Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Jforrester 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...CSS[master]: v3.4.0 - Remove broken fallback canary from source
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357106 ) Change subject: v3.4.0 - Remove broken fallback canary from source .. v3.4.0 - Remove broken fallback canary from source Bug: T166940 Change-Id: I1ab3bdd04a0f411f7e10464bb5ddf447e4fa5ab4 Reviewed-on: https://gerrit.wikimedia.org/r/357106 Reviewed-by: Bartosz DziewońskiTested-by: jenkins-bot --- M CSS.php D verifyCSSLoad.js 2 files changed, 4 insertions(+), 398 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/CSS.php b/CSS.php index b8a4fd0..42b43dc 100644 --- a/CSS.php +++ b/CSS.php @@ -19,8 +19,6 @@ die( 'Not an entry point.' ); } -define( 'CSS_VERSION', '3.3.0, 2014-03-31' ); - $wgCSSPath = false; $wgCSSIdentifier = 'css-extension'; @@ -33,19 +31,12 @@ 'author' => array ( 'Aran Dunkley', 'Rusty Burchfield' ), 'descriptionmsg' => 'css-desc', 'url'=> 'https://www.mediawiki.org/wiki/Extension:CSS', - 'version'=> CSS_VERSION, + 'version'=> '3.4.0', ); $wgMessagesDirs['CSS'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['CSS'] = dirname( __FILE__ ) . '/' . 'CSS.i18n.php'; $wgExtensionMessagesFiles['CSSMagic'] = dirname( __FILE__ ) . '/' . 'CSS.i18n.magic.php'; - -$wgResourceModules['ext.CSS'] = array( - 'scripts' => 'verifyCSSLoad.js', - 'position' => 'top', - 'localBasePath' => dirname( __FILE__ ), - 'remoteExtPath' => 'CSS', -); /** * @param Parser $parser @@ -78,37 +69,14 @@ $headItem .= ''; } } else { - # Inline CSS; use data URI to prevent injection. JavaScript - # will use a canary to verify load and will safely convert to - # style tag if load fails. - - # Generate random CSS color that isn't black or white. - $color = dechex( mt_rand( 1, hexdec( 'fe' ) ) ); - $color = str_pad( $color, 6, '0', STR_PAD_LEFT ); - - # Prepend canary CSS to sanitized user CSS - $canaryId = "$wgCSSIdentifier-canary-$color"; - $canaryCSS = "#$canaryId{background:#$color !important}"; - $css = $canaryCSS . Sanitizer::checkCss( $css ); + # sanitized user CSS + $css = Sanitizer::checkCss( $css ); # Encode data URI and append link tag $dataPrefix = 'data:text/css;charset=UTF-8;base64,'; $url = $dataPrefix . base64_encode( $css ); + $headItem .= Html::linkedStyle( $url ); - - # Calculate URI prefix to match link tag - $hrefPrefix = $dataPrefix . base64_encode( '#' . $canaryId ); - $hrefPrefix = substr( $url, 0, strlen( $hrefPrefix ) ); - - # Add JS to verify the link tag loaded and fallback if needed - $parser->getOutput()->addModules( 'ext.CSS' ); - $headItem .= Html::inlineScript( <<' ) - .attr( 'id', id ) - .css( 'display', 'none' ) - .css( 'background-color', '#FF' ) - .appendTo( 'body' ); - - var desiredColor = new RGBColor( color ); - var actualColor = canary.css( 'background-color' ); - actualColor = new RGBColor( actualColor ); - canary.remove(); - - // Did the canary change color as expected? - if ( desiredColor.toHex() == actualColor.toHex() ) { - return; - } - - // Fallback to decoding href and inserting style tag - var code = this.attr( 'href' ).replace( /^.*;base64,/, '' ); - var text = Base64.decode( code ); - - var style = $(
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change colors of LanguageStats to comply with WikimediaUI co...
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357169 ) Change subject: Change colors of LanguageStats to comply with WikimediaUI color palette .. Change colors of LanguageStats to comply with WikimediaUI color palette Bug: T162058 Change-Id: Ib7ab637850c7f582c95232590657aa574c6916b9 --- M wmf-config/InitialiseSettings.php 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/69/357169/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d6f1409..bf81da5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16153,8 +16153,8 @@ 'wmgTranslateWorkflowStates' => [ 'default' => false, 'commonswiki' => [ // T50620 - 'progress' => [ 'color' => 'E00' ], - 'proofreading' => [ 'color' => 'FFBF00' ], + 'progress' => [ 'color' => 'd33' ], + 'proofreading' => [ 'color' => 'fc3' ], 'ready' => [ 'color' => 'FF0' ], 'state conditions' => [ [ 'ready', [ 'PROOFREAD' => 'MAX' ] ], @@ -16163,9 +16163,9 @@ ], ], 'metawiki' => [ - 'progress' => [ 'color' => 'E00' ], - 'needs-updating' => [ 'color' => 'FFBF00' ], - 'proofreading' => [ 'color' => 'FFBF00' ], + 'progress' => [ 'color' => 'd33' ], + 'needs-updating' => [ 'color' => 'fc3' ], + 'proofreading' => [ 'color' => 'fc3' ], 'ready' => [ 'color' => 'FF0' ], 'published' => [ 'color' => 'AEA' ], 'state conditions' => [ @@ -16175,8 +16175,8 @@ ], ], 'otrs_wikiwiki' => [ // T63297 - 'progress' => [ 'color' => 'E00' ], - 'proofreading' => [ 'color' => 'FFBF00' ], + 'progress' => [ 'color' => 'd33' ], + 'proofreading' => [ 'color' => 'fc3' ], 'ready' => [ 'color' => 'FF0' ], 'state conditions' => [ [ 'ready', [ 'PROOFREAD' => 'MAX' ] ], @@ -16185,10 +16185,10 @@ ], ], 'wikidata' => [ - 'progress' => [ 'color' => 'E00' ], - 'needs-updating' => [ 'color' => 'FFBF00' ], - 'updating' => [ 'color' => 'FFBF00' ], - 'proofreading' => [ 'color' => 'FFBF00' ], + 'progress' => [ 'color' => 'd33' ], + 'needs-updating' => [ 'color' => 'fc3' ], + 'updating' => [ 'color' => 'fc3' ], + 'proofreading' => [ 'color' => 'fc3' ], 'ready' => [ 'color' => 'FF0' ], 'published' => [ 'color' => 'AEA' ], ], -- To view, visit https://gerrit.wikimedia.org/r/357169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7ab637850c7f582c95232590657aa574c6916b9 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] translatewiki[master]: Add new project: InternetArchiveBot
Nemo bis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357168 ) Change subject: Add new project: InternetArchiveBot .. Add new project: InternetArchiveBot Bug: T166996 Change-Id: Id12f405e5af610e692847565a81faaefa1806484 --- M bin/EXTERNAL-PROJECTS M bin/REPONG-PROJECTS M bin/nike-export-all A groups/Wikimedia/InternetArchiveBot.yaml M repoconfig.commit.json M repoconfig.json 6 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/68/357168/1 diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS index 5acf7c0..5aaab1b 100644 --- a/bin/EXTERNAL-PROJECTS +++ b/bin/EXTERNAL-PROJECTS @@ -15,6 +15,7 @@ ia-upload ihris inaturalist +internetarchivebot intuition intuition-tools jquery.uls diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS index d5ac59f..06989bc 100644 --- a/bin/REPONG-PROJECTS +++ b/bin/REPONG-PROJECTS @@ -13,6 +13,7 @@ huggle ia-upload inaturalist +internetarchivebot intuition intuition-tools jquery.uls diff --git a/bin/nike-export-all b/bin/nike-export-all index 23bdd30..57bea87 100755 --- a/bin/nike-export-all +++ b/bin/nike-export-all @@ -25,6 +25,7 @@ hivejs huggle inaturalist +internetarchivebot intuition intuition-tools jquery.uls diff --git a/groups/Wikimedia/InternetArchiveBot.yaml b/groups/Wikimedia/InternetArchiveBot.yaml new file mode 100644 index 000..2b8a874 --- /dev/null +++ b/groups/Wikimedia/InternetArchiveBot.yaml @@ -0,0 +1,21 @@ +--- +BASIC: + id: internetarchivebot + label: InternetArchiveBot + icon: wiki://Internet_Archive_logo_and_wordmark.svg + description: "{{Special:MyLanguage/Translations:Group descriptions/internetarchivebot/en}}" + class: FileBasedMessageGroup + namespace: NS_WIKIMEDIA + +MANGLER: + class: StringMatcher + prefix: iabot- + patterns: +- "*" + +FILES: + class: JsonFFS + sourcePattern: "%GROUPROOT%/internetarchivebot/Cyberbot_II/IABot/www/i18n/%CODE%.json" + +INSERTABLES: + class: NumericalParameterInsertablesSuggester diff --git a/repoconfig.commit.json b/repoconfig.commit.json index e71eeef..f30e39c 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -79,6 +79,15 @@ } } }, + "internetarchivebot": { + "group": "internetarchivebot", + "repos": { + "internetarchivebot": { + "type": "github", + "url": "g...@github.com:cyberpower678/Cyberbot_II.git" + } + } + }, "intuition": { "group": "tsint-*", "export-threshold": 1, diff --git a/repoconfig.json b/repoconfig.json index af24a59..ac3c75f 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -79,6 +79,15 @@ } } }, + "internetarchivebot": { + "group": "internetarchivebot", + "repos": { + "internetarchivebot": { + "type": "github", + "url": "https://github.com/cyberpower678/Cyberbot_II.git; + } + } + }, "intuition": { "group": "tsint-*", "export-threshold": 1, -- To view, visit https://gerrit.wikimedia.org/r/357168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id12f405e5af610e692847565a81faaefa1806484 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nemo bis___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Bump version
Cicalese has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357127 ) Change subject: Bump version .. Bump version Change-Id: I928c7d7177a48f5b9c18099b2a2398f9ea06417f --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cicalese: Verified; Looks good to me, approved diff --git a/extension.json b/extension.json index 177cb1b..b096a11 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "CommentStreams", - "version": "3.3", + "version": "3.4", "author": [ "[http://www.mediawiki.org/wiki/User:Jji Jason Ji]", "[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]" -- To view, visit https://gerrit.wikimedia.org/r/357127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I928c7d7177a48f5b9c18099b2a2398f9ea06417f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CommentStreams Gerrit-Branch: master Gerrit-Owner: CicaleseGerrit-Reviewer: Cicalese Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Resources.php: Alphabetical sort of mediawiki.special.*
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357131 ) Change subject: Resources.php: Alphabetical sort of mediawiki.special.* .. Resources.php: Alphabetical sort of mediawiki.special.* Change-Id: Ic49128620b6b52e5a69803eefac6c982d740c1b7 --- M resources/Resources.php 1 file changed, 40 insertions(+), 40 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index c4baab7..f095f83 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1944,6 +1944,9 @@ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css', 'targets' => [ 'desktop', 'mobile' ], ], + 'mediawiki.special.changeslist.enhanced' => [ + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css', + ], 'mediawiki.special.changeslist.legend' => [ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css', 'targets' => [ 'desktop', 'mobile' ], @@ -1955,9 +1958,6 @@ 'mediawiki.cookie', ], 'targets' => [ 'desktop', 'mobile' ], - ], - 'mediawiki.special.changeslist.enhanced' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css', ], 'mediawiki.special.changeslist.visitedstatus' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js', @@ -2027,13 +2027,6 @@ 'mediawiki.notification.convertmessagebox', ], ], - 'mediawiki.special.userrights' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css', - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js', - 'dependencies' => [ - 'mediawiki.notification.convertmessagebox', - ], - ], 'mediawiki.special.preferences.styles' => [ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css', ], @@ -2051,15 +2044,6 @@ 'powersearch-togglenone', ], ], - 'mediawiki.special.search.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css', - 'targets' => [ 'desktop', 'mobile' ], - ], - 'mediawiki.special.search.interwikiwidget.styles' => [ - 'styles' => 'resources/src/mediawiki.special/' - . 'mediawiki.special.search.interwikiwidget.styles.less', - 'targets' => [ 'desktop', 'mobile' ] - ], 'mediawiki.special.search.commonsInterwikiWidget' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js', 'dependencies' => [ @@ -2072,8 +2056,37 @@ 'searchprofile-images' ], ], + 'mediawiki.special.search.interwikiwidget.styles' => [ + 'styles' => 'resources/src/mediawiki.special/' + . 'mediawiki.special.search.interwikiwidget.styles.less', + 'targets' => [ 'desktop', 'mobile' ] + ], + 'mediawiki.special.search.styles' => [ + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css', + 'targets' => [ 'desktop', 'mobile' ], + ], 'mediawiki.special.undelete' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js', + ], + 'mediawiki.special.unwatchedPages' => [ + 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js', + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css', + 'messages' => [ + 'addedwatchtext-short', + 'removedwatchtext-short', + 'unwatch', + 'unwatching', + 'watch', + 'watcherrortext', + 'watching', + ], + 'dependencies' => [ + 'mediawiki.api', + 'mediawiki.api.watch', + 'mediawiki.notify', + 'mediawiki.Title', + 'mediawiki.util', + ], ], 'mediawiki.special.upload' => [ 'templates' => [ @@ -2111,11 +2124,6 @@ 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[REL1_27]: Fix MWException about passing an array named data to Html::e...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357123 ) Change subject: Fix MWException about passing an array named data to Html::element .. Fix MWException about passing an array named data to Html::element Bug: T165225 Change-Id: Iecb72add123fc05b808da294ca81c07627335733 (cherry picked from commit 9613a9d4bc094c83238ae9aaa93158c19ab9e908) --- M TimelessTemplate.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/TimelessTemplate.php b/TimelessTemplate.php index 90ff543..49ed999 100644 --- a/TimelessTemplate.php +++ b/TimelessTemplate.php @@ -259,6 +259,13 @@ unset( $attrs[$k] ); } + if ( isset( $attrs['data'] ) ) { + foreach ( $attrs['data'] as $key => $value ) { + $attrs[ 'data-' . $key ] = $value; + } + unset( $attrs[ 'data' ] ); + } + if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) { $item['single-id'] = $item['id']; } -- To view, visit https://gerrit.wikimedia.org/r/357123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecb72add123fc05b808da294ca81c07627335733 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: REL1_27 Gerrit-Owner: PaladoxGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Chad Gerrit-Reviewer: Isarra Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Reedy 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...Timeless[REL1_28]: Fix MWException about passing an array named data to Html::e...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357122 ) Change subject: Fix MWException about passing an array named data to Html::element .. Fix MWException about passing an array named data to Html::element Bug: T165225 Change-Id: Iecb72add123fc05b808da294ca81c07627335733 (cherry picked from commit 9613a9d4bc094c83238ae9aaa93158c19ab9e908) --- M TimelessTemplate.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/TimelessTemplate.php b/TimelessTemplate.php index 90ff543..49ed999 100644 --- a/TimelessTemplate.php +++ b/TimelessTemplate.php @@ -259,6 +259,13 @@ unset( $attrs[$k] ); } + if ( isset( $attrs['data'] ) ) { + foreach ( $attrs['data'] as $key => $value ) { + $attrs[ 'data-' . $key ] = $value; + } + unset( $attrs[ 'data' ] ); + } + if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) { $item['single-id'] = $item['id']; } -- To view, visit https://gerrit.wikimedia.org/r/357122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecb72add123fc05b808da294ca81c07627335733 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: REL1_28 Gerrit-Owner: PaladoxGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Chad Gerrit-Reviewer: Isarra Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Resources.php: Alphabetical sort of mediawiki.special.*
Fomafix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357131 ) Change subject: Resources.php: Alphabetical sort of mediawiki.special.* .. Resources.php: Alphabetical sort of mediawiki.special.* Change-Id: Ic49128620b6b52e5a69803eefac6c982d740c1b7 --- M resources/Resources.php 1 file changed, 40 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/31/357131/1 diff --git a/resources/Resources.php b/resources/Resources.php index c4baab7..f095f83 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1944,6 +1944,9 @@ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css', 'targets' => [ 'desktop', 'mobile' ], ], + 'mediawiki.special.changeslist.enhanced' => [ + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css', + ], 'mediawiki.special.changeslist.legend' => [ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css', 'targets' => [ 'desktop', 'mobile' ], @@ -1955,9 +1958,6 @@ 'mediawiki.cookie', ], 'targets' => [ 'desktop', 'mobile' ], - ], - 'mediawiki.special.changeslist.enhanced' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css', ], 'mediawiki.special.changeslist.visitedstatus' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js', @@ -2027,13 +2027,6 @@ 'mediawiki.notification.convertmessagebox', ], ], - 'mediawiki.special.userrights' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css', - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js', - 'dependencies' => [ - 'mediawiki.notification.convertmessagebox', - ], - ], 'mediawiki.special.preferences.styles' => [ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css', ], @@ -2051,15 +2044,6 @@ 'powersearch-togglenone', ], ], - 'mediawiki.special.search.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css', - 'targets' => [ 'desktop', 'mobile' ], - ], - 'mediawiki.special.search.interwikiwidget.styles' => [ - 'styles' => 'resources/src/mediawiki.special/' - . 'mediawiki.special.search.interwikiwidget.styles.less', - 'targets' => [ 'desktop', 'mobile' ] - ], 'mediawiki.special.search.commonsInterwikiWidget' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js', 'dependencies' => [ @@ -2072,8 +2056,37 @@ 'searchprofile-images' ], ], + 'mediawiki.special.search.interwikiwidget.styles' => [ + 'styles' => 'resources/src/mediawiki.special/' + . 'mediawiki.special.search.interwikiwidget.styles.less', + 'targets' => [ 'desktop', 'mobile' ] + ], + 'mediawiki.special.search.styles' => [ + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css', + 'targets' => [ 'desktop', 'mobile' ], + ], 'mediawiki.special.undelete' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js', + ], + 'mediawiki.special.unwatchedPages' => [ + 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js', + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css', + 'messages' => [ + 'addedwatchtext-short', + 'removedwatchtext-short', + 'unwatch', + 'unwatching', + 'watch', + 'watcherrortext', + 'watching', + ], + 'dependencies' => [ + 'mediawiki.api', + 'mediawiki.api.watch', + 'mediawiki.notify', + 'mediawiki.Title', + 'mediawiki.util', + ], ], 'mediawiki.special.upload' => [ 'templates' => [ @@ -2111,11 +2124,6 @@ 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
[MediaWiki-commits] [Gerrit] performance/docroot[master]: Short explanation about the performance page
Phedenskog has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357130 ) Change subject: Short explanation about the performance page .. Short explanation about the performance page Today you as a user don't get any info about the page. We can tune the text but I really think we should have something there. Bug: T161588 Change-Id: I6c3b892aadca62631df00e9e090e5e196aa05f94 --- M public_html/index.html 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/performance/docroot refs/changes/30/357130/1 diff --git a/public_html/index.html b/public_html/index.html index b3bf7ee..0c17aaa 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -17,6 +17,9 @@ background-color: #f5f5f5; padding: 20px 0; } +.info-box { + width: 700px; +} .perf-container { width: 700px; margin-top: 40px; @@ -43,6 +46,18 @@ + + +Wikipedia Performance + + +We continuously monitor the performance of https://www.wikipedia.org/;>Wikipedia. These graphs are sampled measurements from 1 of 1000 requests. If you want to dig deeper into our metrics you should checkout our https://grafana.wikimedia.org/dashboard/db/performance-metrics;>Grafana graphs. + + + https://www.mediawiki.org/wiki/Wikimedia_Performance_Team;>The WikiMedia Performance Team + + + -- To view, visit https://gerrit.wikimedia.org/r/357130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c3b892aadca62631df00e9e090e5e196aa05f94 Gerrit-PatchSet: 1 Gerrit-Project: performance/docroot Gerrit-Branch: master Gerrit-Owner: Phedenskog___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: WikiEditor: ->
TheDJ has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357129 ) Change subject: WikiEditor: -> .. WikiEditor: -> Bug: T150172 Change-Id: I645cd627a8f66144fdbbdecf15b24af0528746a8 --- M modules/jquery.wikiEditor.toolbar.config.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/29/357129/1 diff --git a/modules/jquery.wikiEditor.toolbar.config.js b/modules/jquery.wikiEditor.toolbar.config.js index 10c8ade..51ab111 100644 --- a/modules/jquery.wikiEditor.toolbar.config.js +++ b/modules/jquery.wikiEditor.toolbar.config.js @@ -347,7 +347,7 @@ action: { type: 'encapsulate', options: { - pre: '\n' + pre: '\n' } } } -- To view, visit https://gerrit.wikimedia.org/r/357129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I645cd627a8f66144fdbbdecf15b24af0528746a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: TheDJ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Lift IP throttle for Wikimedia Chile editathon
DatGuy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357128 ) Change subject: Lift IP throttle for Wikimedia Chile editathon .. Lift IP throttle for Wikimedia Chile editathon Wikis: eswiki, enwiki IPs: Multiple. 300 total. Timeframe: June 6 2017 15:00 UTC to June 6 2017 21:00 UTC Attendees: 100 Bug: T166788 Change-Id: Id652659f898b40c28a73afddf27c02fa13f24208 --- M wmf-config/throttle.php 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/28/357128/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 19307c0..274d9f9 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -46,6 +46,22 @@ 'dbname' => [ 'ptwiki', 'wikidatawiki', 'commonswiki' ], 'value' => 20 // 10 expected ]; + +$wmgThrottlingExceptions[] = [ // T166788 + 'from'=> '2017-06-06T15:00 UTC', + 'to' => '2017-06-06T21:00 UTC', + 'IP' => [ + '200.29.165.192/26', + '190.98.227.64/26', + '200.111.61.128/26', + '200.72.240.0/26', + '200.91.9.192/26', + '200.91.9.128/26', + ], + 'dbname' => [ 'enwiki', 'eswiki' ], + 'value' => 120 // 100 expected +]; + ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/357128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id652659f898b40c28a73afddf27c02fa13f24208 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: DatGuy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Bump version
Cicalese has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357127 ) Change subject: Bump version .. Bump version Change-Id: I928c7d7177a48f5b9c18099b2a2398f9ea06417f --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommentStreams refs/changes/27/357127/2 diff --git a/extension.json b/extension.json index 177cb1b..b096a11 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "CommentStreams", - "version": "3.3", + "version": "3.4", "author": [ "[http://www.mediawiki.org/wiki/User:Jji Jason Ji]", "[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]" -- To view, visit https://gerrit.wikimedia.org/r/357127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I928c7d7177a48f5b9c18099b2a2398f9ea06417f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CommentStreams Gerrit-Branch: master Gerrit-Owner: Cicalese___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Add phpcs and make pass
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357002 ) Change subject: Add phpcs and make pass .. Add phpcs and make pass Change-Id: I78a3a38751667579a30f2dff107983ffac8cc879 --- M Collection.body.php M Collection.hooks.php M Collection.i18n.php M Collection.php M Collection.session.php M Collection.suggest.php M RenderingAPI.php M composer.json A phpcs.xml M templates/CollectionFinishedTemplate.php M templates/CollectionListTemplate.php M templates/CollectionPageTemplate.php M templates/CollectionSuggestTemplate.php 13 files changed, 304 insertions(+), 277 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/Collection.body.php b/Collection.body.php index ce6d548..fdc5893 100644 --- a/Collection.body.php +++ b/Collection.body.php @@ -65,7 +65,7 @@ } $out->redirect( wfAppendQuery( SkinTemplate::makeSpecialUrl( 'Book' ), - $request->appendQueryArray( array( 'bookcmd' => rtrim( $par, '/' ) ) ) + $request->appendQueryArray( [ 'bookcmd' => rtrim( $par, '/' ) ] ) ) ); return; } @@ -351,33 +351,33 @@ $title = Title::newMainPage(); } - $form = new OOUI\FormLayout( array( + $form = new OOUI\FormLayout( [ 'method' => 'POST', 'action' => SkinTemplate::makeSpecialUrl( 'Book', - array( + [ 'bookcmd' => 'start_book_creator', 'referer' => $referer, - ) + ] ), - ) ); - $form->appendContent( new OOUI\ButtonGroupWidget( array( - 'items' => array( - new OOUI\ButtonInputWidget( array( + ] ); + $form->appendContent( new OOUI\ButtonGroupWidget( [ + 'items' => [ + new OOUI\ButtonInputWidget( [ 'type' => 'submit', 'name' => 'confirm', 'value' => 'yes', - 'flags' => array( 'primary', 'progressive' ), + 'flags' => [ 'primary', 'progressive' ], 'label' => $this->msg( 'coll-start_book_creator' )->text(), - ) ), - new OOUI\ButtonWidget( array( + ] ), + new OOUI\ButtonWidget( [ 'href' => $title->getLinkURL(), 'title' => $title->getPrefixedText(), 'label' => $this->msg( 'coll-cancel' )->text(), 'noFollow' => true, - ) ), - ), - ) ) ); + ] ), + ], + ] ) ); $out->addHTML( $form ); @@ -404,33 +404,33 @@ $out->setPageTitle( $this->msg( 'coll-book_creator_disable' ) ); $out->addWikiMsg( 'coll-book_creator_disable_text' ); - $form = new OOUI\FormLayout( array( + $form = new OOUI\FormLayout( [ 'method' => 'POST', 'action' => SkinTemplate::makeSpecialUrl( 'Book', - array( + [ 'bookcmd' => 'stop_book_creator', 'referer' => $referer, - ) + ] ), - ) ); - $form->appendContent( new OOUI\ButtonGroupWidget( array( - 'items' => array( - new OOUI\ButtonInputWidget( array( + ] ); + $form->appendContent( new OOUI\ButtonGroupWidget( [ + 'items' => [ + new OOUI\ButtonInputWidget( [ 'type' => 'submit', 'name' => 'continue', 'value' => 'yes', 'label' => $this->msg( 'coll-book_creator_continue' )->text(), -
[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Added comment moderation.
Cicalese has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357125 ) Change subject: Added comment moderation. .. Added comment moderation. Change-Id: Ic8a806ede6d528ab04f6a58f4a78c86614c23e0e --- M extension.json M i18n/en.json M i18n/qqq.json M includes/ApiCSDeleteComment.php M includes/ApiCSEditComment.php M includes/Comment.php M includes/CommentStreams.php M includes/CommentStreamsHooks.php M resources/CommentStreams.css M resources/CommentStreams.js 10 files changed, 164 insertions(+), 42 deletions(-) Approvals: Cicalese: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 8695f48..177cb1b 100644 --- a/extension.json +++ b/extension.json @@ -63,6 +63,7 @@ "commentstreams-dialog-buttontext-no", "commentstreams-datetext-postedon", "commentstreams-datetext-lasteditedon", + "commentstreams-datetext-moderated", "commentstreams-title-field-placeholder", "commentstreams-body-field-placeholder" ] @@ -111,6 +112,7 @@ "CommentStreamsAllowedNamespaces" : null, "CommentStreamsEnableTalk": false, "CommentStreamsNewestStreamsOnTop": true, + "CommentStreamsModeratorFastDelete": false, "CommentStreamsInitiallyCollapsedNamespaces" : [], "CommentStreamsUserRealNamePropertyName" : null, "CommentStreamsUserAvatarPropertyName" : null diff --git a/i18n/en.json b/i18n/en.json index 3cff674..387348a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -56,6 +56,7 @@ "commentstreams-dialog-buttontext-no": "No", "commentstreams-datetext-postedon": "Posted on", "commentstreams-datetext-lasteditedon": "Last edited on", + "commentstreams-datetext-moderated": "moderated", "commentstreams-title-field-placeholder": "Enter title...", "commentstreams-body-field-placeholder": "Enter new comment text...", "echo-category-title-commentstreams-notification-category": "New comments and replies", @@ -68,5 +69,12 @@ "commentstreams-email-body-message-reply-on-watched-page": "$2 has replied to \"$3\" on $4, a page you are watching. Click the link to visit the page: $5. The reply is:\n\n$6", "commentstreams-email-subject-message-reply-to-author": "Somebody has replied to one of your comments", "commentstreams-email-body-message-reply-to-author": "$2 has replied to your comment \"$3\" on $4. Click the link to visit the page: $5. The reply is:\n\n$6", - "notification-commentstreams-page": "Visit page" + "notification-commentstreams-page": "Visit page", + "group-csmoderator": "Moderators (CommentStreams)", + "group-csmoderator-member": "{{GENDER:$1|moderator (CommentStreams)}}", + "grouppage-csmoderator": "{{ns:project}}:Moderators (CommentStreams)", + "right-csedit": "Edit comments by any user", + "action-csedit": "edit comments by other users", + "right-csdelete": "Delete comments by any user", + "action-csdelete": "delete comments by other users" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 4248adc..9fba01d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -56,6 +56,7 @@ "commentstreams-dialog-buttontext-no": "User interface dialog button text.", "commentstreams-datetext-postedon": "User interface date text", "commentstreams-datetext-lasteditedon": "User interface date text", + "commentstreams-datetext-moderated": "User interface date text", "commentstreams-title-field-placeholder": "Text field placeholder text", "commentstreams-body-field-placeholder": "Text field placeholder text", "echo-category-title-commentstreams-notification-category": "Name of category on Prefences/Notifications page for CommentStreams notifications", @@ -68,5 +69,12 @@ "commentstreams-email-body-message-reply-on-watched-page": "Echo email body.\n\nParameters:\n*$1 - the username of the user authoring the new comment.\n* $2 - the display name of the comment author.\n* $3 - the title of the comment.\n* $4 - the display title of the page being commented on.\n* $5 - a link to that page.\n* $6 - the wikitext of the new comment.", "commentstreams-email-subject-message-reply-to-author": "Echo email subject.", "commentstreams-email-body-message-reply-to-author": "Echo email body.\n\nParameters:\n*$1 - the username of the user authoring the new comment.\n* $2 - the display name of the comment author.\n* $3 - the title of the comment.\n* $4 - the display title of the page being commented on.\n* $5 - a link to that page.\n* $6 - the wikitext of the new comment.", -
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Adds mw.wikibase.getEntityIdForTitle to Scribunto
Tpt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357126 ) Change subject: Adds mw.wikibase.getEntityIdForTitle to Scribunto .. Adds mw.wikibase.getEntityIdForTitle to Scribunto Allows to retrieve an item id from a page title Simplified version of change I90699438062571887b95e05a7d13b6f295558418 Bug: T74815 Change-Id: I3ffec1f0a670f5a2e3ef072ad1a904f70149f240 --- M client/includes/DataAccess/Scribunto/mw.wikibase.lua M client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua M docs/lua.wiki 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/26/357126/1 diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.lua b/client/includes/DataAccess/Scribunto/mw.wikibase.lua index 1577264..429e1a9 100644 --- a/client/includes/DataAccess/Scribunto/mw.wikibase.lua +++ b/client/includes/DataAccess/Scribunto/mw.wikibase.lua @@ -143,6 +143,15 @@ return php.getEntityUrl( id ) end + -- Get the entity id for a given page on the current wiki. + -- + -- @param {string} pageTitle + wikibase.getEntityIdForTitle = function( pageTitle ) + checkType( 'getEntityIdForPage', 1, pageTitle, 'string' ) + return php.getEntityId( pageTitle ) + end + + -- Get the label, label language for the given entity id, if specified, -- or of the connected entity, if exists. -- diff --git a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua index bd90760..38ca775 100644 --- a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua +++ b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua @@ -97,6 +97,18 @@ args = { 123 }, expect = "bad argument #1 to 'getEntity' (string or nil expected, got number)" }, + { name = 'mw.wikibase.getEntityIdForTitle with existing title', func = mw.wikibase.getEntityIdForTitle, + args = { 'FooBarFoo' }, + expect = { 'Q32487' } + }, + { name = 'mw.wikibase.getEntityIdForTitle with non existing title', func = mw.wikibase.getEntityIdForTitle, + args = { 'Bar' }, + expect = { nil } + }, + { name = 'mw.wikibase.getEntityIdForTitle with invalid title', func = mw.wikibase.getEntityIdForTitle, + args = { 'a ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Added comment moderation.
Cicalese has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357125 ) Change subject: Added comment moderation. .. Added comment moderation. Change-Id: Ic8a806ede6d528ab04f6a58f4a78c86614c23e0e --- M extension.json M i18n/en.json M i18n/qqq.json M includes/ApiCSDeleteComment.php M includes/ApiCSEditComment.php M includes/Comment.php M includes/CommentStreams.php M includes/CommentStreamsHooks.php M resources/CommentStreams.css M resources/CommentStreams.js 10 files changed, 155 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommentStreams refs/changes/25/357125/1 diff --git a/extension.json b/extension.json index 8695f48..177cb1b 100644 --- a/extension.json +++ b/extension.json @@ -63,6 +63,7 @@ "commentstreams-dialog-buttontext-no", "commentstreams-datetext-postedon", "commentstreams-datetext-lasteditedon", + "commentstreams-datetext-moderated", "commentstreams-title-field-placeholder", "commentstreams-body-field-placeholder" ] @@ -111,6 +112,7 @@ "CommentStreamsAllowedNamespaces" : null, "CommentStreamsEnableTalk": false, "CommentStreamsNewestStreamsOnTop": true, + "CommentStreamsModeratorFastDelete": false, "CommentStreamsInitiallyCollapsedNamespaces" : [], "CommentStreamsUserRealNamePropertyName" : null, "CommentStreamsUserAvatarPropertyName" : null diff --git a/i18n/en.json b/i18n/en.json index 3cff674..33234f5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -56,6 +56,7 @@ "commentstreams-dialog-buttontext-no": "No", "commentstreams-datetext-postedon": "Posted on", "commentstreams-datetext-lasteditedon": "Last edited on", + "commentstreams-datetext-moderated": "moderated", "commentstreams-title-field-placeholder": "Enter title...", "commentstreams-body-field-placeholder": "Enter new comment text...", "echo-category-title-commentstreams-notification-category": "New comments and replies", @@ -68,5 +69,9 @@ "commentstreams-email-body-message-reply-on-watched-page": "$2 has replied to \"$3\" on $4, a page you are watching. Click the link to visit the page: $5. The reply is:\n\n$6", "commentstreams-email-subject-message-reply-to-author": "Somebody has replied to one of your comments", "commentstreams-email-body-message-reply-to-author": "$2 has replied to your comment \"$3\" on $4. Click the link to visit the page: $5. The reply is:\n\n$6", - "notification-commentstreams-page": "Visit page" + "notification-commentstreams-page": "Visit page", + "group-csmoderator": "Moderators (CommentStreams)", + "group-csmoderator-member": "{{GENDER:$1|moderator (CommentStreams)}}", + "grouppage-csmoderator": "{{ns:project}}:Moderators (CommentStreams)", + "right-csdelete": "Delete comments by any user" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 4248adc..43bb8e8 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -56,6 +56,7 @@ "commentstreams-dialog-buttontext-no": "User interface dialog button text.", "commentstreams-datetext-postedon": "User interface date text", "commentstreams-datetext-lasteditedon": "User interface date text", + "commentstreams-datetext-moderated": "User interface date text", "commentstreams-title-field-placeholder": "Text field placeholder text", "commentstreams-body-field-placeholder": "Text field placeholder text", "echo-category-title-commentstreams-notification-category": "Name of category on Prefences/Notifications page for CommentStreams notifications", @@ -68,5 +69,9 @@ "commentstreams-email-body-message-reply-on-watched-page": "Echo email body.\n\nParameters:\n*$1 - the username of the user authoring the new comment.\n* $2 - the display name of the comment author.\n* $3 - the title of the comment.\n* $4 - the display title of the page being commented on.\n* $5 - a link to that page.\n* $6 - the wikitext of the new comment.", "commentstreams-email-subject-message-reply-to-author": "Echo email subject.", "commentstreams-email-body-message-reply-to-author": "Echo email body.\n\nParameters:\n*$1 - the username of the user authoring the new comment.\n* $2 - the display name of the comment author.\n* $3 - the title of the comment.\n* $4 - the display title of the page being commented on.\n* $5 - a link to that page.\n* $6 - the wikitext of the new comment.", - "notification-commentstreams-page": "Visit page" + "notification-commentstreams-page": "Visit page", + "group-csmoderator":
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add UriProcessor and unit tests for URL manipulat...
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357124 ) Change subject: RCFilters: Add UriProcessor and unit tests for URL manipulations .. RCFilters: Add UriProcessor and unit tests for URL manipulations Bug: T166974 Change-Id: I066c33a01770b7d8026aa3e039af5fe5d9c4cdf9 --- M resources/Resources.php M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js A resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js M tests/qunit/QUnitTestResources.php A tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js 6 files changed, 646 insertions(+), 187 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/24/357124/1 diff --git a/resources/Resources.php b/resources/Resources.php index c4baab7..dd62a84 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1749,6 +1749,7 @@ 'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js', 'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js', 'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js', + 'resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js', ], 'dependencies' => [ 'oojs', diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js index 59c0a19..dd698cd 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js @@ -75,8 +75,8 @@ var subsetNames = [], filterItem = new mw.rcfilters.dm.FilterItem( filter.name, model, { group: model.getName(), - label: mw.msg( filter.label ), - description: mw.msg( filter.description ), + label: filter.label ? mw.msg( filter.label ) : filter.name, + description: filter.description ? mw.msg( filter.description ) : '', cssClass: filter.cssClass } ); diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 897162a..09c889e 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -13,7 +13,7 @@ this.savedQueriesModel = savedQueriesModel; this.requestCounter = 0; this.baseFilterState = {}; - this.emptyParameterState = {}; + this.uriProcessor = null; this.initializing = false; }; @@ -26,7 +26,7 @@ * @param {Array} filterStructure Filter definition and structure for the model */ mw.rcfilters.Controller.prototype.initialize = function ( filterStructure ) { - var parsedSavedQueries, validParameterNames, baseParams, + var parsedSavedQueries, useDataFromServer = false, uri = new mw.Uri(), $changesList = $( '.mw-changeslist' ).first().contents(); @@ -35,14 +35,9 @@ this.filtersModel.initializeFilters( filterStructure ); this._buildBaseFilterState(); - this._buildEmptyParameterState(); - validParameterNames = Object.keys( this._getEmptyParameterState() ) - .filter( function ( param ) { - // Remove 'highlight' parameter from this check; - // if it's the only parameter in the URL we still - // want to consider the URL 'empty' for defaults to load - return param !== 'highlight'; - } ); + this.uriProcessor = new mw.rcfilters.UriProcessor( + this.filtersModel + ); try { parsedSavedQueries = JSON.parse( mw.user.options.get( 'rcfilters-saved-queries' ) || '{}' ); @@ -67,11 +62,7 @@ // Defaults should only be applied on load (if necessary) // or on request this.initializing = true; - if ( - Object.keys( uri.query ).some( function ( parameter ) { - return validParameterNames.indexOf( parameter ) > -1; - } ) - ) { +
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] Make pywikibot.Error more precise
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357120 ) Change subject: [IMPR] Make pywikibot.Error more precise .. [IMPR] Make pywikibot.Error more precise - OptionHandler.getOption raises pywikibot.Error if the given option is not given in availableOptions. OptionHandler is not used by BaseBot class only but also by some generator classes. Make the error message more precise. Bug: T166982 Change-Id: I011c5d928dba19c7c8f355be19864c56532e52e2 --- M pywikibot/bot.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index f78be24..191aaeb 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1180,11 +1180,13 @@ Get the current value of an option. @param option: key defined in OptionHandler.availableOptions +@raise Error: No valid option is given with option parameter """ try: return self.options.get(option, self.availableOptions[option]) except KeyError: -raise pywikibot.Error(u'%s is not a valid bot option.' % option) +raise pywikibot.Error("'{0}' is not a valid option for {1}." + .format(option, self.__class__.__name__)) class BaseBot(OptionHandler): -- To view, visit https://gerrit.wikimedia.org/r/357120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I011c5d928dba19c7c8f355be19864c56532e52e2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Magul Gerrit-Reviewer: Mpaa 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...Timeless[REL1_27]: Fix MWException about passing an array named data to Html::e...
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357123 ) Change subject: Fix MWException about passing an array named data to Html::element .. Fix MWException about passing an array named data to Html::element Change-Id: Iecb72add123fc05b808da294ca81c07627335733 (cherry picked from commit 9613a9d4bc094c83238ae9aaa93158c19ab9e908) --- M TimelessTemplate.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless refs/changes/23/357123/1 diff --git a/TimelessTemplate.php b/TimelessTemplate.php index 90ff543..49ed999 100644 --- a/TimelessTemplate.php +++ b/TimelessTemplate.php @@ -259,6 +259,13 @@ unset( $attrs[$k] ); } + if ( isset( $attrs['data'] ) ) { + foreach ( $attrs['data'] as $key => $value ) { + $attrs[ 'data-' . $key ] = $value; + } + unset( $attrs[ 'data' ] ); + } + if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) { $item['single-id'] = $item['id']; } -- To view, visit https://gerrit.wikimedia.org/r/357123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecb72add123fc05b808da294ca81c07627335733 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: REL1_27 Gerrit-Owner: PaladoxGerrit-Reviewer: Brian Wolff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[REL1_28]: Fix MWException about passing an array named data to Html::e...
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357122 ) Change subject: Fix MWException about passing an array named data to Html::element .. Fix MWException about passing an array named data to Html::element Change-Id: Iecb72add123fc05b808da294ca81c07627335733 (cherry picked from commit 9613a9d4bc094c83238ae9aaa93158c19ab9e908) --- M TimelessTemplate.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless refs/changes/22/357122/1 diff --git a/TimelessTemplate.php b/TimelessTemplate.php index 90ff543..49ed999 100644 --- a/TimelessTemplate.php +++ b/TimelessTemplate.php @@ -259,6 +259,13 @@ unset( $attrs[$k] ); } + if ( isset( $attrs['data'] ) ) { + foreach ( $attrs['data'] as $key => $value ) { + $attrs[ 'data-' . $key ] = $value; + } + unset( $attrs[ 'data' ] ); + } + if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) { $item['single-id'] = $item['id']; } -- To view, visit https://gerrit.wikimedia.org/r/357122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecb72add123fc05b808da294ca81c07627335733 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: REL1_28 Gerrit-Owner: PaladoxGerrit-Reviewer: Brian Wolff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Fix colour for Unbreak Now tasks
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357121 ) Change subject: Phabricator: Fix colour for Unbreak Now tasks .. Phabricator: Fix colour for Unbreak Now tasks It seems that prod is not affected most likely someone edited it throw the webui. But this can be seen on https://phab-01.wmflabs.org/T145 . Changes indigo to pink. Which is the colour used on prod. Change-Id: I15bfbeca0a3664d4e179c8c392a650395c6d1c7f --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/357121/1 -- To view, visit https://gerrit.wikimedia.org/r/357121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I15bfbeca0a3664d4e179c8c392a650395c6d1c7f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] Make pywikibot.Error more precise
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357120 ) Change subject: [IMPR] Make pywikibot.Error more precise .. [IMPR] Make pywikibot.Error more precise - OptionHandler.getOption raises pywikibot.Error if the given option is not given in availableOptions. OptionHandler is not used by BaseBot class only but also by some generator classes. Make the error message more precise. Bug: T166982 Change-Id: I011c5d928dba19c7c8f355be19864c56532e52e2 --- M pywikibot/bot.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/20/357120/1 diff --git a/pywikibot/bot.py b/pywikibot/bot.py index f78be24..191aaeb 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1180,11 +1180,13 @@ Get the current value of an option. @param option: key defined in OptionHandler.availableOptions +@raise Error: No valid option is given with option parameter """ try: return self.options.get(option, self.availableOptions[option]) except KeyError: -raise pywikibot.Error(u'%s is not a valid bot option.' % option) +raise pywikibot.Error("'{0}' is not a valid option for {1}." + .format(option, self.__class__.__name__)) class BaseBot(OptionHandler): -- To view, visit https://gerrit.wikimedia.org/r/357120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I011c5d928dba19c7c8f355be19864c56532e52e2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Suppressing question numbering in a quiz when only one quest...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356983 ) Change subject: Suppressing question numbering in a quiz when only one question in a quiz .. Suppressing question numbering in a quiz when only one question in a quiz Bug:T162803 Change-Id: I6931c03208d8ecece0b8113c3b0603f8c0682187 --- M Quiz.class.php M templates/Question.mustache 2 files changed, 9 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Mvolz: Looks good to me, approved diff --git a/Quiz.class.php b/Quiz.class.php index 6f6c9c8..db48a12 100644 --- a/Quiz.class.php +++ b/Quiz.class.php @@ -250,6 +250,8 @@ $output = ''; $questionPattern = '`(.*?[^|\}])\}[ \t]*(\n(.*)|$)`s'; + $numQuestion = count( $unparsedQuestions ); + $numDisplay = $numQuestion > 1; foreach ( $unparsedQuestions as $unparsedQuestion ) { // If this "unparsedQuestion" is not a full question, // we put the text into a buffer to add it at the beginning of the next question. @@ -259,7 +261,7 @@ if ( preg_match( $questionPattern, $unparsedQuestion, $matches ) ) { $buffer = ''; - $output .= $this->parseQuestion( $matches ); + $output .= $this->parseQuestion( $matches, $numDisplay ); } else { $buffer = $unparsedQuestion; } @@ -279,9 +281,10 @@ * @param $matches array: elements matching $questionPattern. * $matches[1] is the question header. * $matches[3] is the question object. +* @param $numDisplay Boolean: specifies whether to display question number. * @return string */ - function parseQuestion( $matches ) { + function parseQuestion( $matches, $numDisplay ) { $question = new Question( $this->mBeingCorrected, $this->mCaseSensitive, @@ -401,6 +404,7 @@ array( 'question' => array( 'id' => $this->mQuestionId, + 'numdis' => $numDisplay, 'text' => $questionText, 'answers' => $answers ), diff --git a/templates/Question.mustache b/templates/Question.mustache index 790f13a..6c66951 100644 --- a/templates/Question.mustache +++ b/templates/Question.mustache @@ -1,6 +1,8 @@ - {{ question.id }} + {{#if question.numdis }} + {{ question.id }} + {{/if}} {{{ question.text }}} -- To view, visit https://gerrit.wikimedia.org/r/356983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6931c03208d8ecece0b8113c3b0603f8c0682187 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/Quiz Gerrit-Branch: master Gerrit-Owner: HarjotsinghGerrit-Reviewer: Mvolz 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...Cite[master]: Add appropriate OOjs UI icon pack dependencies
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357004 ) Change subject: Add appropriate OOjs UI icon pack dependencies .. Add appropriate OOjs UI icon pack dependencies modules/ve-cite/ve.ui.MWReferenceDialog.js * Add 'alerts' as it uses 'alert' * Add 'interactions' as it uses 'settings' Bug: T166730 Change-Id: I39d98c197220d463f18d473a9605e242ec9755a9 --- M includes/CiteHooks.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/includes/CiteHooks.php b/includes/CiteHooks.php index e3ee7e6..c433384 100644 --- a/includes/CiteHooks.php +++ b/includes/CiteHooks.php @@ -144,6 +144,8 @@ "ve-cite/ve.ui.MWReferenceSearchWidget.css" ], "dependencies" => [ + "oojs-ui.styles.icons-alerts", + "oojs-ui.styles.icons-interactions", "ext.cite.visualEditor.core", "ext.cite.visualEditor.data", "ext.cite.style", -- To view, visit https://gerrit.wikimedia.org/r/357004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39d98c197220d463f18d473a9605e242ec9755a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Jackmcbarn 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...TemplateData[master]: Add appropriate OOjs UI icon pack dependencies
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357007 ) Change subject: Add appropriate OOjs UI icon pack dependencies .. Add appropriate OOjs UI icon pack dependencies modules/widgets/ext.templateDataGenerator.paramWidget.js * Add 'layout' as it uses 'menu' modules/ext.templateDataGenerator.ui.tdDialog.js * Add 'interactions' as it uses 'advanced' Bug: T166730 Change-Id: I5b09f629ec274a89f96030de8af64cfe5d659143 --- M extension.json 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/extension.json b/extension.json index f664e76..e8be290 100644 --- a/extension.json +++ b/extension.json @@ -85,6 +85,8 @@ "oojs-ui-core", "oojs-ui-widgets", "oojs-ui-windows", + "oojs-ui.styles.icons-layout", + "oojs-ui.styles.icons-interactions", "ext.templateData", "ext.templateData.images", "ext.templateDataGenerator.data", -- To view, visit https://gerrit.wikimedia.org/r/357007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b09f629ec274a89f96030de8af64cfe5d659143 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-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] pywikibot/core[master]: [bugfix] Re-enable isHiddenCategory test_articles
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357119 ) Change subject: [bugfix] Re-enable isHiddenCategory test_articles .. [bugfix] Re-enable isHiddenCategory test_articles - [[Category:Wikipedia category]] became a hidden category and the tests failed. take [[Category:Wikipedia]] instead. Bug: T166975 Change-Id: I78fc4aec1025ca6ec22da0dbb2ae33af477d2a75 --- M tests/category_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/category_tests.py b/tests/category_tests.py index b4d5c70..e4b4ba1 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the Category class.""" # -# (C) Pywikibot team, 2014-2015 +# (C) Pywikibot team, 2014-2017 # # Distributed under the terms of the MIT license. # @@ -39,7 +39,7 @@ """Test isHiddenCategory.""" site = self.get_site() cat_hidden = pywikibot.Category(site, 'Category:Hidden categories') -cat_not_hidden = pywikibot.Category(site, 'Category:Wikipedia categories') +cat_not_hidden = pywikibot.Category(site, 'Category:Wikipedia') self.assertTrue(cat_hidden.isHiddenCategory()) self.assertFalse(cat_not_hidden.isHiddenCategory()) -- To view, visit https://gerrit.wikimedia.org/r/357119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78fc4aec1025ca6ec22da0dbb2ae33af477d2a75 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: Dalba Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Re-enable isHiddenCategory test_articles
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357119 ) Change subject: [bugfix] Re-enable isHiddenCategory test_articles .. [bugfix] Re-enable isHiddenCategory test_articles - [[Category:Wikipedia category]] became a hidden category and the tests failed. take [[Category:Wikipedia]] instead. Bug: T166975 Change-Id: I78fc4aec1025ca6ec22da0dbb2ae33af477d2a75 --- M tests/category_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/19/357119/1 diff --git a/tests/category_tests.py b/tests/category_tests.py index b4d5c70..e4b4ba1 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the Category class.""" # -# (C) Pywikibot team, 2014-2015 +# (C) Pywikibot team, 2014-2017 # # Distributed under the terms of the MIT license. # @@ -39,7 +39,7 @@ """Test isHiddenCategory.""" site = self.get_site() cat_hidden = pywikibot.Category(site, 'Category:Hidden categories') -cat_not_hidden = pywikibot.Category(site, 'Category:Wikipedia categories') +cat_not_hidden = pywikibot.Category(site, 'Category:Wikipedia') self.assertTrue(cat_hidden.isHiddenCategory()) self.assertFalse(cat_not_hidden.isHiddenCategory()) -- To view, visit https://gerrit.wikimedia.org/r/357119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78fc4aec1025ca6ec22da0dbb2ae33af477d2a75 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_ipmi_temp: set check timeout to 60 seconds
Ema has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357010 ) Change subject: check_ipmi_temp: set check timeout to 60 seconds .. check_ipmi_temp: set check timeout to 60 seconds In a few cases checks are still timing out. Increase timeout from 30 to 60 seconds. Bug: T125205 Change-Id: I0b2edf162477de25a887bbfb7f18ab3900617555 --- M modules/base/manifests/monitoring/host.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ema: Verified; Looks good to me, approved diff --git a/modules/base/manifests/monitoring/host.pp b/modules/base/manifests/monitoring/host.pp index bbcf4e1..02361fd 100644 --- a/modules/base/manifests/monitoring/host.pp +++ b/modules/base/manifests/monitoring/host.pp @@ -169,7 +169,7 @@ nrpe_command => '/usr/local/lib/nagios/plugins/check_ipmi_sensor --noentityabsent -T Temperature -ST Temperature', check_interval => 30, retry_interval => 10, -timeout=> 30, +timeout=> 60, } } } -- To view, visit https://gerrit.wikimedia.org/r/357010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b2edf162477de25a887bbfb7f18ab3900617555 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: EmaGerrit-Reviewer: Ema Gerrit-Reviewer: Gehel 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] mediawiki...Wikidata[master]: New Wikidata Build - 2017-06-04T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357118 ) Change subject: New Wikidata Build - 2017-06-04T10:00:01+ .. New Wikidata Build - 2017-06-04T10:00:01+ Change-Id: I9b3002146ed3f869a62d562c4dbef5c83f743218 --- M composer.lock M extensions/ArticlePlaceholder/composer.json M extensions/ArticlePlaceholder/includes/Hooks.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/tests/phpunit/includes/SearchHookHandlerTest.php M extensions/Constraints/.mailmap M extensions/Constraints/i18n/fr.json M extensions/Constraints/i18n/gl.json M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php M extensions/ExternalValidation/WikibaseQualityExternalValidation.php M extensions/ExternalValidation/includes/CrossCheck/CrossChecker.php M extensions/ExternalValidation/includes/CrossCheck/ReferenceChecker.php M extensions/ExternalValidation/includes/CrossCheck/ValueParser/ComparativeValueParser.php M extensions/ExternalValidation/includes/DumpMetaInformation/DumpMetaInformation.php M extensions/ExternalValidation/includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php M extensions/ExternalValidation/includes/ExternalDataRepo.php M extensions/ExternalValidation/includes/UpdateExternalData/ExternalDataImporter.php M extensions/ExternalValidation/phpcs.xml M extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/DataValueComparerTestBase.php M extensions/ExternalValidation/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M extensions/ExternalValidation/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php M extensions/ExternalValidation/tests/phpunit/Serializer/SerializerTestBase.php R extensions/MediaInfo/.eslintignore A extensions/MediaInfo/.eslintrc.json D extensions/MediaInfo/.jscsrc D extensions/MediaInfo/.jshintrc M extensions/MediaInfo/Gruntfile.js M extensions/MediaInfo/package.json M extensions/MediaInfo/tests/phpunit/mediawiki/Services/FilePageLookupTest.php M extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoIdLookupTest.php M extensions/Wikibase/.eslintrc.json M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/i18n/ast.json M extensions/Wikibase/client/i18n/atj.json M extensions/Wikibase/client/i18n/et.json M extensions/Wikibase/client/i18n/fa.json M extensions/Wikibase/client/i18n/jv.json M extensions/Wikibase/client/i18n/lv.json M extensions/Wikibase/client/i18n/ms.json M extensions/Wikibase/client/i18n/yi.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/ChangeNotificationJob.php M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php M extensions/Wikibase/client/includes/Hooks/EchoNotificationsHandlers.php M extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php M extensions/Wikibase/client/includes/Hooks/LanguageLinkBadgeDisplay.php M extensions/Wikibase/client/includes/Hooks/MagicWordHookHandlers.php M extensions/Wikibase/client/includes/Hooks/NoLangLinkHandler.php M extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php M extensions/Wikibase/client/includes/Hooks/SidebarHookHandlers.php M extensions/Wikibase/client/includes/Hooks/SidebarLinkBadgeDisplay.php M extensions/Wikibase/client/includes/Hooks/UpdateRepoHookHandlers.php M extensions/Wikibase/client/includes/LangLinkHandler.php M extensions/Wikibase/client/includes/Modules/SiteModule.php M extensions/Wikibase/client/includes/NamespaceChecker.php M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php M extensions/Wikibase/client/includes/Specials/SpecialUnconnectedPages.php M extensions/Wikibase/client/includes/Store/ClientStore.php M extensions/Wikibase/client/includes/Store/Sql/DirectSqlStore.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/resources/Resources.php M extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js M extensions/Wikibase/client/resources/wikibase.client.PageConnector.js M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js M extensions/Wikibase/client/tests/phpunit/MockClientStore.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php M
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Remove (i) from correction for case insensitive textfields
Harjotsingh has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357117 ) Change subject: Remove (i) from correction for case insensitive textfields .. Remove (i) from correction for case insensitive textfields Bug:T166926 Change-Id: I329d68f16acc86bc3c247290fe8812a59590da4d --- M Question.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz refs/changes/17/357117/1 diff --git a/Question.php b/Question.php index 5410f87..c155e93 100644 --- a/Question.php +++ b/Question.php @@ -428,6 +428,7 @@ } } if ( $this->mBeingCorrected ) { + $possibility = $this->mCaseSensitive ? substr( $possibility, 0, $strlen ) : $possibility; $a_inputBeg .= $possibility . ''; } } -- To view, visit https://gerrit.wikimedia.org/r/357117 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I329d68f16acc86bc3c247290fe8812a59590da4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Quiz Gerrit-Branch: master Gerrit-Owner: Harjotsingh___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Fix the config to include updated phab tags for Wikimedia-AI
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357102 ) Change subject: Fix the config to include updated phab tags for Wikimedia-AI .. Fix the config to include updated phab tags for Wikimedia-AI Change-Id: I82f2a65843135004cc557292bfc421c7d628b27f --- M channels.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/channels.yaml b/channels.yaml index 22b1afa..0190ef4 100644 --- a/channels.yaml +++ b/channels.yaml @@ -24,7 +24,8 @@ - WM-Bot "#wikimedia-ai": -- Revision-Scoring-As-A-Service(-.*)? +- Scoring-platform-team +- Scoring-platform-team-Backlog "#wikidata-feed": - Wikidata -- To view, visit https://gerrit.wikimedia.org/r/357102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82f2a65843135004cc557292bfc421c7d628b27f Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: ZppixGerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Frontend URL follow backend rules and add 'urlver...
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357116 ) Change subject: RCFilters: Frontend URL follow backend rules and add 'urlversion=2' .. RCFilters: Frontend URL follow backend rules and add 'urlversion=2' The backend always merges the query with wiki/user defaults before it gives us data. The frontend, though, initially assumed that the state is given strictly by the URL parameters (especially after the URL shorening commit). This made it so that the frontend state is incompatible with backend state. However, always merging frontend state with user/wiki defaults can produce inconsistencies between URLs in the same wiki, preventing users from sharing them -- and making it potentially break if ever a wiki default changes. The solution is to add 'urlversion=2' to all RCFilters-generated URLs and have the backend recognize this parameter as 'do not merge with defaults'. When RCFilters frontend loads, it checks whether the parameter exists; if it doesn't, it merges whatever it sees with the defaults just like the backend, then it transforms the URL to represent the correct full state, and adds 'urlversion=2' to the URL parameters, making it consistent across accounts and through time for the next time it will load. This means several new behaviors over the 'short url' commit: - Accessing Special:RecentChanges directly (no query) will result in one of two things: -- If there is a saved query that's set to default: The system will load that saved query "straight forward" (as if the user clicked that option from the menu) causing, also, an ajax re-request from the server (since the server does not yet know about saved queries or their potential for being the default state. -- If there is no saved query default: The system will load user/wiki defaults (like the backend does) and then fix the url to represent this state fully (with parameters showing the actual state of the filters. -- Both cases will also result in adding 'urlversion=2' to the end result URL. - Accessing Special:RecentChanges?urlversion=2 (without any other parameters) will result in loading a completely empty filter set in RCFilters. We assume that 'urlversion=2' does not load defaults even if it is the only parameter in the URL. - Accessing Special:RecentChanges?hideX=1 (parameter set without urlversion=2) will result in the front end taking the requested parameters, merging them with user/wiki default (reproducing what the backend does) and then adding urlversion=2 to the URL. In all cases except for the default-saved-query-load case, the initial load will **not** re-request data from the backend. The backend needs to adjust to respect urlversion=2 as well (will come in an upcoming commit) so the state and expectation of both the front- and back-end are the same. Bug: T166972 Change-Id: I0eed3bc0d4fa4810b6301b535c75b6bfbc8b4a5b --- M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 1 file changed, 73 insertions(+), 65 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/16/357116/1 diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index b7b46f6..897162a 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -26,7 +26,8 @@ * @param {Array} filterStructure Filter definition and structure for the model */ mw.rcfilters.Controller.prototype.initialize = function ( filterStructure ) { - var parsedSavedQueries, validParameterNames, + var parsedSavedQueries, validParameterNames, baseParams, + useDataFromServer = false, uri = new mw.Uri(), $changesList = $( '.mw-changeslist' ).first().contents(); @@ -65,6 +66,7 @@ // the user loads the base-page and we load defaults. // Defaults should only be applied on load (if necessary) // or on request + this.initializing = true; if ( Object.keys( uri.query ).some( function ( parameter ) { return validParameterNames.indexOf( parameter ) > -1; @@ -72,31 +74,52 @@ ) { // There are parameters in the url, update model state this.updateStateBasedOnUrl(); + useDataFromServer = true; } else { - this.initializing = true; // No valid parameters are given, load defaults - this._updateModelState( - $.extend( - true, -
[MediaWiki-commits] [Gerrit] pywikibot...xqbot[master]: [bugfix] arbcom election generator is valid for mai and nove...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357113 ) Change subject: [bugfix] arbcom election generator is valid for mai and november only .. [bugfix] arbcom election generator is valid for mai and november only Change-Id: I85e554416e51b6d2d485e9af45a28d0f5b91864b --- M checkvotes.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/checkvotes.py b/checkvotes.py index edb1823..d91b5a2 100644 --- a/checkvotes.py +++ b/checkvotes.py @@ -14,7 +14,7 @@ -sg Check arbcom election """ # -# (C) xqt, 2010-2016 +# (C) xqt, 2010-2017 # # Distributed under the terms of the MIT license. # @@ -124,9 +124,12 @@ def SgPageGenerator(): +"""Generator for arbcom election.""" global url, votepage site = pywikibot.Site() ts = pywikibot.Timestamp.now() +if ts.month not in (5, 11): +return page = pywikibot.Page(site, 'Wikipedia:Schiedsgericht/Wahl/%s %d' % ('Mai' if ts.month == 5 else 'November', ts.year)) -- To view, visit https://gerrit.wikimedia.org/r/357113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85e554416e51b6d2d485e9af45a28d0f5b91864b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot...xqbot[master]: [IMPR] Better error description
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357114 ) Change subject: [IMPR] Better error description .. [IMPR] Better error description Change-Id: I5b850417ce51ac4ad3768a7a9e2cb3cf116cb56b --- M vandalism.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot refs/changes/14/357114/1 diff --git a/vandalism.py b/vandalism.py index fb238b7..45d2aeb 100644 --- a/vandalism.py +++ b/vandalism.py @@ -240,7 +240,7 @@ try: string = string.replace(pattern, table[pattern.lower()]) except KeyError: -pywikibot.error(pattern + ' not found.') +pywikibot.error(pattern + ' not found for translation.') return string def loadBlockedUsers(self): -- To view, visit https://gerrit.wikimedia.org/r/357114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b850417ce51ac4ad3768a7a9e2cb3cf116cb56b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot...xqbot[master]: [IMPR] Better error description
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357114 ) Change subject: [IMPR] Better error description .. [IMPR] Better error description Change-Id: I5b850417ce51ac4ad3768a7a9e2cb3cf116cb56b --- M vandalism.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/vandalism.py b/vandalism.py index fb238b7..45d2aeb 100644 --- a/vandalism.py +++ b/vandalism.py @@ -240,7 +240,7 @@ try: string = string.replace(pattern, table[pattern.lower()]) except KeyError: -pywikibot.error(pattern + ' not found.') +pywikibot.error(pattern + ' not found for translation.') return string def loadBlockedUsers(self): -- To view, visit https://gerrit.wikimedia.org/r/357114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b850417ce51ac4ad3768a7a9e2cb3cf116cb56b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me...
Foxy brown has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357115 ) Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo into T2582_newNotificationType .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo into T2582_newNotificationType Change-Id: I6ed1e0b84ff0904e77bf19a8f9d090637f2107ea --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/15/357115/1 diff --git a/extension.json b/extension.json index 9c38ce1..bd2698d 100644 --- a/extension.json +++ b/extension.json @@ -1011,6 +1011,9 @@ } }, "merge_strategy": "array_plus_2d" + }, + "AllowArticleReminderNotification": { + "value": false } }, "manifest_version": 2 -- To view, visit https://gerrit.wikimedia.org/r/357115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ed1e0b84ff0904e77bf19a8f9d090637f2107ea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Foxy brown___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot...xqbot[master]: [bugfix] arbcom election generator is valid for mai and nove...
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357113 ) Change subject: [bugfix] arbcom election generator is valid for mai and november only .. [bugfix] arbcom election generator is valid for mai and november only Change-Id: I85e554416e51b6d2d485e9af45a28d0f5b91864b --- M checkvotes.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot refs/changes/13/357113/1 diff --git a/checkvotes.py b/checkvotes.py index edb1823..d91b5a2 100644 --- a/checkvotes.py +++ b/checkvotes.py @@ -14,7 +14,7 @@ -sg Check arbcom election """ # -# (C) xqt, 2010-2016 +# (C) xqt, 2010-2017 # # Distributed under the terms of the MIT license. # @@ -124,9 +124,12 @@ def SgPageGenerator(): +"""Generator for arbcom election.""" global url, votepage site = pywikibot.Site() ts = pywikibot.Timestamp.now() +if ts.month not in (5, 11): +return page = pywikibot.Page(site, 'Wikipedia:Schiedsgericht/Wahl/%s %d' % ('Mai' if ts.month == 5 else 'November', ts.year)) -- To view, visit https://gerrit.wikimedia.org/r/357113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85e554416e51b6d2d485e9af45a28d0f5b91864b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits